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

Timestamp:

Mar 24, 2010 9:00:35 PM (15 years ago)

Author:

vboxsync

Message:

DevOHCI: fixed segfault in rhport_set_if_connected()

File:

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

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

@@ -4524 +4524 @@
 #endif
 
-
     /* Write to clear any of the change bits: CSC, PESC, PSSC, OCIC and PRSC */
-    if ( val & OHCI_PORT_W_CLEAR_CHANGE_MASK )
+    if (val & OHCI_PORT_W_CLEAR_CHANGE_MASK)
         p->fReg &= ~(val & OHCI_PORT_W_CLEAR_CHANGE_MASK);
 
-    if ( val & OHCI_PORT_W_CLEAR_ENABLE )
+    if (val & OHCI_PORT_W_CLEAR_ENABLE)
     {
         p->fReg &= ~OHCI_PORT_R_ENABLE_STATUS;
@@ -4535 +4534 @@
     }
 
-    if ( rhport_set_if_connected(&pOhci->RootHub, i, val & OHCI_PORT_W_SET_ENABLE) )
+    if (rhport_set_if_connected(&pOhci->RootHub, i, val & OHCI_PORT_W_SET_ENABLE))
         Log2(("HcRhPortStatus_w(): port %u: ENABLE\n", i));
 
-    if ( rhport_set_if_connected(&pOhci->RootHub, i, val & OHCI_PORT_W_SET_SUSPEND) )
+    if (rhport_set_if_connected(&pOhci->RootHub, i, val & OHCI_PORT_W_SET_SUSPEND))
         Log2(("HcRhPortStatus_w(): port %u: SUSPEND - not implemented correctly!!!\n", i));
 
-    if (val & OHCI_PORT_W_SET_RESET) {
-        if ( rhport_set_if_connected(&pOhci->RootHub, i, val & OHCI_PORT_W_SET_RESET) )
+    if (val & OHCI_PORT_W_SET_RESET)
+    {
+        if (rhport_set_if_connected(&pOhci->RootHub, i, val & OHCI_PORT_W_SET_RESET))
         {
             PVM pVM = PDMDevHlpGetVM(pOhci->CTX_SUFF(pDevIns));
@@ -4548 +4548 @@
             VUSBIDevReset(p->pDev, false /* don't reset on linux */, uchi_port_reset_done, pOhci, pVM);
         }
-        else if ( p->fReg & OHCI_PORT_R_RESET_STATUS )
+        else if (p->fReg & OHCI_PORT_R_RESET_STATUS)
         {
             /* the guest is getting impatient. */
@@ -4556 +4556 @@
     }
 
-    if ( !(pOhci->RootHub.desc_a & OHCI_RHA_NPS) )
+    if (!(pOhci->RootHub.desc_a & OHCI_RHA_NPS))
     {
         /** @todo To implement per-device power-switching
@@ -4562 +4562 @@
          * sure it isn't gang powered
          */
-        if ( val & OHCI_PORT_W_CLEAR_POWER )
+        if (val & OHCI_PORT_W_CLEAR_POWER)
             rhport_power(&pOhci->RootHub, i, false /* power down */);
-        if ( val & OHCI_PORT_W_SET_POWER )
+        if (val & OHCI_PORT_W_SET_POWER)
             rhport_power(&pOhci->RootHub, i, true /* power up */);
     }
 
     /** @todo r=frank:  ClearSuspendStatus. Timing? */
-    if ( val & OHCI_PORT_W_CLEAR_SUSPEND_STATUS )
+    if (val & OHCI_PORT_W_CLEAR_SUSPEND_STATUS)
     {
         rhport_power(&pOhci->RootHub, i, true /* power up */);
@@ -4576 +4576 @@
     }
 
-    if ( p->fReg != old_state )
+    if (p->fReg != old_state)
     {
         uint32_t res = p->fReg;
@@ -5280 +5280 @@
     pOhci->PciDev.config[0x0b] = 0xc;
     pOhci->PciDev.config[0x3d] = 0x01;
+    pOhci->RootHub.pOhci                         = pOhci;
     pOhci->RootHub.IBase.pfnQueryInterface       = ohciRhQueryInterface;
     pOhci->RootHub.IRhPort.pfnGetAvailablePorts  = ohciRhGetAvailablePorts;