Use my_sdmmc_get_cid instead of sdmmc_nand_cid

RocketRobz · RocketRobz · commit 2e01f4fb2d46 · 2023-12-01T19:19:41.000-07:00
diff --git a/quickmenu/arm7/source/main.c b/quickmenu/arm7/source/main.c
@@ -37,6 +37,7 @@
 
 void my_touchInit();
 void my_installSystemFIFO(void);
+void my_sdmmc_get_cid(int devicenumber, u32 *cid);
 
 u8 my_i2cReadRegister(u8 device, u8 reg);
 u8 my_i2cWriteRegister(u8 device, u8 reg, u8 data);
@@ -348,7 +349,7 @@ int main() {
 		}
 
 		if (*(u32*)(0x2FFFD0C) == 0x454D4D43) {
-			sdmmc_nand_cid((u32*)0x2FFD7BC);	// Get eMMC CID
+			my_sdmmc_get_cid(true, (u32*)0x2FFD7BC);	// Get eMMC CID
 			*(u32*)(0x2FFFD0C) = 0;
 		}
 		swiWaitForVBlank();
diff --git a/title/arm7/source/main.c b/title/arm7/source/main.c
@@ -37,6 +37,7 @@
 
 void my_touchInit();
 void my_installSystemFIFO(void);
+void my_sdmmc_get_cid(int devicenumber, u32 *cid);
 
 u8 my_i2cReadRegister(u8 device, u8 reg);
 u8 my_i2cWriteRegister(u8 device, u8 reg, u8 data);
@@ -353,7 +354,7 @@ int main() {
 		}
 
 		if (*(u32*)(0x2FFFD0C) == 0x454D4D43) {
-			sdmmc_nand_cid((u32*)0x2FFD7BC);	// Get eMMC CID
+			my_sdmmc_get_cid(true, (u32*)0x2FFD7BC);	// Get eMMC CID
 			*(u32*)(0x2FFFD0C) = 0;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@`
`37`	`37`
`38`	`38`	`void my_touchInit();`
`39`	`39`	`void my_installSystemFIFO(void);`
	`40`	`+void my_sdmmc_get_cid(int devicenumber, u32 *cid);`
`40`	`41`
`41`	`42`	`u8 my_i2cReadRegister(u8 device, u8 reg);`
`42`	`43`	`u8 my_i2cWriteRegister(u8 device, u8 reg, u8 data);`
`@@ -348,7 +349,7 @@ int main() {`
`348`	`349`	`}`
`349`	`350`
`350`	`351`	`if ((u32)(0x2FFFD0C) == 0x454D4D43) {`
`351`		`- sdmmc_nand_cid((u32*)0x2FFD7BC); // Get eMMC CID`
	`352`	`+ my_sdmmc_get_cid(true, (u32*)0x2FFD7BC); // Get eMMC CID`
`352`	`353`	`(u32)(0x2FFFD0C) = 0;`
`353`	`354`	`}`
`354`	`355`	`swiWaitForVBlank();`