Changeset 3857 in vbox for trunk/include

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/include/VBox

Files:

• err.h (modified) (1 diff)
• pdmusb.h (modified) (10 diffs)

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,
  *
- * This structure is used when registering a device from VBoxUSBRegister() in HC Ring-3.
+ * This structure is used when registering a device from VBoxUsbRegister() in HC Ring-3.
  * The PDM will make use of this structure untill the VM is destroyed.
  */
@@ -394 +394 @@
 
 /** Current USBHLP version number. */
-#define PDM_USBHLP_VERSION  0xec0020000
+#define PDM_USBHLP_VERSION  0xec020000
 
 #endif /* IN_RING3 */
@@ -421 +421 @@
     } Internal;
 
-    /** Pointer the HC PDM Device API. */
-    R3PTRTYPE(PCPDMUSBHLP)      pDevHlp;
+    /** Pointer the PDM USB Device API. */
+    R3PTRTYPE(PCPDMUSBHLP)      pUsbHlp;
     /** Pointer to the USB device registration structure.  */
-    R3PTRTYPE(PCPDMUSBREG)      pDevReg;
+    R3PTRTYPE(PCPDMUSBREG)      pUsbReg;
     /** Configuration handle. */
     R3PTRTYPE(PCFGMNODE)        pCfg;
@@ -449 +449 @@
  */
 #ifdef VBOX_STRICT
-# define PDMUSB_ASSERT_EMT(pDevIns)  pDevIns->pDevHlp->pfnAssertEMT(pDevIns, __FILE__, __LINE__, __FUNCTION__)
+# define PDMUSB_ASSERT_EMT(pUsbIns)  pUsbIns->pUsbHlp->pfnAssertEMT(pUsbIns, __FILE__, __LINE__, __FUNCTION__)
 #else
-# define PDMUSB_ASSERT_EMT(pDevIns)  do { } while (0)
+# define PDMUSB_ASSERT_EMT(pUsbIns)  do { } while (0)
 #endif
 
@@ -458 +458 @@
  */
 #ifdef VBOX_STRICT
-# define PDMUSB_ASSERT_OTHER(pDevIns)  pDevIns->pDevHlp->pfnAssertOther(pDevIns, __FILE__, __LINE__, __FUNCTION__)
+# define PDMUSB_ASSERT_OTHER(pUsbIns)  pUsbIns->pUsbHlp->pfnAssertOther(pUsbIns, __FILE__, __LINE__, __FUNCTION__)
 #else
-# define PDMUSB_ASSERT_OTHER(pDevIns)  do { } while (0)
+# define PDMUSB_ASSERT_OTHER(pUsbIns)  do { } while (0)
 #endif
 
@@ -466 +466 @@
  * Set the VM error. See PDMDevHlpVMSetError() for printf like message formatting.
  */
-#define PDMUSB_SET_ERROR(pDevIns, rc, pszError) \
-    PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS, "%s", pszError)
+#define PDMUSB_SET_ERROR(pUsbIns, rc, pszError) \
+    PDMDevHlpVMSetError(pUsbIns, rc, RT_SRC_POS, "%s", pszError)
 
 /** @def PDMUSB_SET_RUNTIME_ERROR
  * Set the VM runtime error. See PDMDevHlpVMSetRuntimeError() for printf like message formatting.
  */
-#define PDMUSB_SET_RUNTIME_ERROR(pDevIns, fFatal, pszErrorID, pszError) \
-    PDMDevHlpVMSetRuntimeError(pDevIns, fFatal, pszErrorID, "%s", pszError)
+#define PDMUSB_SET_RUNTIME_ERROR(pUsbIns, fFatal, pszErrorID, pszError) \
+    PDMDevHlpVMSetRuntimeError(pUsbIns, fFatal, pszErrorID, "%s", pszError)
 
 
@@ -479 +479 @@
 
 /**
- * VBOX_STRICT wrapper for pDevHlp->pfnDBGFStopV.
+ * VBOX_STRICT wrapper for pUsbHlp->pfnDBGFStopV.
  *
  * @returns VBox status code which must be passed up to the VMM.
- * @param   pDevIns             Device instance.
+ * @param   pUsbIns             Device instance.
  * @param   RT_SRC_POS_DECL     Use RT_SRC_POS.
  * @param   pszFormat           Message. (optional)
@@ -493 +493 @@
     va_list va;
     va_start(va, pszFormat);
-    rc = pUsbIns->pDevHlp->pfnDBGFStopV(pUsbIns, RT_SRC_POS_ARGS, pszFormat, va);
+    rc = pUsbIns->pUsbHlp->pfnDBGFStopV(pUsbIns, RT_SRC_POS_ARGS, pszFormat, va);
     va_end(va);
     return rc;
@@ -508 +508 @@
 
 
-/** Pointer to callbacks provided to the VBoxUSBRegister() call. */
+/** Pointer to callbacks provided to the VBoxUsbRegister() call. */
 typedef const struct PDMUSBREGCB *PCPDMUSBREGCB;
 
@@ -546 +546 @@
 
 /**
- * The VBoxUSBRegister callback function.
+ * The VBoxUsbRegister callback function.
  *
  * PDM will invoke this function after loading a USB device module and letting