Changeset 4031 in vbox

Timestamp:

Aug 4, 2007 9:57:51 AM (18 years ago)

Author:

vboxsync

Message:

Moved shared folders status led

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (1 diff)
• VMMDevInterface.cpp (modified) (4 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -1877 +1877 @@
         case DeviceType_SharedFolderDevice:
         {
-#if 0 /* not yet working */
             SumLed.u32 |= readAndClearLed(mapSharedFolderLed);
-#endif
             break;
         }

trunk/src/VBox/Main/VMMDevInterface.cpp

@@ -66 +66 @@
     /** Our HGCM connector interface. */
     PDMIHGCMCONNECTOR           HGCMConnector;
-
-    struct
-    {
-        /** The LED. */
-        PDMLED                              Led;
-        /** The LED ports. */
-        PDMILEDPORTS                        ILeds;
-        /** Partner of ILeds. */
-        HCPTRTYPE(PPDMILEDCONNECTORS)       pLedsConnector;
-    } SharedFolders;
-
 #endif
 } DRVMAINVMMDEV, *PDRVMAINVMMDEV;
@@ -475 +464 @@
             return &pDrv->HGCMConnector;
 #endif
-        case PDMINTERFACE_LED_PORTS:
-            /* Currently only for shared folders */
-            return &pDrv->SharedFolders.ILeds;
         default:
             return NULL;
     }
-}
-
-/**
- * Gets the pointer to the status LED of a unit.
- *
- * @returns VBox status code.
- * @param   pInterface      Pointer to the interface structure containing the called function pointer.
- * @param   iLUN            The unit which status LED we desire.
- * @param   ppLed           Where to store the LED pointer.
- */
-static DECLCALLBACK(int) vmmdevQueryStatusLed(PPDMILEDPORTS pInterface, unsigned iLUN, PPDMLED *ppLed)
-{
-    PDRVMAINVMMDEV pDrv = PDMIVMMDEVCONNECTOR_2_MAINVMMDEV(pInterface);
-    if (iLUN == 0)
-    {
-        *ppLed = &pDrv->SharedFolders.Led;
-        return VINF_SUCCESS;
-    }
-    return VERR_PDM_LUN_NOT_FOUND;
 }
 
@@ -580 +547 @@
     pData->Connector.pfnQueryVisibleRegion            = vmmdevQueryVisibleRegion;
 
-    pData->SharedFolders.Led.u32Magic                 = PDMLED_MAGIC;
-    /* ILeds */
-    pData->SharedFolders.ILeds.pfnQueryStatusLed      = vmmdevQueryStatusLed;
-
-
 #ifdef VBOX_HGCM
     pData->HGCMConnector.pfnConnect                   = iface_hgcmConnect;
@@ -629 +591 @@
     if (VBOX_SUCCESS(rc))
     {
-        PPDMIBASE pBase;
-
         LogRel(("Shared Folders service loaded.\n"));
-#if 0
-        /*
-         * Attach status driver (optional).
-         */
-        rc = PDMDrvHlpDriverAttach(pDrvIns, PDM_STATUS_LUN, &pDrvIns->IBase, &pBase, "Status Port");
-        if (VBOX_SUCCESS(rc))
-            pData->SharedFolders.pLedsConnector = (PPDMILEDCONNECTORS)
-                pBase->pfnQueryInterface(pBase, PDMINTERFACE_LED_CONNECTORS);
-        else if (rc != VERR_PDM_NO_ATTACHED_DRIVER)
-        {
-            AssertMsgFailed(("Failed to attach to status driver. rc=%Vrc\n", rc));
-            return rc;
-        }
-#endif
     }
     else