Changeset 26170 in vbox for trunk/include/VBox
- Timestamp:
- Feb 2, 2010 8:30:39 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/VBox/pdmusb.h
r26165 r26170 652 652 653 653 /** Pointer the PDM USB Device API. */ 654 R3PTRTYPE(PCPDMUSBHLP) p UsbHlp;654 R3PTRTYPE(PCPDMUSBHLP) pHlpR3; 655 655 /** Pointer to the USB device registration structure. */ 656 656 R3PTRTYPE(PCPDMUSBREG) pReg; … … 686 686 */ 687 687 #ifdef VBOX_STRICT 688 # define PDMUSB_ASSERT_EMT(pUsbIns) pUsbIns->p UsbHlp->pfnAssertEMT(pUsbIns, __FILE__, __LINE__, __FUNCTION__)688 # define PDMUSB_ASSERT_EMT(pUsbIns) pUsbIns->pHlpR3->pfnAssertEMT(pUsbIns, __FILE__, __LINE__, __FUNCTION__) 689 689 #else 690 690 # define PDMUSB_ASSERT_EMT(pUsbIns) do { } while (0) … … 695 695 */ 696 696 #ifdef VBOX_STRICT 697 # define PDMUSB_ASSERT_OTHER(pUsbIns) pUsbIns->p UsbHlp->pfnAssertOther(pUsbIns, __FILE__, __LINE__, __FUNCTION__)697 # define PDMUSB_ASSERT_OTHER(pUsbIns) pUsbIns->pHlpR3->pfnAssertOther(pUsbIns, __FILE__, __LINE__, __FUNCTION__) 698 698 #else 699 699 # define PDMUSB_ASSERT_OTHER(pUsbIns) do { } while (0) … … 722 722 DECLINLINE(int) PDMUsbHlpDriverAttach(PPDMUSBINS pUsbIns, RTUINT iLun, PPDMIBASE pBaseInterface, PPDMIBASE *ppBaseInterface, const char *pszDesc) 723 723 { 724 return pUsbIns->p UsbHlp->pfnDriverAttach(pUsbIns, iLun, pBaseInterface, ppBaseInterface, pszDesc);724 return pUsbIns->pHlpR3->pfnDriverAttach(pUsbIns, iLun, pBaseInterface, ppBaseInterface, pszDesc); 725 725 } 726 726 727 727 /** 728 * VBOX_STRICT wrapper for p UsbHlp->pfnDBGFStopV.728 * VBOX_STRICT wrapper for pHlpR3->pfnDBGFStopV. 729 729 * 730 730 * @returns VBox status code which must be passed up to the VMM. … … 740 740 va_list va; 741 741 va_start(va, pszFormat); 742 rc = pUsbIns->p UsbHlp->pfnDBGFStopV(pUsbIns, RT_SRC_POS_ARGS, pszFormat, va);742 rc = pUsbIns->pHlpR3->pfnDBGFStopV(pUsbIns, RT_SRC_POS_ARGS, pszFormat, va); 743 743 va_end(va); 744 744 return rc; … … 758 758 DECLINLINE(VMSTATE) PDMUsbHlpVMState(PPDMUSBINS pUsbIns) 759 759 { 760 return pUsbIns->p UsbHlp->pfnVMState(pUsbIns);760 return pUsbIns->pHlpR3->pfnVMState(pUsbIns); 761 761 } 762 762 … … 766 766 DECLINLINE(int) PDMUsbHlpSetAsyncNotification(PPDMUSBINS pUsbIns, PFNPDMUSBASYNCNOTIFY pfnAsyncNotify) 767 767 { 768 return pUsbIns->p UsbHlp->pfnSetAsyncNotification(pUsbIns, pfnAsyncNotify);768 return pUsbIns->pHlpR3->pfnSetAsyncNotification(pUsbIns, pfnAsyncNotify); 769 769 } 770 770 … … 774 774 DECLINLINE(void) PDMUsbHlpAsyncNotificationCompleted(PPDMUSBINS pUsbIns) 775 775 { 776 pUsbIns->p UsbHlp->pfnAsyncNotificationCompleted(pUsbIns);776 pUsbIns->pHlpR3->pfnAsyncNotificationCompleted(pUsbIns); 777 777 } 778 778 … … 791 791 va_list va; 792 792 va_start(va, pszFormat); 793 rc = pUsbIns->p UsbHlp->pfnVMSetErrorV(pUsbIns, rc, RT_SRC_POS_ARGS, pszFormat, va);793 rc = pUsbIns->pHlpR3->pfnVMSetErrorV(pUsbIns, rc, RT_SRC_POS_ARGS, pszFormat, va); 794 794 va_end(va); 795 795 return rc;
Note:
See TracChangeset
for help on using the changeset viewer.