From b0d8bf15ee0a0aa201e122df66756c31a16dd9bf Mon Sep 17 00:00:00 2001 From: jiyunomegami Date: Sat, 4 Jul 2020 21:02:34 +0900 Subject: [PATCH] add enable_XXX define for each module --- Cart_Reader/Cart_Reader.ino | 124 ++++++++++++++++++++++++++++++++++++ Cart_Reader/MD.ino | 6 ++ Cart_Reader/N64.ino | 47 -------------- Cart_Reader/NP.ino | 4 ++ Cart_Reader/SNES.ino | 4 ++ 5 files changed, 138 insertions(+), 47 deletions(-) diff --git a/Cart_Reader/Cart_Reader.ino b/Cart_Reader/Cart_Reader.ino index 80f9e95..f858900 100644 --- a/Cart_Reader/Cart_Reader.ino +++ b/Cart_Reader/Cart_Reader.ino @@ -62,6 +62,25 @@ char ver[5] = "5.3"; // Enable the second button #define enable_Button2 +// define enable_XXX to enable +#define enable_MD +#define enable_SMS + +#define enable_PCE + +#define enable_NES +#define enable_SNES +#define enable_SV +#define enable_NP +#define enable_GBX +#define enable_N64 + +#define enable_WS + +#define enable_NGP + +#define enable_FLASH + /****************************************** Libraries *****************************************/ @@ -365,6 +384,56 @@ static const uint8_t PROGMEM sig [] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; +//****************************************** +// Data used by multiple modules +//****************************************** +// CRC32 lookup table // 256 entries +static const uint32_t crc_32_tab[] PROGMEM = { /* CRC polynomial 0xedb88320 */ + 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, + 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, + 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, + 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, + 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, + 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, + 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, + 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, + 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, + 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, + 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106, + 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, + 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, + 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, + 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, + 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, + 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, + 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, + 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, + 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, + 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, + 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, + 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, + 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, + 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, + 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, + 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e, + 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, + 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, + 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, + 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, + 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, + 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, + 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, + 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, + 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, + 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, + 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, + 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, + 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, + 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, + 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, + 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d +}; + /****************************************** Menu *****************************************/ @@ -453,21 +522,29 @@ void mainMenu() { addonsMenu(); break; +#ifdef enable_SNES case 1: snsMenu(); break; +#endif +#ifdef enable_MD case 2: mdMenu(); break; +#endif +#ifdef enable_N64 case 3: n64Menu(); break; +#endif +#ifdef enable_GBX case 4: gbxMenu(); break; +#endif case 5: aboutScreen(); @@ -490,35 +567,47 @@ void addonsMenu() { // wait for user choice to come back from the question box menu switch (addonsMenu) { +#ifdef enable_NES case 0: nesMenu(); break; +#endif +#ifdef enable_FLASH case 1: flashMenu(); break; +#endif +#ifdef enable_PCE case 2: pcsMenu(); break; +#endif +#ifdef enable_SMS case 3: smsMenu(); break; +#endif +#ifdef enable_WS case 4: display_Clear(); display_Update(); setup_WS(); mode = mode_WS; break; +#endif +#ifdef enable_NGP case 5: display_Clear(); display_Update(); setup_NGP(); mode = mode_NGP; break; +#endif case 6: resetArduino(); @@ -1137,10 +1226,13 @@ void wait_btn() { // get input button int b = checkButton(); +#ifdef enable_N64 // Send some clock pulses to the Eeprom in case it locked up if ((mode == mode_N64_Cart) && ((saveType == 5) || (saveType == 6))) { pulseClock_N64(1); } +#endif + // if the cart readers input button is pressed shortly if (b == 1) { errorLvl = 0; @@ -1468,15 +1560,22 @@ page: Main loop *****************************************/ void loop() { +#ifdef enable_N64 if (mode == mode_N64_Controller) { n64ControllerMenu(); } else if (mode == mode_N64_Cart) { n64CartMenu(); } +#else + if (1 == 0) { } +#endif +#ifdef enable_SNES else if (mode == mode_SNES) { snesMenu(); } +#endif +#ifdef enable_FLASH else if (mode == mode_FLASH8) { flashromMenu8(); } @@ -1486,42 +1585,62 @@ void loop() { else if (mode == mode_EPROM) { epromMenu(); } +#endif +#ifdef enable_NP else if (mode == mode_SFM) { sfmMenu(); } +#endif +#ifdef enable_GBX else if (mode == mode_GB) { gbMenu(); } else if (mode == mode_GBA) { gbaMenu(); } +#endif +#ifdef enable_NP else if (mode == mode_SFM_Flash) { sfmFlashMenu(); } else if (mode == mode_SFM_Game) { sfmGameOptions(); } +#endif +#ifdef enable_GBX else if (mode == mode_GBM) { gbmMenu(); } +#endif else if (mode == mode_MD_Cart) { mdCartMenu(); } +#ifdef enable_PCE else if (mode == mode_PCE) { pceMenu(); } +#endif +#ifdef enable_SV else if (mode == mode_SV) { svMenu(); } +#endif +#ifdef enable_NES else if (mode == mode_NES) { nesMenu(); } +#endif +#ifdef enable_SMS else if (mode == mode_SMS) { smsMenu(); } +#endif +#ifdef enable_MD else if (mode == mode_SEGA_CD) { segaCDMenu(); } +#endif +#ifdef enable_GBX else if (mode == mode_GB_GBSmart) { gbSmartMenu(); } @@ -1531,12 +1650,17 @@ void loop() { else if (mode == mode_GB_GBSmart_Game) { gbSmartGameOptions(); } +#endif +#ifdef enable_WS else if (mode == mode_WS) { wsMenu(); } +#endif +#ifdef enable_NGP else if (mode == mode_NGP) { ngpMenu(); } +#endif else { display_Clear(); println_Msg(F("Menu Error")); diff --git a/Cart_Reader/MD.ino b/Cart_Reader/MD.ino index 7d1ad27..b61dabe 100644 --- a/Cart_Reader/MD.ino +++ b/Cart_Reader/MD.ino @@ -3,6 +3,8 @@ //****************************************** // Writes to Sega CD Backup RAM Cart require an extra wire from MRES (B02) to VRES (B27) +#define enable_FLASH + /****************************************** Variables *****************************************/ @@ -136,6 +138,7 @@ void mdMenu() { mode = mode_SEGA_CD; break; +#ifdef enable_FLASH case 2: display_Clear(); display_Update(); @@ -180,6 +183,7 @@ void mdMenu() { display_Update(); wait(); break; +#endif case 3: resetArduino(); @@ -1089,6 +1093,7 @@ unsigned long verifySram_MD() { return writeErrors; } +#ifdef enable_FLASH //****************************************** // Flashrom Functions //****************************************** @@ -1275,6 +1280,7 @@ void verifyFlash_MD() { display_Update(); } } +#endif // Delay between write operations based on status register void busyCheck_MD() { diff --git a/Cart_Reader/N64.ino b/Cart_Reader/N64.ino index 41d14ff..ee88484 100644 --- a/Cart_Reader/N64.ino +++ b/Cart_Reader/N64.ino @@ -1643,53 +1643,6 @@ void printCartInfo_N64() { } } -// CRC32 lookup table // 256 entries -static const uint32_t crc_32_tab[] PROGMEM = { /* CRC polynomial 0xedb88320 */ - 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, - 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, - 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2, - 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7, - 0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, - 0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, - 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c, - 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59, - 0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, - 0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, - 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106, - 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433, - 0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, - 0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, - 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950, - 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65, - 0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, - 0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, - 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa, - 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f, - 0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, - 0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, - 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84, - 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1, - 0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, - 0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, - 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e, - 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b, - 0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, - 0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, - 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, - 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, - 0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, - 0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, - 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, - 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, - 0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, - 0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, - 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, - 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, - 0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, - 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, - 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d -}; - // improved strcmp function that ignores case to prevent checksum comparison issues int strcicmp(char const * a, char const * b) { diff --git a/Cart_Reader/NP.ino b/Cart_Reader/NP.ino index 95bd8c5..4367b9d 100644 --- a/Cart_Reader/NP.ino +++ b/Cart_Reader/NP.ino @@ -3,6 +3,8 @@ //****************************************** // (GB Memory starts at around line 1740) +#define enable_FLASH + /****************************************** SF Memory Cassette ******************************************/ @@ -216,6 +218,7 @@ void sfmGameOptions() { } } +#ifdef enable_FLASH void sfmFlashMenu() { // create menu with title and 6 options to choose from unsigned char flashSubMenu; @@ -453,6 +456,7 @@ void sfmFlashMenu() { wait(); } } +#endif // Read the games from the menu area void getGames() { diff --git a/Cart_Reader/SNES.ino b/Cart_Reader/SNES.ino index 449d362..9bbba77 100644 --- a/Cart_Reader/SNES.ino +++ b/Cart_Reader/SNES.ino @@ -2,6 +2,8 @@ // SUPER NINTENDO MODULE //****************************************** +#define enable_FLASH + /****************************************** Defines *****************************************/ @@ -86,6 +88,7 @@ void snsMenu() { mode = mode_SV; break; +#ifdef enable_FLASH case 3: display_Clear(); display_Update(); @@ -105,6 +108,7 @@ void snsMenu() { wait(); mode = mode_FLASH8; break; +#endif case 5: resetArduino();