Changeset 45030 in vbox for trunk/src/VBox/Main/src-client/KeyboardImpl.cpp
- Timestamp:
- Mar 13, 2013 8:58:12 PM (12 years ago)
- svn:sync-xref-src-repo-rev:
- 84274
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/src-client/KeyboardImpl.cpp
r45029 r45030 316 316 { 317 317 PDMDRV_CHECK_VERSIONS_RETURN_VOID(pDrvIns); 318 PDRVMAINKEYBOARD p Data= PDMINS_2_DATA(pDrvIns, PDRVMAINKEYBOARD);318 PDRVMAINKEYBOARD pThis = PDMINS_2_DATA(pDrvIns, PDRVMAINKEYBOARD); 319 319 LogFlow(("Keyboard::drvDestruct: iInstance=%d\n", pDrvIns->iInstance)); 320 320 321 if (p Data->pKeyboard)322 { 323 AutoWriteLock kbdLock(p Data->pKeyboard COMMA_LOCKVAL_SRC_POS);321 if (pThis->pKeyboard) 322 { 323 AutoWriteLock kbdLock(pThis->pKeyboard COMMA_LOCKVAL_SRC_POS); 324 324 for (unsigned cDev = 0; cDev < KEYBOARD_MAX_DEVICES; ++cDev) 325 if (p Data->pKeyboard->mpDrv[cDev] == pData)325 if (pThis->pKeyboard->mpDrv[cDev] == pThis) 326 326 { 327 p Data->pKeyboard->mpDrv[cDev] = NULL;327 pThis->pKeyboard->mpDrv[cDev] = NULL; 328 328 break; 329 329 } 330 p Data->pKeyboard->mpVMMDev = NULL;330 pThis->pKeyboard->mpVMMDev = NULL; 331 331 } 332 332 } … … 340 340 { 341 341 PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns); 342 PDRVMAINKEYBOARD p Data= PDMINS_2_DATA(pDrvIns, PDRVMAINKEYBOARD);342 PDRVMAINKEYBOARD pThis = PDMINS_2_DATA(pDrvIns, PDRVMAINKEYBOARD); 343 343 LogFlow(("Keyboard::drvConstruct: iInstance=%d\n", pDrvIns->iInstance)); 344 344 … … 357 357 pDrvIns->IBase.pfnQueryInterface = Keyboard::drvQueryInterface; 358 358 359 p Data->IConnector.pfnLedStatusChange = keyboardLedStatusChange;360 p Data->IConnector.pfnSetActive = Keyboard::keyboardSetActive;359 pThis->IConnector.pfnLedStatusChange = keyboardLedStatusChange; 360 pThis->IConnector.pfnSetActive = Keyboard::keyboardSetActive; 361 361 362 362 /* 363 363 * Get the IKeyboardPort interface of the above driver/device. 364 364 */ 365 p Data->pUpPort = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMIKEYBOARDPORT);366 if (!p Data->pUpPort)365 pThis->pUpPort = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMIKEYBOARDPORT); 366 if (!pThis->pUpPort) 367 367 { 368 368 AssertMsgFailed(("Configuration error: No keyboard port interface above!\n")); … … 380 380 return rc; 381 381 } 382 p Data->pKeyboard = (Keyboard *)pv; /** @todo Check this cast! */382 pThis->pKeyboard = (Keyboard *)pv; /** @todo Check this cast! */ 383 383 unsigned cDev; 384 384 for (cDev = 0; cDev < KEYBOARD_MAX_DEVICES; ++cDev) 385 if (!p Data->pKeyboard->mpDrv[cDev])385 if (!pThis->pKeyboard->mpDrv[cDev]) 386 386 { 387 p Data->pKeyboard->mpDrv[cDev] = pData;387 pThis->pKeyboard->mpDrv[cDev] = pThis; 388 388 break; 389 389 }
Note:
See TracChangeset
for help on using the changeset viewer.