Merge upstream changes from GUI branch and make ready for release

This commit is contained in:
Joel16 2017-09-19 20:26:53 -05:00
parent 9f73a067d4
commit c4fe6742a1
2 changed files with 6 additions and 6 deletions

View File

@ -43,7 +43,7 @@ const char * getRegion(void)
"Unknown"
};
u8 region = 0;
CFG_Region region = 0;
if (R_SUCCEEDED(CFGU_SecureInfoGetRegion(&region)))
{
@ -104,7 +104,7 @@ const char * getLang(void)
"Unknown"
};
u8 language;
CFG_Language language;
if (R_SUCCEEDED(CFGU_GetSystemLanguage(&language)))
{
@ -132,16 +132,16 @@ char * getRunningHW(void)
switch (*data)
{
case 1:
case 0x1:
snprintf(runningHW, 0x7, "Retail");
break;
case 2:
case 0x2:
snprintf(runningHW, 0x9, "Devboard");
break;
case 3:
case 0x3:
snprintf(runningHW, 0x9, "Debugger");
break;
case 4:
case 0x4:
snprintf(runningHW, 0x8, "Capture");
break;
}