citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #3236 from Tilka/block_name 

cfg: refer to ConsoleModelBlockID by name
This commit is contained in:
Sebastian Valle 2017-12-08 09:01:22 -05:00 committed by GitHub
parent 065ae0606b 6752576de9
commit 69caf8c5dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/hle/service/cfg/cfg.cpp
View File

@ -227,7 +227,8 @@ void GetSystemModel(Service::Interface* self) {
// TODO(Subv): Find out the correct error codes // TODO(Subv): Find out the correct error codes
cmd_buff[1] = cmd_buff[1] =
Service::CFG::GetConfigInfoBlock(0x000F0004, 4, 0x8, reinterpret_cast<u8*>(&data)).raw; Service::CFG::GetConfigInfoBlock(ConsoleModelBlockID, 4, 0x8, reinterpret_cast<u8*>(&data))
.raw;
cmd_buff[2] = data & 0xFF; cmd_buff[2] = data & 0xFF;
} }
@ -237,7 +238,8 @@ void GetModelNintendo2DS(Service::Interface* self) {
// TODO(Subv): Find out the correct error codes // TODO(Subv): Find out the correct error codes
cmd_buff[1] = cmd_buff[1] =
Service::CFG::GetConfigInfoBlock(0x000F0004, 4, 0x8, reinterpret_cast<u8*>(&data)).raw; Service::CFG::GetConfigInfoBlock(ConsoleModelBlockID, 4, 0x8, reinterpret_cast<u8*>(&data))
.raw;
u8 model = data & 0xFF; u8 model = data & 0xFF;
if (model == Service::CFG::NINTENDO_2DS) if (model == Service::CFG::NINTENDO_2DS)