From c1389cc5b15ad74a8d74ba6a1462be4dde1d7c56 Mon Sep 17 00:00:00 2001
From: illusion98 <37698908+illusion98@users.noreply.github.com>
Date: Tue, 27 Aug 2019 23:16:04 -0500
Subject: [PATCH] Merge remote-tracking branch 'emoose/devicetype-fix' into
 canary

---
 src/xenia/kernel/xam/xam_content.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/xenia/kernel/xam/xam_content.cc b/src/xenia/kernel/xam/xam_content.cc
index 48f16c4b5..7497877f1 100644
--- a/src/xenia/kernel/xam/xam_content.cc
+++ b/src/xenia/kernel/xam/xam_content.cc
@@ -119,7 +119,7 @@ DECLARE_XAM_EXPORT1(XamContentGetDeviceState, kContent, kStub);
 
 typedef struct {
   xe::be<uint32_t> device_id;
-  xe::be<uint32_t> unknown;
+  xe::be<uint32_t> device_type;
   xe::be<uint64_t> total_bytes;
   xe::be<uint64_t> free_bytes;
   xe::be<uint16_t> name[28];
@@ -136,7 +136,7 @@ dword_result_t XamContentGetDeviceData(
   device_data.Zero();
   const auto& device_info = dummy_device_info_;
   device_data->device_id = device_info.device_id;
-  device_data->unknown = device_id & 0xFFFF;  // Fake it.
+  device_data->device_type = device_info.device_type;
   device_data->total_bytes = device_info.total_bytes;
   device_data->free_bytes = device_info.free_bytes;
   xe::store_and_swap<std::u16string>(&device_data->name[0], device_info.name);