ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'emoose/devicetype-fix' into canary

This commit is contained in:
illusion98 2019-08-27 23:16:04 -05:00 committed by Gliniak
parent 76a62d0416
commit c1389cc5b1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/xenia/kernel/xam/xam_content.cc
View File

@ -119,7 +119,7 @@ DECLARE_XAM_EXPORT1(XamContentGetDeviceState, kContent, kStub);
typedef struct { typedef struct {
xe::be<uint32_t> device_id; 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> total_bytes;
xe::be<uint64_t> free_bytes; xe::be<uint64_t> free_bytes;
xe::be<uint16_t> name[28]; xe::be<uint16_t> name[28];
@ -136,7 +136,7 @@ dword_result_t XamContentGetDeviceData(
device_data.Zero(); device_data.Zero();
const auto& device_info = dummy_device_info_; const auto& device_info = dummy_device_info_;
device_data->device_id = device_info.device_id; 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->total_bytes = device_info.total_bytes;
device_data->free_bytes = device_info.free_bytes; device_data->free_bytes = device_info.free_bytes;
xe::store_and_swap<std::u16string>(&device_data->name[0], device_info.name); xe::store_and_swap<std::u16string>(&device_data->name[0], device_info.name);