From 39b66743cd33fab704e7ad8820f0610d9f664f1b Mon Sep 17 00:00:00 2001 From: AKuHAK <621640+AKuHAK@users.noreply.github.com> Date: Wed, 14 Aug 2024 14:50:46 +0300 Subject: [PATCH] Fix case switch --- PMAP-wingui/id-main.c | 3 ++ base/eeprom.c | 13 ++++++ base/elect.c | 1 + base/id-main.c | 104 ++++++++++++++++++++++-------------------- base/mecha-main.c | 56 ++++++++++++++--------- base/mecha.c | 6 ++- base/mecha.h | 2 +- base/updates.c | 1 + 8 files changed, 112 insertions(+), 74 deletions(-) diff --git a/PMAP-wingui/id-main.c b/PMAP-wingui/id-main.c index cfd4a03..8e21a0a 100644 --- a/PMAP-wingui/id-main.c +++ b/PMAP-wingui/id-main.c @@ -50,6 +50,7 @@ extern unsigned char ConType, ConCEXDEX; break; case 3: done = 1; + break; } if (!done) @@ -117,6 +118,7 @@ extern unsigned char ConType, ConCEXDEX; break; case 14: done = 1; + break; } } else @@ -134,6 +136,7 @@ extern unsigned char ConType, ConCEXDEX; break; case 8: done = 1; + break; } } } diff --git a/base/eeprom.c b/base/eeprom.c index 68d4eff..1e9c829 100644 --- a/base/eeprom.c +++ b/base/eeprom.c @@ -175,6 +175,7 @@ int EEPROMClear(void) break; default: result = -EINVAL; + break; } return result; @@ -195,6 +196,7 @@ int EEPROMDefaultAll(void) break; default: result = -EINVAL; + break; } return result; @@ -215,6 +217,7 @@ int EEPROMDefaultDiscDetect(void) break; default: result = -EINVAL; + break; } return result; @@ -235,6 +238,7 @@ int EEPROMDefaultServo(void) break; default: result = -EINVAL; + break; } return result; @@ -253,6 +257,7 @@ int EEPROMDefaultTilt(void) break; default: result = -EINVAL; + break; } return result; @@ -276,6 +281,7 @@ int EEPROMDefaultTray(void) break; default: result = -EINVAL; + break; } return result; @@ -299,6 +305,7 @@ int EEPROMDefaultEEGS(void) break; default: result = -EINVAL; + break; } return result; @@ -359,6 +366,7 @@ int EEPROMDefaultRTC(void) default: PlatShowEMessage("Clear RTC: unknown MD version\n"); result = -EINVAL; + break; } return result; @@ -385,6 +393,7 @@ int EEPROMDefaultDVDVideo(void) break; default: result = -EINVAL; + break; } return result; @@ -411,6 +420,7 @@ int EEPROMDefaultID(void) break; default: result = -EINVAL; + break; } return result; @@ -433,6 +443,7 @@ int EEPROMDefaultModelName(void) break; default: result = -EINVAL; + break; } return result; @@ -456,6 +467,7 @@ int EEPROMDefaultOSD(void) break; default: result = -EINVAL; + break; } return result; @@ -487,6 +499,7 @@ int EEPROMDefaultSanyoOP(void) break; default: result = -EINVAL; + break; } return result; diff --git a/base/elect.c b/base/elect.c index ed19dca..9cd37e7 100644 --- a/base/elect.c +++ b/base/elect.c @@ -653,6 +653,7 @@ static int ElectJudgeOPTypeError(const char *result, int len) break; default: OPMismatched = 0; + break; } if (OPMismatched) diff --git a/base/id-main.c b/base/id-main.c index 6f927d0..9c64e73 100644 --- a/base/id-main.c +++ b/base/id-main.c @@ -23,11 +23,11 @@ static void InitMechacon(void) do { PlatShowMessage("MECHACON initialization for H/I-chassis\n" - "Select type:\n" - "\t1. CEX\n" - "\t2. DEX\n" - "\t3. Quit\n" - "Your choice: "); + "Select type:\n" + "\t1. CEX\n" + "\t2. DEX\n" + "\t3. Quit\n" + "Your choice: "); choice = 0; if (scanf("%d", &choice) > 0) while (getchar() != '\n') @@ -45,6 +45,7 @@ static void InitMechacon(void) break; case 3: done = 1; + break; } if (!done) @@ -54,35 +55,35 @@ static void InitMechacon(void) if (!dex) { PlatShowMessage("Select model Name:\n" - "\t1. SCPH-xx000 (Japan)\n" - "\t2. SCPH-xx001 (USA)\n" - "\t3. SCPH-xx002 (Australia)\n" - "\t4. SCPH-xx003 (Great Britian)\n" - "\t5. SCPH-xx004 (Europe)\n" - "\t6. SCPH-xx005 (Korea)\n" - "\t7. SCPH-xx006 (Hong Kong)\n" - "\t8. SCPH-xx007 (Taiwan)\n" - "\t9. SCPH-xx008 (Russia)\n" - "\t10. SCPH-50009 (China)\n" - "\t11. SCPH-xx010 (SCPH-50010: Canada, Slims: Mexico)\n" - "\t12. SCPH-x0011 (SCPH-50011: Mexico, SCPH-70011: USA)\n" - "\t13. SCPH-70012 (Canada)\n" - "\t14. Quit\n" - "Your choice: "); + "\t1. SCPH-xx000 (Japan)\n" + "\t2. SCPH-xx001 (USA)\n" + "\t3. SCPH-xx002 (Australia)\n" + "\t4. SCPH-xx003 (Great Britian)\n" + "\t5. SCPH-xx004 (Europe)\n" + "\t6. SCPH-xx005 (Korea)\n" + "\t7. SCPH-xx006 (Hong Kong)\n" + "\t8. SCPH-xx007 (Taiwan)\n" + "\t9. SCPH-xx008 (Russia)\n" + "\t10. SCPH-50009 (China)\n" + "\t11. SCPH-xx010 (SCPH-50010: Canada, Slims: Mexico)\n" + "\t12. SCPH-x0011 (SCPH-50011: Mexico, SCPH-70011: USA)\n" + "\t13. SCPH-70012 (Canada)\n" + "\t14. Quit\n" + "Your choice: "); NumChoices = 12; } else { PlatShowMessage("Select model Name:\n" - "\t1. DTL-H50000\n" - "\t2. DTL-H50001\n" - "\t3. DTL-H50002\n" - "\t4. DTL-H50005\n" - "\t5. DTL-H50006\n" - "\t6. DTL-H50008\n" - "\t7. DTL-H50009\n" - "\t8. Quit\n" - "Your choice: "); + "\t1. DTL-H50000\n" + "\t2. DTL-H50001\n" + "\t3. DTL-H50002\n" + "\t4. DTL-H50005\n" + "\t5. DTL-H50006\n" + "\t6. DTL-H50008\n" + "\t7. DTL-H50009\n" + "\t8. Quit\n" + "Your choice: "); NumChoices = 8; } choice = 0; @@ -112,6 +113,7 @@ static void InitMechacon(void) break; case 14: done = 1; + break; } } else @@ -129,6 +131,7 @@ static void InitMechacon(void) break; case 8: done = 1; + break; } } } @@ -146,8 +149,8 @@ static void WriteiLinkID(void) EEPROMGetiLinkID(iLinkID); PlatShowMessage("Current i.Link ID:\t%02x %02x %02x %02x %02x %02x %02x %02x\n" - "Enter new ID:\t\t", - iLinkID[0], iLinkID[1], iLinkID[2], iLinkID[3], iLinkID[4], iLinkID[5], iLinkID[6], iLinkID[7]); + "Enter new ID:\t\t", + iLinkID[0], iLinkID[1], iLinkID[2], iLinkID[3], iLinkID[4], iLinkID[5], iLinkID[6], iLinkID[7]); if (scanf("%02hx %02hx %02hx %02hx %02hx %02hx %02hx %02hx", &NewiLinkIDInput[0], &NewiLinkIDInput[1], &NewiLinkIDInput[2], &NewiLinkIDInput[3], &NewiLinkIDInput[4], &NewiLinkIDInput[5], &NewiLinkIDInput[6], &NewiLinkIDInput[7]) == 8) @@ -174,8 +177,8 @@ static void WriteConsoleID(void) EEPROMGetConsoleID(ConsoleID); PlatShowMessage("Current console ID:\t%02x %02x %02x %02x %02x %02x %02x %02x\n" - "Enter new ID:\t\t", - ConsoleID[0], ConsoleID[1], ConsoleID[2], ConsoleID[3], ConsoleID[4], ConsoleID[5], ConsoleID[6], ConsoleID[7]); + "Enter new ID:\t\t", + ConsoleID[0], ConsoleID[1], ConsoleID[2], ConsoleID[3], ConsoleID[4], ConsoleID[5], ConsoleID[6], ConsoleID[7]); if (scanf("%02hx %02hx %02hx %02hx %02hx %02hx %02hx %02hx", &NewConsoleIDInput[0], &NewConsoleIDInput[1], &NewConsoleIDInput[2], &NewConsoleIDInput[3], &NewConsoleIDInput[4], &NewConsoleIDInput[5], &NewConsoleIDInput[6], &NewConsoleIDInput[7]) == 8) @@ -208,9 +211,9 @@ static void WriteModelName(void) ModelName = EEPROMGetModelName(); PlatShowMessage("Current model name:\t%s\n" - "Maximum length is 16\n" - "Enter new name:\t\t", - ModelName[0] == 0x00 ? "" : ModelName); + "Maximum length is 16\n" + "Enter new name:\t\t", + ModelName[0] == 0x00 ? "" : ModelName); if (fgets(NewModelName, sizeof(NewModelName), stdin)) { NewModelName[16] = '\0'; @@ -225,9 +228,9 @@ static void DisplayIDInfo(void) EEPROMGetiLinkID(iLinkID); EEPROMGetConsoleID(ConsoleID); PlatShowMessage("i.Link ID:\t%02x %02x %02x %02x %02x %02x %02x %02x\n" - "Console ID:\t%02x %02x %02x %02x %02x %02x %02x %02x\n", - iLinkID[0], iLinkID[1], iLinkID[2], iLinkID[3], iLinkID[4], iLinkID[5], iLinkID[6], iLinkID[7], - ConsoleID[0], ConsoleID[1], ConsoleID[2], ConsoleID[3], ConsoleID[4], ConsoleID[5], ConsoleID[6], ConsoleID[7]); + "Console ID:\t%02x %02x %02x %02x %02x %02x %02x %02x\n", + iLinkID[0], iLinkID[1], iLinkID[2], iLinkID[3], iLinkID[4], iLinkID[5], iLinkID[6], iLinkID[7], + ConsoleID[0], ConsoleID[1], ConsoleID[2], ConsoleID[3], ConsoleID[4], ConsoleID[5], ConsoleID[6], ConsoleID[7]); } static void InitNTSCPALDefaults(void) @@ -237,10 +240,10 @@ static void InitNTSCPALDefaults(void) do { PlatShowMessage("NTSC/PAL selection:\n" - "\t1. NTSC\n" - "\t2. PAL\n" - "\t3. Quit\n" - "Your choice: "); + "\t1. NTSC\n" + "\t2. PAL\n" + "\t3. Quit\n" + "Your choice: "); choice = 0; if (scanf("%d", &choice) > 0) while (getchar() != '\n') @@ -278,13 +281,13 @@ void MenuID(void) DisplayCommonConsoleInfo(); DisplayIDInfo(); PlatShowMessage("ID Managenent:\n" - "\t1. Write i.Link ID\n" - "\t2. Write console ID\n" - "\t3. Write model name (AB-chassis and later only)\n" - "\t4. Initialize NTSC/PAL defaults (B-chassis DEX and later only)\n" - "\t5. Initialize MECHACON (H/I-chassis only)\n" - "\t6. Quit\n" - "Your choice: "); + "\t1. Write i.Link ID\n" + "\t2. Write console ID\n" + "\t3. Write model name (AB-chassis and later only)\n" + "\t4. Initialize NTSC/PAL defaults (B-chassis DEX and later only)\n" + "\t5. Initialize MECHACON (H/I-chassis only)\n" + "\t6. Quit\n" + "Your choice: "); choice = 0; if (scanf("%d", &choice) > 0) while (getchar() != '\n') @@ -322,6 +325,7 @@ void MenuID(void) break; default: done = 1; + break; } } while (!done); } diff --git a/base/mecha-main.c b/base/mecha-main.c index 8cb1557..acf6ee7 100644 --- a/base/mecha-main.c +++ b/base/mecha-main.c @@ -153,6 +153,7 @@ static int MechaAdjTxHandler(MechaTask_t *task) PlatShowMessage("Unsupported disc type: %02x\n", DiscDetect); return 1; } + break; default: return 0; } @@ -228,6 +229,7 @@ static int MechaAdjRxHandler(MechaTask_t *task, const char *result, short int le default: return MechaDefaultHandleRes2(task, result, len); } + break; default: return MechaDefaultHandleResUnknown(task, result, len); } @@ -424,12 +426,12 @@ static int MechaAdjInit(short int argc, char *argv[]) case MECHA_TYPE_G2: MechaCommandAdd(MECHA_CMD_AUTO_ADJ_FIX_GAIN, "0003", id++, 0, 20000, "CD ADJUSTMENT (FIX GAIN)"); break; - case MECHA_TYPE_40: // TCD-732RA + case MECHA_TYPE_40: MechaCommandAdd(MECHA_CMD_AUTO_ADJ_ST_12, "00", id++, 0, 20000, "CD AUTO ADJUSTMENT (1+2)"); break; case MECHA_TYPE_36: case MECHA_TYPE_38: - case MECHA_TYPE_39: // TCD-732RA + case MECHA_TYPE_39: MechaCommandAdd(MECHA_CMD_AUTO_ADJ_ST_1, "00", id++, 0, 20000, "CD AUTO ADJUSTMENT (STAGE 1)"); MechaCommandAdd(MECHA_CMD_AUTO_ADJ_ST_2, "00", id++, 0, 20000, "CD AUTO ADJUSTMENT (STAGE 2)"); break; @@ -460,6 +462,7 @@ static int MechaAdjInit(short int argc, char *argv[]) case MECHA_TYPE_G2: // TDR-832 MechaCommandAdd(MECHA_CMD_AUTO_ADJ_ST_1, "00", id++, 0, 20000, "DVD-SL AUTO ADJUSTMENT (STAGE 1)"); MechaCommandAdd(MECHA_CMD_AUTO_ADJ_ST_2, "00", id++, 0, 20000, "DVD-SL AUTO ADJUSTMENT (STAGE 2)"); + break; } MechaCommandAdd(MECHA_CMD_FOCUS_UPDOWN, "00", id++, 0, 3000, "DVD-SL STOP"); if (MechaCommandExecuteList(&MechaAdjTxHandler, &MechaAdjRxHandler) != 0) @@ -486,6 +489,7 @@ static int MechaAdjInit(short int argc, char *argv[]) case MECHA_TYPE_G2: // HLX-505 MechaCommandAdd(MECHA_CMD_AUTO_ADJ_ST_1, "00", id++, 0, 20000, "DVD-DL AUTO ADJUSTMENT (STAGE 1)"); MechaCommandAdd(MECHA_CMD_AUTO_ADJ_ST_2, "00", id++, 0, 20000, "DVD-DL AUTO ADJUSTMENT (STAGE 2)"); + break; } MechaCommandAdd(MECHA_CMD_FOCUS_UPDOWN, "00", id++, 0, 3000, "DVD-DL STOP"); if (MechaCommandExecuteList(&MechaAdjTxHandler, &MechaAdjRxHandler) != 0) @@ -515,6 +519,7 @@ static int MechaAdjInit(short int argc, char *argv[]) case MECHA_TYPE_39: MechaCommandAdd(MECHA_CMD_AUTO_ADJ_ST_1, "00", id++, 0, 20000, "DVD-SL AUTO ADJUSTMENT (STAGE 1)"); MechaCommandAdd(MECHA_CMD_AUTO_ADJ_ST_2MD, "00", id++, 0, 20000, "DVD-SL AUTO ADJUSTMENT (STAGE 2MD)"); + break; } MechaCommandAdd(MECHA_CMD_FOCUS_UPDOWN, "00", id++, 0, 3000, "DVD-SL STOP"); if (MechaCommandExecuteList(&MechaAdjTxHandler, &MechaAdjRxHandler) != 0) @@ -554,8 +559,8 @@ static int MechaAdjPlay(short int argc, char *argv[]) { if ((result = MechaCommandExecute(MECHA_CMD_FOCUS_JUMP, 2000, "0300", buffer, sizeof(buffer))) < 0 || (result = strtoul(buffer, NULL, 16)) != 0) PlatShowMessage("Error %d\n", result); - break; } + break; case MECHA_ADJ_STATE_DVDSL_PAUSE: case MECHA_ADJ_STATE_DVDSL_1: case MECHA_ADJ_STATE_DVDSL_1p6: @@ -597,6 +602,7 @@ static int MechaAdjPlay(short int argc, char *argv[]) PlatShowMessage("Unsupported speed.\n"); timeout = 0; command = 0; + break; } if (command != 0) @@ -631,6 +637,7 @@ static int MechaAdjPlay(short int argc, char *argv[]) PlatShowMessage("Unsupported speed.\n"); timeout = 0; command = 0; + break; } if (command != 0) @@ -809,6 +816,7 @@ static int MechaAdjPause(short int argc, char *argv[]) break; default: PlatShowMessage("Not in PLAY mode.\n"); + break; } return 0; @@ -922,13 +930,13 @@ static int MechaAdjGetError(short int argc, char *argv[]) if (MechaCommandExecuteList(&MechaAdjTxHandler, &MechaAdjRxHandler) == 0) { PlatShowMessage("DVD Error Data:\n" - "PI Correct:\t\t%#04x\tPO Correct:\t\t%#04x\n" - "PI Non-correct:\t%#04x\tPO Non-correct:\t%#04x\n" - "PI Max:\t\t\t%#04x\tPO Max:\t\t\t%#04x\n" - "Jitter:\t\t\t%#04x\n", - DvdError.PICorrect, DvdError.PINCorrect, DvdError.PIMax, - DvdError.POCorrect, DvdError.PONCorrect, DvdError.POMax, - DvdError.jitter); + "PI Correct:\t\t%#04x\tPO Correct:\t\t%#04x\n" + "PI Non-correct:\t%#04x\tPO Non-correct:\t%#04x\n" + "PI Max:\t\t\t%#04x\tPO Max:\t\t\t%#04x\n" + "Jitter:\t\t\t%#04x\n", + DvdError.PICorrect, DvdError.PINCorrect, DvdError.PIMax, + DvdError.POCorrect, DvdError.PONCorrect, DvdError.POMax, + DvdError.jitter); } else PlatShowMessage("Failed to execute.\n"); @@ -1101,7 +1109,7 @@ static int DisplayHelp(const struct MechaDiagCommand *commands, short int argc, if (argc == 1) { PlatShowMessage("To get help for a specific command, type HELP \n" - "Available commands:\n"); + "Available commands:\n"); for (pCmd = commands, i = 0; pCmd->command != NULL; pCmd++, i++) { PlatShowMessage("\t%s%c", pCmd->command, ((i != 0) && (i % 4) == 0) ? '\n' : ' '); @@ -1399,6 +1407,7 @@ static int MechaTestPlay(short int argc, char *argv[]) } else PlatShowMessage("Not in PLAY mode.\n"); + break; } } else if (!pstricmp(argv[1], "FWDL")) @@ -1425,6 +1434,7 @@ static int MechaTestPlay(short int argc, char *argv[]) } else PlatShowMessage("Not in PLAY mode.\n"); + break; } } else if (!pstricmp(argv[1], "REVL")) @@ -1451,6 +1461,7 @@ static int MechaTestPlay(short int argc, char *argv[]) } else PlatShowMessage("Not in PLAY mode.\n"); + break; } } else if (!pstricmp(argv[1], "STOP")) @@ -1484,10 +1495,12 @@ static int MechaTestPlay(short int argc, char *argv[]) break; case MECHA_ADJ_STATE_DVDDL_1: status = MECHA_ADJ_STATE_DVDDL; + break; } } else PlatShowMessage("Not in PLAY mode.\n"); + break; } } else if (!pstricmp(argv[1], "FJ")) @@ -1663,12 +1676,12 @@ void MenuMECHA(void) do { PlatShowMessage("\nMechanics (skew) Adjustment\n" - "This tool allows you to re-calibrate and test the mechanics (skew) of the CD/DVD drive.\n" - "You need to do this if you:\n" - "\t1. Change/remove the OPtical (OP) block\n" - "\t2. Change/remove the spindle motor\n" - "Warning! This process MAY damage the laser if the wrong type of disc is used!\n" - "\nContinue with MECHA adjustment? [y/n]"); + "This tool allows you to re-calibrate and test the mechanics (skew) of the CD/DVD drive.\n" + "You need to do this if you:\n" + "\t1. Change/remove the OPtical (OP) block\n" + "\t2. Change/remove the spindle motor\n" + "Warning! This process MAY damage the laser if the wrong type of disc is used!\n" + "\nContinue with MECHA adjustment? [y/n]"); choice = getchar(); while (getchar() != '\n') @@ -1686,10 +1699,10 @@ void MenuMECHA(void) do { PlatShowMessage("\nMechanics (skew) Adjustment\n" - "\t1. Adjust mechanics\n" - "\t2. Test mechanics\n" - "\t3. Quit\n" - "Your choice: "); + "\t1. Adjust mechanics\n" + "\t2. Test mechanics\n" + "\t3. Quit\n" + "Your choice: "); input = 0; if (scanf("%d", &input) > 0) while (getchar() != '\n') @@ -1707,6 +1720,7 @@ void MenuMECHA(void) break; default: done = 1; + break; } } while (!done); } diff --git a/base/mecha.c b/base/mecha.c index b8aca1d..cf5b090 100644 --- a/base/mecha.c +++ b/base/mecha.c @@ -161,7 +161,6 @@ int MechaCommandExecuteList(MechaCommandTxHandler_t transmit, MechaCommandRxHand if (result == -EPIPE) { - TaskCount = 0; if (!is_valid_data(RxBuffer, size)) { PlatShowEMessage("Error: Connection problems, received invalid data for task ID %02d.\n", task->id); @@ -175,7 +174,6 @@ int MechaCommandExecuteList(MechaCommandTxHandler_t transmit, MechaCommandRxHand if (receive != NULL) { - TaskCount = 0; if ((result = receive(task, RxBuffer, size)) != 0) break; } @@ -250,6 +248,7 @@ static void MechaGetNameOfMD(void) break; default: ConType = MECHA_TYPE_39; + break; } break; case 40: @@ -258,6 +257,7 @@ static void MechaGetNameOfMD(void) default: ConType = 0xFF; PlatShowEMessage("MD Name: Unknown MD version.\n"); + break; } } @@ -302,6 +302,7 @@ static void MechaParseOP(void) break; default: ConOP = 0xFF; + break; } */ } @@ -372,6 +373,7 @@ static void MechaParseLens(u16 reg10, u16 reg12, u16 reg13) break; default: ConLens = 0xFF; + break; } } else diff --git a/base/mecha.h b/base/mecha.h index 180bf7c..31bd487 100644 --- a/base/mecha.h +++ b/base/mecha.h @@ -1,4 +1,4 @@ -#define MAX_MECHA_TASKS 256 +#define MAX_MECHA_TASKS 128 #define MECHA_TASK_ARGS_MAX 24 // Recommended buffer sizes for various functions diff --git a/base/updates.c b/base/updates.c index b5a8bcc..4a0046c 100644 --- a/base/updates.c +++ b/base/updates.c @@ -673,6 +673,7 @@ int MechaUpdateChassisD(int ClearOSD2InitBit, int ReplacedMecha, int lens, int o break; default: ReplacedMecha = 1; + break; } forceUpdate = (ReplacedMecha || ConChecksumStat == 0 || lens != ConLens);