rpg: refactor chip ID handling, rename Initialize -> SDInitialize

blocksds/include/common/rpg/iorpg.h

@@ -87,7 +87,8 @@ static inline u64 IORPG_CMD_SD_WRITE_DATA(const u32* buffer) {
 }
 
 // user API
-bool ioRPG_Initialize(void);
+u32 ioRPG_CardReadChipID(void);
+bool ioRPG_SDInitialize(void);
 void ioRPG_SDReadSingleSector(u32 sector, void* buffer);
 void ioRPG_SDReadMultiSector(u32 sector, u32 num_sectors, void* buffer);
 void ioRPG_SDWriteSingleSector(u32 sector, const void* buffer);

blocksds/source/common/rpg/iorpg.c

@@ -159,8 +159,13 @@ static void ioRPG_SDWaitForState(uint8_t state) {
     } while (data != state);
 }
 
+u32 ioRPG_CardReadChipID(void) {
+    return cardExt_ReadData4Byte(((u64)CARD_CMD_DATA_CHIPID << 56),
+                                 IORPG_CTRL_READ_4B | MCCNT1_LATENCY1(4));
+}
+
 // SDIO initialization
-bool ioRPG_Initialize(void) {
+bool ioRPG_SDInitialize(void) {
     int isSD20 = 0;
     u32 responseR1 = 0;
 

blocksds/source/platform/ak2/iointerface.c

@@ -13,13 +13,12 @@
 
 // Initialize the driver. Returns true on success.
 bool AK2_Startup(void) {
-    return ioRPG_Initialize();
+    return ioRPG_SDInitialize();
 }
 
 // Returns true if a card is present and initialized.
 bool AK2_IsInserted(void) {
-    return cardExt_ReadData4Byte(((u64)CARD_CMD_DATA_CHIPID << 56),
-                                 IORPG_CTRL_READ_4B | MCCNT1_LATENCY1(4)) == 0xFC2;
+    return ioRPG_CardReadChipID() == 0xFC2;
 }
 
 // Reads 512 byte sectors into a buffer that may be unaligned. Returns true on

blocksds/source/platform/ak2_cmd24/iointerface.c

@@ -13,13 +13,12 @@
 
 // Initialize the driver. Returns true on success.
 bool AK2Q_Startup(void) {
-    return ioRPG_Initialize();
+    return ioRPG_SDInitialize();
 }
 
 // Returns true if a card is present and initialized.
 bool AK2Q_IsInserted(void) {
-    return cardExt_ReadData4Byte(((u64)CARD_CMD_DATA_CHIPID << 56),
-                                 IORPG_CTRL_READ_4B | MCCNT1_LATENCY1(4)) == 0xFC2;
+    return ioRPG_CardReadChipID() == 0xFC2;
 }
 
 // Reads 512 byte sectors into a buffer that may be unaligned. Returns true on

blocksds/source/platform/r4idsn/iointerface.c

@@ -13,13 +13,12 @@
 
 // Initialize the driver. Returns true on success.
 bool R4iDSN_Startup(void) {
-    return ioRPG_Initialize();
+    return ioRPG_SDInitialize();
 }
 
 // Returns true if a card is present and initialized.
 bool R4iDSN_IsInserted(void) {
-    return cardExt_ReadData4Byte(((u64)CARD_CMD_DATA_CHIPID << 56),
-                                 IORPG_CTRL_READ_4B | MCCNT1_LATENCY1(4)) == 0xFC2;
+    return ioRPG_CardReadChipID() == 0xFC2;
 }
 
 // Reads 512 byte sectors into a buffer that may be unaligned. Returns true on

blocksds/source/platform/rpgs/iointerface.c

@@ -13,13 +13,12 @@
 
 // Initialize the driver. Returns true on success.
 bool RPGS_Startup(void) {
-    return ioRPG_Initialize();
+    return ioRPG_SDInitialize();
 }
 
 // Returns true if a card is present and initialized.
 bool RPGS_IsInserted(void) {
-    return cardExt_ReadData4Byte(((u64)CARD_CMD_DATA_CHIPID << 56),
-                                 IORPG_CTRL_READ_4B | MCCNT1_LATENCY1(4)) == 0xFC2;
+    return ioRPG_CardReadChipID() == 0xFC2;
 }
 
 // Reads 512 byte sectors into a buffer that may be unaligned. Returns true on