Changeset 108986 in vbox

Timestamp:

Apr 15, 2025 2:58:11 PM (5 days ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

168506

Message:

DevPS2M: Fixed Parfait warning about switch statement testing for impossible values outside of IN_RING3.

File:

• trunk/src/VBox/Devices/Input/DevPS2M.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Input/DevPS2M.cpp

@@ -504 +504 @@
 
 #ifndef IN_RING3
+    RT_NOREF(pDevIns);  /* pDevIns only used IN_RING3 */
+
     /* Reset, Enable, and Set Default commands must be run in R3. */
     if (cmd == ACMD_RESET || cmd == ACMD_ENABLE || cmd == ACMD_SET_DEFAULT)
@@ -511 +513 @@
     switch (cmd)
     {
-        case ACMD_SET_SCALE_11:
-            pThis->u8State &= ~AUX_STATE_SCALING;
-            PS2Q_INSERT(&pThis->cmdQ, ARSP_ACK);
-            pThis->u8CurrCmd = 0;
-            break;
-        case ACMD_SET_SCALE_21:
-            pThis->u8State |= AUX_STATE_SCALING;
-            PS2Q_INSERT(&pThis->cmdQ, ARSP_ACK);
-            pThis->u8CurrCmd = 0;
-            break;
-        case ACMD_REQ_STATUS:
-            /* Report current status, sample rate, and resolution. */
-            u8Val  = (pThis->u8State & AUX_STATE_EXTERNAL) | (pThis->fCurrB & PS2M_STD_BTN_MASK);
-            PS2Q_INSERT(&pThis->cmdQ, ARSP_ACK);
-            PS2Q_INSERT(&pThis->cmdQ, u8Val);
-            PS2Q_INSERT(&pThis->cmdQ, pThis->u8Resolution);
-            PS2Q_INSERT(&pThis->cmdQ, pThis->u8SampleRate);
-            pThis->u8CurrCmd = 0;
-            break;
-        case ACMD_SET_STREAM:
-            pThis->u8State &= ~AUX_STATE_REMOTE;
-            PS2Q_INSERT(&pThis->cmdQ, ARSP_ACK);
-            pThis->u8CurrCmd = 0;
-            break;
-        case ACMD_READ_REMOTE:
-            PS2Q_INSERT(&pThis->cmdQ, ARSP_ACK);
-            ps2mReportAccumulatedEvents(pThis, &pThis->cmdQ.Hdr, RT_ELEMENTS(pThis->cmdQ.abQueue), pThis->cmdQ.abQueue, false);
-            pThis->u8CurrCmd = 0;
-            break;
-        case ACMD_RESET_WRAP:
-            pThis->enmMode = AUX_MODE_STD;
-            /* NB: Stream mode reporting remains disabled! */
-            PS2Q_INSERT(&pThis->cmdQ, ARSP_ACK);
-            pThis->u8CurrCmd = 0;
-            break;
-        case ACMD_SET_WRAP:
-            pThis->enmMode = AUX_MODE_WRAP;
-            pThis->u8State &= ~AUX_STATE_ENABLED;
-            PS2Q_INSERT(&pThis->cmdQ, ARSP_ACK);
-            pThis->u8CurrCmd = 0;
-            break;
-        case ACMD_SET_REMOTE:
-            pThis->u8State |= AUX_STATE_REMOTE;
-            PS2Q_INSERT(&pThis->cmdQ, ARSP_ACK);
-            pThis->u8CurrCmd = 0;
-            break;
-        case ACMD_READ_ID:
-            PS2Q_INSERT(&pThis->cmdQ, ARSP_ACK);
-            /* ImEx + horizontal is protocol 4, just like plain ImEx. */
-            u8Val = pThis->enmProtocol == PS2M_PROTO_IMEX_HORZ ? PS2M_PROTO_IMEX : pThis->enmProtocol;
-            PS2Q_INSERT(&pThis->cmdQ, u8Val);
-            pThis->u8CurrCmd = 0;
-            break;
+#ifdef IN_RING3
         case ACMD_ENABLE:
             pThis->u8State |= AUX_STATE_ENABLED;
-#ifdef IN_RING3
             ps2mR3SetDriverState(&PDMDEVINS_2_DATA_CC(pDevIns, PKBDSTATER3)->Aux, true);
-#else
-            AssertLogRelMsgFailed(("Invalid ACMD_ENABLE outside R3!\n"));
-#endif
             PS2Q_CLEAR(&pThis->evtQ);
             PS2Q_INSERT(&pThis->cmdQ, ARSP_ACK);
-            pThis->u8CurrCmd = 0;
-            break;
-        case ACMD_DISABLE:
-            pThis->u8State &= ~AUX_STATE_ENABLED;
-            PS2Q_INSERT(&pThis->cmdQ, ARSP_ACK);
-            pThis->u8CurrCmd = 0;
-            break;
-        case ACMD_SET_DEFAULT:
-            ps2mSetDefaults(pThis);
-            PS2Q_INSERT(&pThis->cmdQ, ARSP_ACK);
-            pThis->u8CurrCmd = 0;
-            break;
-        case ACMD_RESEND:
             pThis->u8CurrCmd = 0;
             break;
@@ -598 +531 @@
                 PDMDevHlpTimerSetMillies(pDevIns, pThis->hDelayTimer, 1);
             else
-#ifdef IN_RING3
                 ps2mR3Reset(pThis, &PDMDEVINS_2_DATA_CC(pDevIns, PKBDSTATER3)->Aux);
-#else
-                AssertLogRelMsgFailed(("Invalid ACMD_RESET outside R3!\n"));
+            break;
+        case ACMD_SET_DEFAULT:
+            ps2mSetDefaults(pThis);
+            PS2Q_INSERT(&pThis->cmdQ, ARSP_ACK);
+            pThis->u8CurrCmd = 0;
+            break;
 #endif
+        case ACMD_SET_SCALE_11:
+            pThis->u8State &= ~AUX_STATE_SCALING;
+            PS2Q_INSERT(&pThis->cmdQ, ARSP_ACK);
+            pThis->u8CurrCmd = 0;
+            break;
+        case ACMD_SET_SCALE_21:
+            pThis->u8State |= AUX_STATE_SCALING;
+            PS2Q_INSERT(&pThis->cmdQ, ARSP_ACK);
+            pThis->u8CurrCmd = 0;
+            break;
+        case ACMD_REQ_STATUS:
+            /* Report current status, sample rate, and resolution. */
+            u8Val  = (pThis->u8State & AUX_STATE_EXTERNAL) | (pThis->fCurrB & PS2M_STD_BTN_MASK);
+            PS2Q_INSERT(&pThis->cmdQ, ARSP_ACK);
+            PS2Q_INSERT(&pThis->cmdQ, u8Val);
+            PS2Q_INSERT(&pThis->cmdQ, pThis->u8Resolution);
+            PS2Q_INSERT(&pThis->cmdQ, pThis->u8SampleRate);
+            pThis->u8CurrCmd = 0;
+            break;
+        case ACMD_SET_STREAM:
+            pThis->u8State &= ~AUX_STATE_REMOTE;
+            PS2Q_INSERT(&pThis->cmdQ, ARSP_ACK);
+            pThis->u8CurrCmd = 0;
+            break;
+        case ACMD_READ_REMOTE:
+            PS2Q_INSERT(&pThis->cmdQ, ARSP_ACK);
+            ps2mReportAccumulatedEvents(pThis, &pThis->cmdQ.Hdr, RT_ELEMENTS(pThis->cmdQ.abQueue), pThis->cmdQ.abQueue, false);
+            pThis->u8CurrCmd = 0;
+            break;
+        case ACMD_RESET_WRAP:
+            pThis->enmMode = AUX_MODE_STD;
+            /* NB: Stream mode reporting remains disabled! */
+            PS2Q_INSERT(&pThis->cmdQ, ARSP_ACK);
+            pThis->u8CurrCmd = 0;
+            break;
+        case ACMD_SET_WRAP:
+            pThis->enmMode = AUX_MODE_WRAP;
+            pThis->u8State &= ~AUX_STATE_ENABLED;
+            PS2Q_INSERT(&pThis->cmdQ, ARSP_ACK);
+            pThis->u8CurrCmd = 0;
+            break;
+        case ACMD_SET_REMOTE:
+            pThis->u8State |= AUX_STATE_REMOTE;
+            PS2Q_INSERT(&pThis->cmdQ, ARSP_ACK);
+            pThis->u8CurrCmd = 0;
+            break;
+        case ACMD_READ_ID:
+            PS2Q_INSERT(&pThis->cmdQ, ARSP_ACK);
+            /* ImEx + horizontal is protocol 4, just like plain ImEx. */
+            u8Val = pThis->enmProtocol == PS2M_PROTO_IMEX_HORZ ? PS2M_PROTO_IMEX : pThis->enmProtocol;
+            PS2Q_INSERT(&pThis->cmdQ, u8Val);
+            pThis->u8CurrCmd = 0;
+            break;
+        case ACMD_DISABLE:
+            pThis->u8State &= ~AUX_STATE_ENABLED;
+            PS2Q_INSERT(&pThis->cmdQ, ARSP_ACK);
+            pThis->u8CurrCmd = 0;
+            break;
+        case ACMD_RESEND:
+            pThis->u8CurrCmd = 0;
             break;
         /* The following commands need a parameter. */