Changeset 3857

Timestamp:

07/26/07 00:02:21 (1 year ago)

Author:

vboxsync

Message:

PDMUsb - work in progress.

Files:

• trunk/include/VBox/err.h (modified) (1 diff)
• trunk/include/VBox/pdmusb.h (modified) (10 diffs)
• trunk/src/VBox/VMM/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/VMM/PDMDevice.cpp (modified) (3 diffs)
• trunk/src/VBox/VMM/PDMDriver.cpp (modified) (1 diff)
• trunk/src/VBox/VMM/PDMInternal.h (modified) (3 diffs)
• trunk/src/VBox/VMM/testcase/tstVMStructGC.cpp (modified) (1 diff)

trunk/include/VBox/err.h

@@ -892 +892 @@
-#define VERR_PDM_HIF_INVALID_VERSION                (-2855)
-
+/** The version of the USB device registration structure is unknown
+ * to this VBox version. Either mixing incompatible versions or
+ * the structure isn't correctly initialized. */
+#define VERR_PDM_UNKNOWN_USBREG_VERSION             (-2856)
+/** Invalid entry in the device registration structure. */
+#define VERR_PDM_INVALID_USB_REGISTRATION           (-2857)
+/** Driver name clash. Another driver with the same name as the
+ * one begin registred exists. */
+#define VERR_PDM_USB_NAME_CLASH                     (-2858)
+/** The USB hub is already registered. */
+#define VERR_PDM_USB_HUB_EXISTS                     (-2859)
+/** Couldn't find any USB hubs to attach the device to. */
+#define VERR_PDM_NO_USB_HUBS                        (-2860)
+/** Couldn't find any free USB ports to attach the device to. */
+#define VERR_PDM_NO_USB_PORTS                       (-2861)
+/** Couldn't find the USB Proxy device. Using OSE? */
+#define VERR_PDM_NO_USBPROXY                        (-2862)
+
-/** @} */
-

trunk/include/VBox/pdmusb.h

@@ -36 +36 @@
-/** PDM USB Device Registration Structure,
- *
-SB
+sb
- * The PDM will make use of this structure untill the VM is destroyed.
- */
@@ -394 +394 @@
-
-/** Current USBHLP version number. */
-0
+
-
-#endif /* IN_RING3 */
@@ -421 +421 @@
-    } Internal;
-
-HC PDM
-Dev
+PDM USB
+Usb
-    /** Pointer to the USB device registration structure.  */
-Dev
+Usb
-    /** Configuration handle. */
-    R3PTRTYPE(PCFGMNODE)        pCfg;
@@ -449 +449 @@
- */
-#ifdef VBOX_STRICT
-DevIns)  pDevIns->pDevHlp->pfnAssertEMT(pDev
+UsbIns)  pUsbIns->pUsbHlp->pfnAssertEMT(pUsb
-#else
-Dev
+Usb
-#endif
-
@@ -458 +458 @@
- */
-#ifdef VBOX_STRICT
-DevIns)  pDevIns->pDevHlp->pfnAssertOther(pDev
+UsbIns)  pUsbIns->pUsbHlp->pfnAssertOther(pUsb
-#else
-Dev
+Usb
-#endif
-
@@ -466 +466 @@
- * Set the VM error. See PDMDevHlpVMSetError() for printf like message formatting.
- */
-Dev
-Dev
+Usb
+Usb
-
-/** @def PDMUSB_SET_RUNTIME_ERROR
- * Set the VM runtime error. See PDMDevHlpVMSetRuntimeError() for printf like message formatting.
- */
-Dev
-Dev
+Usb
+Usb
-
-
@@ -479 +479 @@
-
-/**
-Dev
+Usb
- *
- * @returns VBox status code which must be passed up to the VMM.
-Dev
+Usb
- * @param   RT_SRC_POS_DECL     Use RT_SRC_POS.
- * @param   pszFormat           Message. (optional)
@@ -493 +493 @@
-    va_list va;
-    va_start(va, pszFormat);
-Dev
+Usb
-    va_end(va);
-    return rc;
@@ -508 +508 @@
-
-
-SB
+sb
-typedef const struct PDMUSBREGCB *PCPDMUSBREGCB;
-
@@ -546 +546 @@
-
-/**
-SB
+sb
- *
- * PDM will invoke this function after loading a USB device module and letting

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;
-umber of instances
-cInstances
+ext instance number
+iNextInstance
-    /** Pointer to chain of instances (R3 Ptr). */
-    R3PTRTYPE(PPDMUSBINS)               pInstances;
@@ -784 +784 @@
-    HCPTRTYPE(PPDMRTC)              pRtc;
-    /** The registered USB HUBs. (FIFO) */
-SB
+sb
-
-    /** 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);
-
-
+
+
+
-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);
-SB
+sb
-    GEN_CHECK_OFF(PDM, pDevHlpQueueGC);
-    GEN_CHECK_OFF(PDM, pDevHlpQueueHC);