Changeset 8134 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 18, 2008 10:57:04 AM (17 years ago)

Author:

vboxsync

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

29839

Message:

Fixed USB led when EHCI is enabled.

Location:

trunk/src/VBox/Main

Files:

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

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -1856 +1856 @@
         case DeviceType_Floppy:
         {
-            for (unsigned i = 0; i < ELEMENTS(mapFDLeds); i++)
+            for (unsigned i = 0; i < RT_ELEMENTS(mapFDLeds); i++)
                 SumLed.u32 |= readAndClearLed(mapFDLeds[i]);
             break;
@@ -1872 +1872 @@
             SumLed.u32 |= readAndClearLed(mapIDELeds[1]);
             SumLed.u32 |= readAndClearLed(mapIDELeds[3]);
-            for (unsigned i = 0; i < ELEMENTS(mapSATALeds); i++)
+            for (unsigned i = 0; i < RT_ELEMENTS(mapSATALeds); i++)
                 SumLed.u32 |= readAndClearLed(mapSATALeds[i]);
             break;
@@ -1879 +1879 @@
         case DeviceType_Network:
         {
-            for (unsigned i = 0; i < ELEMENTS(mapNetworkLeds); i++)
+            for (unsigned i = 0; i < RT_ELEMENTS(mapNetworkLeds); i++)
                 SumLed.u32 |= readAndClearLed(mapNetworkLeds[i]);
             break;
@@ -1886 +1886 @@
         case DeviceType_USB:
         {
-            SumLed.u32 |= readAndClearLed(mapUSBLed);
+            for (unsigned i = 0; i < RT_ELEMENTS(mapUSBLed); i++)
+                SumLed.u32 |= readAndClearLed(mapUSBLed[i]);
             break;
         }

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1501 +1501 @@
             rc = CFGMR3InsertString(pLunL0, "Driver",               "MainStatus");      RC_CHECK();
             rc = CFGMR3InsertNode(pLunL0,   "Config", &pCfg);                           RC_CHECK();
-            rc = CFGMR3InsertInteger(pCfg,  "papLeds", (uintptr_t)&pConsole->mapUSBLed);RC_CHECK();
+            rc = CFGMR3InsertInteger(pCfg,  "papLeds", (uintptr_t)&pConsole->mapUSBLed[0]);RC_CHECK();
             rc = CFGMR3InsertInteger(pCfg,  "First",    0);                             RC_CHECK();
             rc = CFGMR3InsertInteger(pCfg,  "Last",     0);                             RC_CHECK();
@@ -1528 +1528 @@
                 rc = CFGMR3InsertString(pLunL0, "Driver",               "MainStatus");      RC_CHECK();
                 rc = CFGMR3InsertNode(pLunL0,   "Config", &pCfg);                           RC_CHECK();
-                rc = CFGMR3InsertInteger(pCfg,  "papLeds", (uintptr_t)&pConsole->mapUSBLed);RC_CHECK();
+                rc = CFGMR3InsertInteger(pCfg,  "papLeds", (uintptr_t)&pConsole->mapUSBLed[1]);RC_CHECK();
                 rc = CFGMR3InsertInteger(pCfg,  "First",    0);                             RC_CHECK();
                 rc = CFGMR3InsertInteger(pCfg,  "Last",     0);                             RC_CHECK();

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

@@ -512 +512 @@
     PPDMLED     mapNetworkLeds[8];
     PPDMLED     mapSharedFolderLed;
-    PPDMLED     mapUSBLed;
+    PPDMLED     mapUSBLed[2];
 #ifdef VBOX_WITH_UNIXY_TAP_NETWORKING
     Utf8Str     maTAPDeviceName[8];