Changeset 18348 in vbox for trunk/src

Timestamp:

Mar 26, 2009 7:35:20 PM (16 years ago)

Author:

vboxsync

Message:

LsiLogic, BusLogic: Add Led support

Location:

trunk/src/VBox

Files:

• Devices/testcase/tstDeviceStructSizeGC.cpp (modified) (4 diffs)
• Main/ConsoleImpl.cpp (modified) (2 diffs)
• Main/ConsoleImpl2.cpp (modified) (2 diffs)
• Main/include/ConsoleImpl.h (modified) (1 diff)

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeGC.cpp

@@ -1312 +1312 @@
     GEN_CHECK_OFF(BUSLOGICDEVICE, IBase);
     GEN_CHECK_OFF(BUSLOGICDEVICE, ISCSIPort);
+    GEN_CHECK_OFF(BUSLOGICDEVICE, ILed);
     GEN_CHECK_OFF(BUSLOGICDEVICE, pDrvBase);
     GEN_CHECK_OFF(BUSLOGICDEVICE, pDrvSCSIConnector);
+    GEN_CHECK_OFF(BUSLOGICDEVICE, Led);
     GEN_CHECK_OFF(BUSLOGICDEVICE, cOutstandingRequests);
 
@@ -1354 +1356 @@
     GEN_CHECK_OFF(BUSLOGIC, aDeviceStates);
     GEN_CHECK_OFF(BUSLOGIC, aDeviceStates[BUSLOGIC_MAX_DEVICES-1]);
+    GEN_CHECK_OFF(BUSLOGIC, IBase);
+    GEN_CHECK_OFF(BUSLOGIC, ILeds);
+    GEN_CHECK_OFF(BUSLOGIC, pLedsConnector);
 #endif /* VBOX_WITH_BUSLOGIC */
 
@@ -1365 +1370 @@
     GEN_CHECK_OFF(LSILOGICDEVICE, IBase);
     GEN_CHECK_OFF(LSILOGICDEVICE, ISCSIPort);
+    GEN_CHECK_OFF(LSILOGICDEVICE, ILed);
     GEN_CHECK_OFF(LSILOGICDEVICE, pDrvBase);
     GEN_CHECK_OFF(LSILOGICDEVICE, pDrvSCSIConnector);
+    GEN_CHECK_OFF(LSILOGICDEVICE, Led);
 
     GEN_CHECK_SIZE(LSILOGICSCSI);
@@ -1426 +1433 @@
     GEN_CHECK_OFF(LSILOGICSCSI, VBoxSCSI);
     GEN_CHECK_OFF(LSILOGICSCSI, pTaskCache);
+    GEN_CHECK_OFF(LSILOGICSCSI, IBase);
+    GEN_CHECK_OFF(LSILOGICSCSI, ILeds);
+    GEN_CHECK_OFF(LSILOGICSCSI, pLedsConnector);
 #endif /* VBOX_WITH_LSILOGIC */
 

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -245 +245 @@
     memset(mapIDELeds, 0, sizeof(mapIDELeds));
     memset(mapSATALeds, 0, sizeof(mapSATALeds));
+    memset(mapSCSILeds, 0, sizeof(mapSCSILeds));
     memset(mapNetworkLeds, 0, sizeof(mapNetworkLeds));
     memset(&mapUSBLed, 0, sizeof(mapUSBLed));
@@ -1903 +1904 @@
             for (unsigned i = 0; i < RT_ELEMENTS(mapSATALeds); i++)
                 SumLed.u32 |= readAndClearLed(mapSATALeds[i]);
+            for (unsigned i = 0; i < RT_ELEMENTS(mapSCSILeds); i++)
+                SumLed.u32 |= readAndClearLed(mapSCSILeds[i]);
             break;
         }

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -834 +834 @@
                 rc = CFGMR3InsertNode(pCtlInst,    "Config", &pCfg);                   RC_CHECK();
                 fSCSI = true;
+
+                /* Attach the status driver */
+                rc = CFGMR3InsertNode(pCtlInst, "LUN#999", &pLunL0);                              RC_CHECK();
+                rc = CFGMR3InsertString(pLunL0, "Driver",               "MainStatus");            RC_CHECK();
+                rc = CFGMR3InsertNode(pLunL0,   "Config", &pCfg);                                 RC_CHECK();
+                rc = CFGMR3InsertInteger(pCfg,  "papLeds", (uintptr_t)&pConsole->mapSCSILeds[0]); RC_CHECK();
+                rc = CFGMR3InsertInteger(pCfg,  "First",    0);                                   RC_CHECK();
+                rc = CFGMR3InsertInteger(pCfg,  "Last",     15);                                  RC_CHECK();
                 break;
             }
@@ -847 +855 @@
                 rc = CFGMR3InsertNode(pCtlInst,    "Config", &pCfg);                   RC_CHECK();
                 fSCSI = true;
+
+                /* Attach the status driver */
+                rc = CFGMR3InsertNode(pCtlInst, "LUN#999", &pLunL0);                              RC_CHECK();
+                rc = CFGMR3InsertString(pLunL0, "Driver",               "MainStatus");            RC_CHECK();
+                rc = CFGMR3InsertNode(pLunL0,   "Config", &pCfg);                                 RC_CHECK();
+                rc = CFGMR3InsertInteger(pCfg,  "papLeds", (uintptr_t)&pConsole->mapSCSILeds[0]); RC_CHECK();
+                rc = CFGMR3InsertInteger(pCfg,  "First",    0);                                   RC_CHECK();
+                rc = CFGMR3InsertInteger(pCfg,  "Last",     15);                                  RC_CHECK();
                 break;
             }

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -545 +545 @@
     PPDMLED     mapIDELeds[4];
     PPDMLED     mapSATALeds[30];
+    PPDMLED     mapSCSILeds[16];
     PPDMLED     mapNetworkLeds[8];
     PPDMLED     mapSharedFolderLed;