Fix mismerges

This commit is contained in:
Aurora Wright
2017-06-07 19:15:51 +02:00
parent a5b638ae7b
commit 44cafe3f46
4 changed files with 6 additions and 10 deletions

View File

@@ -291,6 +291,8 @@ static u32 calcSDSize(u8 *csd, int type)
static void InitSD()
{
*(vu32 *)0x10000020 = 0; //InitFS stuff
*(vu32 *)0x10000020 = 0x200; //InitFS stuff
*(vu16 *)0x10006100 &= 0xF7FFu; //SDDATACTL32
*(vu16 *)0x10006100 &= 0xEFFFu; //SDDATACTL32
*(vu16 *)0x10006100 |= 0x402u; //SDDATACTL32