vbox的更動 40280 路徑 trunk/src/VBox/Devices/Input/PS2K.cpp

時間撮記:

2012-2-28 下午07:47:00 (13 年 以前)

作者:

vboxsync

訊息:

Corrected a bunch of HC and GC uses in status codes.

檔案:

• trunk/src/VBox/Devices/Input/PS2K.cpp (修改) (18 筆差異)

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

@@ -120 +120 @@
      } name
 
-/* Internal keyboard queue sizes. The input queue doesn't need to be 
+/* Internal keyboard queue sizes. The input queue doesn't need to be
  * extra huge and the command queue only needs to handle a few bytes.
  */
@@ -537 +537 @@
     case SS_EXT1:
         /* The sequence is E1 1D 45 E1 9D C5. We take the easy way out and remain
-         * in the SS_EXT1 state until 45 or C5 is received.  
+         * in the SS_EXT1 state until 45 or C5 is received.
          */
         if ((scanCode & 0x7F) == 0x45) {
@@ -621 +621 @@
  * @param   pSSM                SSM handle to read the state from.
  * @param   pQ                  Pointer to the queue.
- * 
+ *
  * @return  int                 VBox status/error code.
  */
@@ -654 +654 @@
  * @param   pQ                  Pointer to the queue.
  * @param   pVal                Pointer to storage for the byte.
- * 
+ *
  * @return  int                 VINF_TRY_AGAIN if queue is empty,
  *                              VINF_SUCCESS if a byte was read.
@@ -692 +692 @@
     period = (8 + A) * (1 << B) * 417 / 100;
     pThis->uTypematicRepeat = period;
-    LogRel(("Typematic delay %u ms, repeat period %u ms\n", 
+    LogRel(("Typematic delay %u ms, repeat period %u ms\n",
             pThis->uTypematicDelay, pThis->uTypematicRepeat));
 }
@@ -773 +773 @@
         case KCMD_LEDS:
 #ifndef IN_RING3
-            return VINF_IOM_HC_IOPORT_WRITE;
+            return VINF_IOM_R3_IOPORT_WRITE;
 #else
             {
@@ -822 +822 @@
 
 /**
- * Send a byte (keystroke or command response) to the the 
- * keyboard controller. 
+ * Send a byte (keystroke or command response) to the the
+ * keyboard controller.
  *
  * @param   pThis               The keyboard.
@@ -958 +958 @@
                 PS2InsertQueue((GeneriQ *)&pThis->keyQ, 0xF0);
                 PS2InsertQueue((GeneriQ *)&pThis->keyQ, pKeyDef->makeS2);
-    
+
                 /* Restore shift state for gray keys. */
                 if (pKeyDef->keyFlags & KF_GK)
@@ -983 +983 @@
             Assert(i < sizeof(abCodes));
         }
-    } 
+    }
     else if (pThis->u8ScanSet == 1)
     {
@@ -1010 +1010 @@
             /* Send a key release code unless it's a make only key. */
             //@todo: Look up the current typematic setting, not the default!
-            if (pKeyDef->keyMatic != T_M) 
+            if (pKeyDef->keyMatic != T_M)
             {
                 PS2InsertQueue((GeneriQ *)&pThis->keyQ, 0xF0);
@@ -1108 +1108 @@
     NOREF(pszArgs);
 
-    pHlp->pfnPrintf(pHlp, "PS/2 Keyboard: scan set %d, scanning %s\n", 
+    pHlp->pfnPrintf(pHlp, "PS/2 Keyboard: scan set %d, scanning %s\n",
                     pThis->u8ScanSet, pThis->fScanning ? "enabled" : "disabled");
     pHlp->pfnPrintf(pHlp, "Active command %02X\n", pThis->u8CurrCmd);
-    pHlp->pfnPrintf(pHlp, "LED state %02X, Num Lock %s\n", pThis->u8LEDs, 
+    pHlp->pfnPrintf(pHlp, "LED state %02X, Num Lock %s\n", pThis->u8LEDs,
                     pThis->fNumLockOn ? "on" : "off");
     pHlp->pfnPrintf(pHlp, "Typematic delay %ums, repeat period %ums\n",
@@ -1141 +1141 @@
  * @returns VBox status code.
  * @param   pInterface      Pointer to the keyboard port interface (KBDState::Keyboard.IPort).
- * @param   u32Usage        USB HID usage code with key 
+ * @param   u32Usage        USB HID usage code with key
  *                          press/release flag.
  */
@@ -1178 +1178 @@
         rc = PDMCritSectEnter(&pThis->KbdCritSect, VERR_SEM_BUSY);
         AssertReleaseRC(rc);
-    
+
         rc = PS2KProcessKeyEvent(pThis, u8HidCode, fKeyDown);
-    
+
         PDMCritSectLeave(&pThis->KbdCritSect);
     }
@@ -1207 +1207 @@
  * Attach command.
  *
- * This is called to let the device attach to a driver for a 
+ * This is called to let the device attach to a driver for a
  * specified LUN.
  *
- * This is like plugging in the keyboard after turning on the 
- * system. 
+ * This is like plugging in the keyboard after turning on the
+ * system.
  *
  * @returns VBox status code.
@@ -1445 +1445 @@
 
 /* Table used by the keyboard controller to optionally translate the incoming
- * keyboard data. Note that the translation is designed for essentially taking 
- * Scan Set 2 input and producing Scan Set 1 output, but can be turned on and 
- * off regardless of what the keyboard is sending. 
+ * keyboard data. Note that the translation is designed for essentially taking
+ * Scan Set 2 input and producing Scan Set 1 output, but can be turned on and
+ * off regardless of what the keyboard is sending.
  */
 static uint8_t aAT2PC[128] = {
@@ -1463 +1463 @@
  * Convert an AT (Scan Set 2) scancode to PC (Scan Set 1).
  *
- * @param state         Current state of the translator 
+ * @param state         Current state of the translator
  *                      (xlat_state_t).
  * @param scanIn        Incoming scan code.
- * @param pScanOut      Pointer to outgoing scan code. The 
+ * @param pScanOut      Pointer to outgoing scan code. The
  *                      contents are only valid if returned
  *                      state is not XS_BREAK.
@@ -1481 +1481 @@
 
     /* Preprocess the scan code for a 128-entry translation table. */
-    if (scanIn == 0x83)         /* Check for F7 key. */ 
+    if (scanIn == 0x83)         /* Check for F7 key. */
         scan_in = 0x02;
     else if (scanIn == 0x84)    /* Check for SysRq key. */
@@ -1487 +1487 @@
     else
         scan_in = scanIn;
-   
+
     /* Values 0x80 and above are passed through, except for 0xF0
      * which indicates a key release.