Changeset 3857 in vbox for trunk/src/VBox/VMM

Timestamp:

Jul 25, 2007 10:02:21 PM (18 years ago)

Author:

vboxsync

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

23216

Message:

PDMUsb - work in progress.

Location:

trunk/src/VBox/VMM

Files:

• Makefile.kmk (modified) (1 diff)
• PDMDevice.cpp (modified) (3 diffs)
• PDMDriver.cpp (modified) (1 diff)
• PDMInternal.h (modified) (3 diffs)
• testcase/tstVMStructGC.cpp (modified) (1 diff)

trunk/src/VBox/VMM/Makefile.kmk

@@ -138 +138 @@
         VMMSwitcher/AMD64ToPAE.asm
 
+ifdef VBOX_WITH_USB
+VMMR3_DEFS += VBOX_WITH_USB
+VMMR3_SOURCES += PDMUsb.cpp
+endif
+
 
 #

trunk/src/VBox/VMM/PDMDevice.cpp

@@ -688 +688 @@
     }
 
+#ifdef VBOX_WITH_USB
+    /* ditto for USB Devices. */
+    rc = pdmR3UsbLoadModules(pVM);
+    if (RT_FAILURE(rc))
+        return rc;
+#endif
+
 
     /*
@@ -906 +913 @@
     } /* for device instances */
 
+#ifdef VBOX_WITH_USB
+    /* ditto for USB Devices. */
+    rc = pdmR3UsbInstantiateDevices(pVM);
+    if (RT_FAILURE(rc))
+        return rc;
+#endif
+
 
     /*
@@ -937 +951 @@
         }
     }
+
+#ifdef VBOX_WITH_USB
+    /* ditto for USB Devices. */
+    rc = pdmR3UsbInitComplete(pVM);
+    if (RT_FAILURE(rc))
+        return rc;
+#endif
 
     LogFlow(("pdmR3DevInit: returns %Vrc\n", VINF_SUCCESS));

trunk/src/VBox/VMM/PDMDriver.cpp

@@ -49 +49 @@
 /**
  * Internal callback structure pointer.
+ *
  * The main purpose is to define the extra data we associate
  * with PDMDRVREGCB so we can find the VM instance and so on.

trunk/src/VBox/VMM/PDMInternal.h

@@ -314 +314 @@
     /** Registration structure. */
     R3PTRTYPE(const struct PDMUSBREG *) pUsbReg;
-    /** Number of instances. */
-    RTUINT                              cInstances;
+    /** Next instance number. */
+    RTUINT                              iNextInstance;
     /** Pointer to chain of instances (R3 Ptr). */
     R3PTRTYPE(PPDMUSBINS)               pInstances;
@@ -784 +784 @@
     HCPTRTYPE(PPDMRTC)              pRtc;
     /** The registered USB HUBs. (FIFO) */
-    R3PTRTYPE(PPDMUSBHUB)           pUSBHubs;
+    R3PTRTYPE(PPDMUSBHUB)           pUsbHubs;
 
     /** Queue in which devhlp tasks are queued for R3 execution - HC Ptr. */
@@ -864 +864 @@
 int         pdmR3DevFindLun(PVM pVM, const char *pszDevice, unsigned iInstance, unsigned iLun, PPDMLUN *ppLun);
 
-int         pdmR3UsbInit(PVM pVM);
+int         pdmR3UsbLoadModules(PVM pVM);
+int         pdmR3UsbInstantiateDevices(PVM pVM);
+int         pdmR3UsbInitComplete(PVM pVM);
 PPDMUSB     pdmR3UsbLookup(PVM pVM, const char *pszName);
 int         pdmR3UsbFindLun(PVM pVM, const char *pszDevice, unsigned iInstance, unsigned iLun, PPDMLUN *ppLun);

trunk/src/VBox/VMM/testcase/tstVMStructGC.cpp

@@ -235 +235 @@
     GEN_CHECK_OFF(PDM, pDmac);
     GEN_CHECK_OFF(PDM, pRtc);
-    GEN_CHECK_OFF(PDM, pUSBHubs);
+    GEN_CHECK_OFF(PDM, pUsbHubs);
     GEN_CHECK_OFF(PDM, pDevHlpQueueGC);
     GEN_CHECK_OFF(PDM, pDevHlpQueueHC);