Skip to content

Commit f7397aa

Browse files
committed
Update main.arm7.c
1 parent 262d03e commit f7397aa

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

retail/bootloader/source/arm7/main.arm7.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/*-----------------------------------------------------------------
22
boot.c
3-
3+
44
BootLoader
55
Loads a file into memory and runs it
66
7-
All resetMemory and startBinary functions are based
7+
All resetMemory and startBinary functions are based
88
on the MultiNDS loader by Darkain.
99
Original source available at:
1010
http://cvs.sourceforge.net/viewcvs.py/ndslib/ndslib/examples/loader/boot/main.cpp
@@ -28,7 +28,7 @@
2828
2929
If you use this code, please give due credit and email me about your
3030
project at chishm@hotmail.com
31-
31+
3232
Helpful information:
3333
This code runs from VRAM bank C on ARM7
3434
------------------------------------------------------------------*/
@@ -225,7 +225,7 @@ static void initMBK(void) {
225225
*((vu32*)REG_MBK4)=0x8C888480;
226226
*((vu32*)REG_MBK5)=0x9C989490;
227227

228-
// WRAM mapped to the 0x3700000 - 0x37FFFFF area
228+
// WRAM mapped to the 0x3700000 - 0x37FFFFF area
229229
// WRAM-A mapped to the 0x3000000 - 0x303FFFF area : 256k
230230
REG_MBK6=0x00403000;
231231
// WRAM-B mapped to the 0x3740000 - 0x37BFFFF area : 512k // why? only 256k real memory is there
@@ -248,7 +248,7 @@ Modified by Chishm:
248248
--------------------------------------------------------------------------*/
249249
static void resetMemory_ARM7(void) {
250250
register int i;
251-
251+
252252
REG_IME = 0;
253253

254254
for (i = 0; i < 16; i++) {
@@ -415,7 +415,7 @@ static void NDSTouchscreenMode(void) {
415415
cdcWriteReg(CDC_SOUND, 0x22, 0x70);
416416
cdcWriteReg(CDC_CONTROL, 0x52, 0x80);
417417
cdcWriteReg(CDC_CONTROL, 0x51, 0x00);
418-
418+
419419
if (malfunction) {
420420
// Set remaining values
421421
cdcWriteReg(CDC_CONTROL, 0x03, 0x44);
@@ -773,7 +773,7 @@ static void my_readUserSettings(tNDSHeader* ndsHeader) {
773773
}
774774

775775
// If both slots are valid pick the most recent
776-
if (calc1CRC == slot1CRC && calc2CRC == slot2CRC) {
776+
if (calc1CRC == slot1CRC && calc2CRC == slot2CRC) {
777777
currentSettings = (slot2count == ((slot1count + 1) & 0x7f) ? &slot2 : &slot1); //if ((slot1count & 0x7F) == ((slot2count + 1) & 0x7F)) {
778778
} else {
779779
if (calc2CRC == slot2CRC) {
@@ -1095,7 +1095,7 @@ static void setMemoryAddress(const tNDSHeader* ndsHeader, const module_params_t*
10951095

10961096
dbg_printf("chipID: ");
10971097
dbg_hexa(baseChipID);
1098-
dbg_printf("\n");
1098+
dbg_printf("\n");
10991099

11001100
// TODO
11011101
// figure out what is 0x027ffc10, somehow related to cardId check
@@ -1184,7 +1184,7 @@ int arm7_main(void) {
11841184
// nocashMessage("bootloader");
11851185

11861186
initMBK();
1187-
1187+
11881188
// Wait for ARM9 to at least start
11891189
while (arm9_stateFlag < ARM9_START);
11901190

@@ -1252,7 +1252,7 @@ int arm7_main(void) {
12521252

12531253
// Sav file
12541254
getFileFromCluster(&savFile, saveFileCluster);
1255-
1255+
12561256
int errorCode;
12571257

12581258
tDSiHeader dsiHeaderTemp;
@@ -1294,7 +1294,7 @@ int arm7_main(void) {
12941294
module_params_t* moduleParams = loadModuleParams(&dsiHeaderTemp.ndshdr, &foundModuleParams);
12951295
dbg_printf("sdk_version: ");
12961296
dbg_hexa(moduleParams->sdk_version);
1297-
dbg_printf("\n");
1297+
dbg_printf("\n");
12981298
const bool laterSdk = ((moduleParams->sdk_version >= 0x2008000 && moduleParams->sdk_version != 0x2012774) || moduleParams->sdk_version == 0x20029A8);
12991299

13001300
ndsHeader = loadHeader(&dsiHeaderTemp, moduleParams);

0 commit comments

Comments
 (0)