Changeset 39154 in vbox for trunk/src/VBox/Devices/USB

Timestamp:

Oct 31, 2011 3:36:29 PM (13 years ago)

Author:

vboxsync

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

74616

Message:

IOM: Added flags for dropping into the vbox debugger on complicated MMIO accesses. DBGF: some namespace cleanups.

File:

• trunk/src/VBox/Devices/USB/DevOHCI.cpp (modified) (8 diffs)

trunk/src/VBox/Devices/USB/DevOHCI.cpp

@@ -351 +351 @@
     /** A flag indicating that the bulk list may have in-flight URBs. */
     bool                fBulkNeedsCleaning;
+
+    /** Whether RC/R0 is enabled. */
+    bool                fRZEnabled;
 
     uint32_t            Alignment3;     /**< Align size on a 8 byte boundary. */
@@ -4790 +4793 @@
  * @param   cb          The size of the read.
  */
-PDMBOTHCBDECL(int) ohciRead(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void *pv, unsigned cb)
+PDMBOTHCBDECL(int) ohciMmioRead(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void *pv, unsigned cb)
 {
     POHCI pOhci = PDMINS_2_DATA(pDevIns, POHCI);
@@ -4829 +4832 @@
  * @param   cb          The size of the data being written.
  */
-PDMBOTHCBDECL(int) ohciWrite(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void const *pv, unsigned cb)
+PDMBOTHCBDECL(int) ohciMmioWrite(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void const *pv, unsigned cb)
 {
     POHCI pOhci = PDMINS_2_DATA(pDevIns, POHCI);
@@ -4838 +4841 @@
     if (cb != sizeof(uint32_t))
     {
-        Log2(("ohciWrite: Bad write size!!! GCPhysAddr=%RGp cb=%d\n", GCPhysAddr, cb));
+        Log2(("ohciMmioWrite: Bad write size!!! GCPhysAddr=%RGp cb=%d\n", GCPhysAddr, cb));
         return VINF_SUCCESS;
     }
     if (GCPhysAddr & 0x3)
     {
-        Log2(("ohciWrite: Unaligned write!!! GCPhysAddr=%RGp cb=%d\n", GCPhysAddr, cb));
+        Log2(("ohciMmioWrite: Unaligned write!!! GCPhysAddr=%RGp cb=%d\n", GCPhysAddr, cb));
         return VINF_SUCCESS;
     }
@@ -4874 +4877 @@
     POHCI pOhci = (POHCI)pPciDev;
     int rc = PDMDevHlpMMIORegister(pOhci->CTX_SUFF(pDevIns), GCPhysAddress, cb, NULL /*pvUser*/,
-                                   IOMMMIO_FLAGS_READ_DWORD | IOMMMIO_FLAGS_WRITE_PASSTHRU,
-                                   ohciWrite, ohciRead, "USB OHCI");
+                                   IOMMMIO_FLAGS_READ_DWORD | IOMMMIO_FLAGS_WRITE_DWORD_ZEROED
+                                   | IOMMMIO_FLAGS_DBGSTOP_ON_COMPLICATED_WRITE,
+                                   ohciMmioWrite, ohciMmioRead, "USB OHCI");
     if (RT_FAILURE(rc))
         return rc;
 
-# if 1 /* this enabled / disabled GC/R0 stuff */
-    rc = PDMDevHlpMMIORegisterRC(pOhci->CTX_SUFF(pDevIns), GCPhysAddress, cb, NIL_RTRCPTR /*pvUser*/, "ohciWrite", "ohciRead");
-    if (RT_FAILURE(rc))
-        return rc;
-
-    rc = PDMDevHlpMMIORegisterR0(pOhci->CTX_SUFF(pDevIns), GCPhysAddress, cb, NIL_RTR0PTR /*pvUser*/, "ohciWrite", "ohciRead");
-    if (RT_FAILURE(rc))
-        return rc;
-# endif
+    if (pOhci->fRZEnabled)
+    {
+        rc = PDMDevHlpMMIORegisterRC(pOhci->CTX_SUFF(pDevIns), GCPhysAddress, cb,
+                                     NIL_RTRCPTR /*pvUser*/, "ohciMmioWrite", "ohciMmioRead");
+        if (RT_FAILURE(rc))
+            return rc;
+
+        rc = PDMDevHlpMMIORegisterR0(pOhci->CTX_SUFF(pDevIns), GCPhysAddress, cb,
+                                     NIL_RTR0PTR /*pvUser*/, "ohciMmioWrite", "ohciMmioRead");
+        if (RT_FAILURE(rc))
+            return rc;
+    }
 
     pOhci->MMIOBase = GCPhysAddress;
@@ -5366 +5373 @@
 static DECLCALLBACK(int) ohciR3Construct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
 {
-    POHCI   pOhci = PDMINS_2_DATA(pDevIns, POHCI);
-    int     rc;
+    POHCI pOhci = PDMINS_2_DATA(pDevIns, POHCI);
     PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
-
-    /*
-     * Read configuration. No configuration keys are currently supported.
-     */
-    if (!CFGMR3AreValuesValid(pCfg, "\0"))
-        return PDMDEV_SET_ERROR(pDevIns, VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES,
-                                N_("Configuration error: Unknown config key"));
 
     /*
@@ -5409 +5408 @@
     pOhci->RootHub.ILeds.pfnQueryStatusLed       = ohciRhQueryStatusLed;
 
+
+    /*
+     * Read configuration. No configuration keys are currently supported.
+     */
+    PDMDEV_VALIDATE_CONFIG_RETURN(pDevIns, "RZEnabled", "");
+    int rc = CFGMR3QueryBoolDef(pCfg, "RZEnabled", &pOhci->fRZEnabled, true);
+    AssertLogRelRCReturn(rc, rc);
+
+
     /*
      * Register PCI device and I/O region.
@@ -5423 +5431 @@
     aMsiReg.iMsiNextOffset = 0x0;
     rc = PDMDevHlpPCIRegisterMsi(pDevIns, &aMsiReg);
-    if (RT_FAILURE (rc))
+    if (RT_FAILURE(rc))
     {
         PCIDevSetCapabilityList(&pOhci->PciDev, 0x0);