VirtualBox

Ignore:
Timestamp:
Feb 28, 2012 7:47:00 PM (13 years ago)
Author:
vboxsync
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/Devices/Input/PS2K.cpp

    r40133 r40280  
    120120     } name
    121121
    122 /* Internal keyboard queue sizes. The input queue doesn't need to be 
     122/* Internal keyboard queue sizes. The input queue doesn't need to be
    123123 * extra huge and the command queue only needs to handle a few bytes.
    124124 */
     
    537537    case SS_EXT1:
    538538        /* The sequence is E1 1D 45 E1 9D C5. We take the easy way out and remain
    539          * in the SS_EXT1 state until 45 or C5 is received. 
     539         * in the SS_EXT1 state until 45 or C5 is received.
    540540         */
    541541        if ((scanCode & 0x7F) == 0x45) {
     
    621621 * @param   pSSM                SSM handle to read the state from.
    622622 * @param   pQ                  Pointer to the queue.
    623  * 
     623 *
    624624 * @return  int                 VBox status/error code.
    625625 */
     
    654654 * @param   pQ                  Pointer to the queue.
    655655 * @param   pVal                Pointer to storage for the byte.
    656  * 
     656 *
    657657 * @return  int                 VINF_TRY_AGAIN if queue is empty,
    658658 *                              VINF_SUCCESS if a byte was read.
     
    692692    period = (8 + A) * (1 << B) * 417 / 100;
    693693    pThis->uTypematicRepeat = period;
    694     LogRel(("Typematic delay %u ms, repeat period %u ms\n", 
     694    LogRel(("Typematic delay %u ms, repeat period %u ms\n",
    695695            pThis->uTypematicDelay, pThis->uTypematicRepeat));
    696696}
     
    773773        case KCMD_LEDS:
    774774#ifndef IN_RING3
    775             return VINF_IOM_HC_IOPORT_WRITE;
     775            return VINF_IOM_R3_IOPORT_WRITE;
    776776#else
    777777            {
     
    822822
    823823/**
    824  * Send a byte (keystroke or command response) to the the 
    825  * keyboard controller. 
     824 * Send a byte (keystroke or command response) to the the
     825 * keyboard controller.
    826826 *
    827827 * @param   pThis               The keyboard.
     
    958958                PS2InsertQueue((GeneriQ *)&pThis->keyQ, 0xF0);
    959959                PS2InsertQueue((GeneriQ *)&pThis->keyQ, pKeyDef->makeS2);
    960    
     960
    961961                /* Restore shift state for gray keys. */
    962962                if (pKeyDef->keyFlags & KF_GK)
     
    983983            Assert(i < sizeof(abCodes));
    984984        }
    985     } 
     985    }
    986986    else if (pThis->u8ScanSet == 1)
    987987    {
     
    10101010            /* Send a key release code unless it's a make only key. */
    10111011            //@todo: Look up the current typematic setting, not the default!
    1012             if (pKeyDef->keyMatic != T_M) 
     1012            if (pKeyDef->keyMatic != T_M)
    10131013            {
    10141014                PS2InsertQueue((GeneriQ *)&pThis->keyQ, 0xF0);
     
    11081108    NOREF(pszArgs);
    11091109
    1110     pHlp->pfnPrintf(pHlp, "PS/2 Keyboard: scan set %d, scanning %s\n", 
     1110    pHlp->pfnPrintf(pHlp, "PS/2 Keyboard: scan set %d, scanning %s\n",
    11111111                    pThis->u8ScanSet, pThis->fScanning ? "enabled" : "disabled");
    11121112    pHlp->pfnPrintf(pHlp, "Active command %02X\n", pThis->u8CurrCmd);
    1113     pHlp->pfnPrintf(pHlp, "LED state %02X, Num Lock %s\n", pThis->u8LEDs, 
     1113    pHlp->pfnPrintf(pHlp, "LED state %02X, Num Lock %s\n", pThis->u8LEDs,
    11141114                    pThis->fNumLockOn ? "on" : "off");
    11151115    pHlp->pfnPrintf(pHlp, "Typematic delay %ums, repeat period %ums\n",
     
    11411141 * @returns VBox status code.
    11421142 * @param   pInterface      Pointer to the keyboard port interface (KBDState::Keyboard.IPort).
    1143  * @param   u32Usage        USB HID usage code with key 
     1143 * @param   u32Usage        USB HID usage code with key
    11441144 *                          press/release flag.
    11451145 */
     
    11781178        rc = PDMCritSectEnter(&pThis->KbdCritSect, VERR_SEM_BUSY);
    11791179        AssertReleaseRC(rc);
    1180    
     1180
    11811181        rc = PS2KProcessKeyEvent(pThis, u8HidCode, fKeyDown);
    1182    
     1182
    11831183        PDMCritSectLeave(&pThis->KbdCritSect);
    11841184    }
     
    12071207 * Attach command.
    12081208 *
    1209  * This is called to let the device attach to a driver for a 
     1209 * This is called to let the device attach to a driver for a
    12101210 * specified LUN.
    12111211 *
    1212  * This is like plugging in the keyboard after turning on the 
    1213  * system. 
     1212 * This is like plugging in the keyboard after turning on the
     1213 * system.
    12141214 *
    12151215 * @returns VBox status code.
     
    14451445
    14461446/* Table used by the keyboard controller to optionally translate the incoming
    1447  * keyboard data. Note that the translation is designed for essentially taking 
    1448  * Scan Set 2 input and producing Scan Set 1 output, but can be turned on and 
    1449  * off regardless of what the keyboard is sending. 
     1447 * keyboard data. Note that the translation is designed for essentially taking
     1448 * Scan Set 2 input and producing Scan Set 1 output, but can be turned on and
     1449 * off regardless of what the keyboard is sending.
    14501450 */
    14511451static uint8_t aAT2PC[128] = {
     
    14631463 * Convert an AT (Scan Set 2) scancode to PC (Scan Set 1).
    14641464 *
    1465  * @param state         Current state of the translator 
     1465 * @param state         Current state of the translator
    14661466 *                      (xlat_state_t).
    14671467 * @param scanIn        Incoming scan code.
    1468  * @param pScanOut      Pointer to outgoing scan code. The 
     1468 * @param pScanOut      Pointer to outgoing scan code. The
    14691469 *                      contents are only valid if returned
    14701470 *                      state is not XS_BREAK.
     
    14811481
    14821482    /* Preprocess the scan code for a 128-entry translation table. */
    1483     if (scanIn == 0x83)         /* Check for F7 key. */ 
     1483    if (scanIn == 0x83)         /* Check for F7 key. */
    14841484        scan_in = 0x02;
    14851485    else if (scanIn == 0x84)    /* Check for SysRq key. */
     
    14871487    else
    14881488        scan_in = scanIn;
    1489    
     1489
    14901490    /* Values 0x80 and above are passed through, except for 0xF0
    14911491     * which indicates a key release.
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette