LowLevel/Luma3DS-3GX
Archived
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Hide N3DS CPU setting on O3DS

Browse Source
This commit is contained in:
Aurora 2016-09-11 18:42:59 +02:00
parent 2bc1927ebd
commit 63160a22a6
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/config.c
View File

@ -129,11 +129,14 @@ void configMenu(bool oldPinStatus)
//Display all the multiple choice options in white //Display all the multiple choice options in white
for(u32 i = 0; i < multiOptionsAmount; i++) for(u32 i = 0; i < multiOptionsAmount; i++)
{
if(!(i == CONFIG_NEWCPUINDEX && !isN3DS))
{ {
multiOptions[i].posY = endPos + SPACING_Y; multiOptions[i].posY = endPos + SPACING_Y;
endPos = drawString(multiOptionsText[i], 10, multiOptions[i].posY, COLOR_WHITE); endPos = drawString(multiOptionsText[i], 10, multiOptions[i].posY, COLOR_WHITE);
drawCharacter(selected, 10 + multiOptions[i].posXs[multiOptions[i].enabled] * SPACING_X, multiOptions[i].posY, COLOR_WHITE); drawCharacter(selected, 10 + multiOptions[i].posXs[multiOptions[i].enabled] * SPACING_X, multiOptions[i].posY, COLOR_WHITE);
} }
}
endPos += SPACING_Y / 2; endPos += SPACING_Y / 2;
u32 color = COLOR_RED; u32 color = COLOR_RED;
@ -166,10 +169,12 @@ void configMenu(bool oldPinStatus)
switch(pressed) switch(pressed)
{ {
case BUTTON_UP: case BUTTON_UP:
selectedOption = !selectedOption ? totalIndexes : selectedOption - 1; if(!selectedOption) selectedOption = totalIndexes;
else selectedOption = (selectedOption == CONFIG_NEWCPUINDEX + 1 && !isN3DS) ? selectedOption - 2 : selectedOption - 1;
break; break;
case BUTTON_DOWN: case BUTTON_DOWN:
selectedOption = selectedOption == totalIndexes ? 0 : selectedOption + 1; if(selectedOption == totalIndexes) selectedOption = 0;
else selectedOption = (selectedOption == CONFIG_NEWCPUINDEX - 1 && !isN3DS) ? selectedOption + 2 : selectedOption + 1;
break; break;
case BUTTON_LEFT: case BUTTON_LEFT:
selectedOption = 0; selectedOption = 0;
@ -213,7 +218,7 @@ void configMenu(bool oldPinStatus)
drawCharacter(selected, 10 + multiOptions[selectedOption].posXs[oldEnabled] * SPACING_X, multiOptions[selectedOption].posY, COLOR_BLACK); drawCharacter(selected, 10 + multiOptions[selectedOption].posXs[oldEnabled] * SPACING_X, multiOptions[selectedOption].posY, COLOR_BLACK);
multiOptions[selectedOption].enabled = (oldEnabled == 3 || !multiOptions[selectedOption].posXs[oldEnabled + 1]) ? 0 : oldEnabled + 1; multiOptions[selectedOption].enabled = (oldEnabled == 3 || !multiOptions[selectedOption].posXs[oldEnabled + 1]) ? 0 : oldEnabled + 1;
if(selectedOption == 1) updateBrightness(multiOptions[1].enabled); if(selectedOption == CONFIG_BRIGHTNESSINDEX) updateBrightness(multiOptions[CONFIG_BRIGHTNESSINDEX].enabled);
} }
else else
{ {

6
source/config.h
View File

@ -32,13 +32,16 @@
#define CONFIG_VERSIONMAJOR 1 #define CONFIG_VERSIONMAJOR 1
#define CONFIG_VERSIONMINOR 3 #define CONFIG_VERSIONMINOR 3
#define CONFIG_BRIGHTNESSINDEX 1
#define CONFIG_NEWCPUINDEX 3
#define BOOTCFG_NAND BOOTCONFIG(0, 7) #define BOOTCFG_NAND BOOTCONFIG(0, 7)
#define BOOTCFG_FIRM BOOTCONFIG(3, 1) #define BOOTCFG_FIRM BOOTCONFIG(3, 1)
#define BOOTCFG_A9LH BOOTCONFIG(4, 1) #define BOOTCFG_A9LH BOOTCONFIG(4, 1)
#define BOOTCFG_NOFORCEFLAG BOOTCONFIG(5, 1) #define BOOTCFG_NOFORCEFLAG BOOTCONFIG(5, 1)
#define BOOTCFG_SAFEMODE BOOTCONFIG(6, 1) #define BOOTCFG_SAFEMODE BOOTCONFIG(6, 1)
#define CONFIG_DEFAULTEMU MULTICONFIG(0) #define CONFIG_DEFAULTEMU MULTICONFIG(0)
#define CONFIG_BRIGHTNESS MULTICONFIG(1) #define CONFIG_BRIGHTNESS MULTICONFIG(CONFIG_BRIGHTNESSINDEX)
#define CONFIG_PIN MULTICONFIG(2) #define CONFIG_PIN MULTICONFIG(2)
#define CONFIG_AUTOBOOTSYS CONFIG(0) #define CONFIG_AUTOBOOTSYS CONFIG(0)
#define CONFIG_USESYSFIRM CONFIG(1) #define CONFIG_USESYSFIRM CONFIG(1)
@ -66,6 +69,7 @@ typedef enum ConfigurationStatus
} ConfigurationStatus; } ConfigurationStatus;
extern CfgData configData; extern CfgData configData;
extern bool isN3DS;
bool readConfig(void); bool readConfig(void);
void writeConfig(ConfigurationStatus needConfig, u32 configTemp); void writeConfig(ConfigurationStatus needConfig, u32 configTemp);

2
source/patches.h
View File

@ -51,8 +51,6 @@ typedef struct __attribute__((packed))
u32 config; u32 config;
} CFWInfo; } CFWInfo;
extern bool isN3DS;
#ifdef DEV #ifdef DEV
extern bool isDevUnit; extern bool isDevUnit;
#endif #endif