Mirror/GodMode9
1
0
Fork 1
mirror of https://github.com/d0k3/GodMode9.git synced 2025-06-26 13:42:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Put the SD init timeout behind a compile flag

Browse Source
This commit is contained in:
angelsl 2017-11-12 00:08:58 +08:00 committed by d0k3
parent ada25ea534
commit 83b2fba142
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
arm9/source/nand/sdmmc.c
View File

@ -397,7 +397,9 @@ static int SD_Init()
u32 temp = (handleSD.error & 0x1) << 0x1E; u32 temp = (handleSD.error & 0x1) << 0x1E;
u32 temp2 = 0; u32 temp2 = 0;
s32 timeout = 0x80; #ifdef SD_TIMEOUT
s32 timeout = SD_TIMEOUT;
#endif // SD_TIMEOUT
do do
{ {
do do
@ -405,15 +407,27 @@ static int SD_Init()
sdmmc_send_command(&handleSD, 0x10437, handleSD.initarg << 0x10); sdmmc_send_command(&handleSD, 0x10437, handleSD.initarg << 0x10);
sdmmc_send_command(&handleSD, 0x10769, 0x00FF8000 | temp); sdmmc_send_command(&handleSD, 0x10769, 0x00FF8000 | temp);
temp2 = 1; temp2 = 1;
#ifdef SD_TIMEOUT
timeout--; timeout--;
#endif // SD_TIMEOUT
} }
while(!(handleSD.error & 1) && timeout > 0); while(!(handleSD.error & 1)
#ifdef SD_TIMEOUT
&& timeout > 0
#endif // SD_TIMEOUT
);
} }
while((handleSD.ret[0] & 0x80000000) == 0 && timeout > 0); while((handleSD.ret[0] & 0x80000000) == 0
#ifdef SD_TIMEOUT
&& timeout > 0
#endif // SD_TIMEOUT
);
#ifdef SD_TIMEOUT
if ((handleSD.ret[0] & 0x80000000) == 0) { if ((handleSD.ret[0] & 0x80000000) == 0) {
return 6; return 6;
} }
#endif // SD_TIMEOUT
if(!((handleSD.ret[0] >> 30) & 1) || !temp) if(!((handleSD.ret[0] >> 30) & 1) || !temp)
temp2 = 0; temp2 = 0;