Changeset 35214 in vbox

Timestamp:

Dec 17, 2010 10:10:07 AM (14 years ago)

Author:

vboxsync

Message:

AHCI: Fix wrong Led assignments

Location:

trunk/src/VBox/Devices/Storage

Files:

• ATAController.cpp (modified) (2 diffs)
• ATAController.h (modified) (1 diff)
• DevAHCI.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Storage/ATAController.cpp

@@ -5443 +5443 @@
 }
 
-DECLCALLBACK(int) ataControllerInit(PPDMDEVINS pDevIns, PAHCIATACONTROLLER pCtl,
-                                    unsigned iLUNMaster, PPDMIBASE pDrvBaseMaster,
-                                    unsigned iLUNSlave, PPDMIBASE pDrvBaseSlave,
-                                    uint32_t *pcbSSMState, const char *szName, PPDMLED pLed,
-                                    PSTAMCOUNTER pStatBytesRead, PSTAMCOUNTER pStatBytesWritten)
+int ataControllerInit(PPDMDEVINS pDevIns, PAHCIATACONTROLLER pCtl,
+                      unsigned iLUNMaster, PPDMIBASE pDrvBaseMaster, PPDMLED pLedMaster,
+                      PSTAMCOUNTER pStatBytesReadMaster, PSTAMCOUNTER pStatBytesWrittenMaster,
+                      unsigned iLUNSlave, PPDMIBASE pDrvBaseSlave, PPDMLED pLedSlave,
+                      PSTAMCOUNTER pStatBytesReadSlave, PSTAMCOUNTER pStatBytesWrittenSlave,
+                      uint32_t *pcbSSMState, const char *szName)
 {
     int      rc;
@@ -5470 +5471 @@
         pCtl->aIfs[j].pControllerR0     = MMHyperR3ToR0(PDMDevHlpGetVM(pDevIns), pCtl);
         pCtl->aIfs[j].pControllerRC     = MMHyperR3ToRC(PDMDevHlpGetVM(pDevIns), pCtl);
-        pCtl->aIfs[j].pLed              = pLed;
-        pCtl->aIfs[j].pStatBytesRead    = pStatBytesRead;
-        pCtl->aIfs[j].pStatBytesWritten = pStatBytesWritten;
+        pCtl->aIfs[j].pLed              = j == 0 ? pLedMaster : pLedSlave;
+        pCtl->aIfs[j].pStatBytesRead    = j == 0 ? pStatBytesReadMaster : pStatBytesReadSlave;
+        pCtl->aIfs[j].pStatBytesWritten = j == 0 ? pStatBytesWrittenMaster : pStatBytesWrittenSlave;
     }
 

trunk/src/VBox/Devices/Storage/ATAController.h

@@ -421 +421 @@
  */
 int ataControllerInit(PPDMDEVINS pDevIns, PAHCIATACONTROLLER pCtl,
-                      unsigned iLUNMaster, PPDMIBASE pDrvBaseMaster,
-                      unsigned iLUNSlave, PPDMIBASE pDrvBaseSlave,
-                      uint32_t *pcbSSMState, const char *szName, PPDMLED pLed, PSTAMCOUNTER pStatBytesRead, PSTAMCOUNTER pStatBytesWritten);
+                      unsigned iLUNMaster, PPDMIBASE pDrvBaseMaster, PPDMLED pLedMaster,
+                      PSTAMCOUNTER pStatBytesReadMaster, PSTAMCOUNTER pStatBytesWrittenMaster,
+                      unsigned iLUNSlave, PPDMIBASE pDrvBaseSlave, PPDMLED pLedSlave,
+                      PSTAMCOUNTER pStatBytesReadSlave, PSTAMCOUNTER pStatBytesWrittenSlave,
+                      uint32_t *pcbSSMState, const char *szName);
 
 /**

trunk/src/VBox/Devices/Storage/DevAHCI.cpp

@@ -8171 +8171 @@
             rc = ataControllerInit(pDevIns, pCtl,
                                    iPortMaster, pThis->ahciPort[iPortMaster].pDrvBase,
+                                   &pThis->ahciPort[iPortMaster].Led,
+                                   &pThis->ahciPort[iPortMaster].StatBytesRead,
+                                   &pThis->ahciPort[iPortMaster].StatBytesWritten,
                                    iPortSlave, pThis->ahciPort[iPortSlave].pDrvBase,
-                                   &cbSSMState, szName, &pThis->ahciPort[iPortMaster].Led,
-                                   &pThis->ahciPort[iPortMaster].StatBytesRead,
-                                   &pThis->ahciPort[iPortMaster].StatBytesWritten);
+                                   &pThis->ahciPort[iPortSlave].Led,
+                                   &pThis->ahciPort[iPortSlave].StatBytesRead,
+                                   &pThis->ahciPort[iPortSlave].StatBytesWritten,
+                                   &cbSSMState, szName);
             if (RT_FAILURE(rc))
                 return rc;