Changeset 34257 in vbox

Timestamp:

Nov 22, 2010 4:57:23 PM (14 years ago)

Author:

vboxsync

Message:

USBLib-win: coding style and cosmetics

File:

• trunk/src/VBox/HostDrivers/VBoxUSB/win/USBLib-win.cpp (modified) (20 diffs)

trunk/src/VBox/HostDrivers/VBoxUSB/win/USBLib-win.cpp

@@ -56 +56 @@
 } USBDEV, *PUSBDEV;
 
-static PUSBDEV  pUSBDev = NULL;
-static uint32_t cMaxDevices = 0;
+static PUSBDEV  g_pUSBDev = NULL;
+static uint32_t g_cMaxDevices = 0;
 static uint32_t g_cUSBStateChange = 0;
 
@@ -85 +85 @@
                       OPEN_EXISTING, FILE_ATTRIBUTE_SYSTEM, NULL);
 
-    if (INVALID_HANDLE_VALUE == hOut) {
+    if (INVALID_HANDLE_VALUE == hOut)
+    {
         Log(( "USB: FAILED to open %s\n", pszName));
         goto failure;
@@ -218 +219 @@
     int j = 0, i = 0;
 
-    while(true)
+    while (true)
     {
         // SetupDiEnumDeviceInterfaces() returns information about device interfaces
@@ -235 +236 @@
             {
                 uint32_t z;
-                for (z=0;z<cMaxDevices;z++)
+                for (z = 0; z < g_cMaxDevices; z++)
                 {
-                    if (pUSBDev[z].szName[0] == 0)
+                    if (g_pUSBDev[z].szName[0] == 0)
                     {
-                        memcpy(&pUSBDev[z], &usbDev, sizeof(usbDev));
-                        Log(("Captured device %s\n", pUSBDev[z].szName));
+                        memcpy(&g_pUSBDev[z], &usbDev, sizeof(usbDev));
+                        Log(("Captured device %s\n", g_pUSBDev[z].szName));
                         j++;
                         break;
                     }
                 }
-                AssertMsg(z < cMaxDevices, ("z=%d cMaxDevices=%d\n", z, cMaxDevices));
+                AssertMsg(z < g_cMaxDevices, ("z=%d g_cMaxDevices=%d\n", z, g_cMaxDevices));
             }
         }
@@ -279 +280 @@
 static int usblibEnumDevices(uint32_t cNumNewDevices, uint32_t *pcNumDevices)
 {
-    if (pUSBDev)
-        RTMemFree(pUSBDev);
-    pUSBDev         = NULL;
-    cMaxDevices     = 0;
+    if (g_pUSBDev)
+        RTMemFree(g_pUSBDev);
+    g_pUSBDev         = NULL;
+    g_cMaxDevices     = 0;
     *pcNumDevices   = 0;
 
@@ -288 +289 @@
         return 0;   /* nothing to do */
 
-    pUSBDev = (PUSBDEV)RTMemAllocZ(cNumNewDevices*sizeof(USBDEV));
-    if (!pUSBDev)
+    g_pUSBDev = (PUSBDEV)RTMemAllocZ(cNumNewDevices*sizeof(USBDEV));
+    if (!g_pUSBDev)
     {
         AssertFailed();
         return VERR_NO_MEMORY;
     }
-    cMaxDevices = cNumNewDevices;
+    g_cMaxDevices = cNumNewDevices;
 
     if (OpenUsbDevices((LPGUID)&GUID_CLASS_VBOXUSB, pcNumDevices) == false)
@@ -314 +315 @@
     int j=0;
 
-    Assert(idxDev < cMaxDevices);
-    for(uint32_t i=0;i<cMaxDevices;i++)
-    {
-        if (pUSBDev[i].szName[0])
+    Assert(idxDev < g_cMaxDevices);
+    for (uint32_t i=0; i<g_cMaxDevices; i++)
+    {
+        if (g_pUSBDev[i].szName[0])
         {
             if (j == idxDev)
-                return pUSBDev[i].szName;
+                return g_pUSBDev[i].szName;
             j++;
         }
     }
 
-    Log(("USB: usblibQueryHandle returned -1; cMaxDevices = %d\n", cMaxDevices));
+    Log(("USB: usblibQueryHandle returned -1; g_cMaxDevices = %d\n", g_cMaxDevices));
     return NULL;
 }
@@ -338 +339 @@
     int j=0;
 
-    Assert(idxDev < cMaxDevices);
-    for(uint32_t i=0;i<cMaxDevices;i++)
-    {
-        if (pUSBDev[i].szName[0])
+    Assert(idxDev < g_cMaxDevices);
+    for (uint32_t i=0; i<g_cMaxDevices; i++)
+    {
+        if (g_pUSBDev[i].szName[0])
         {
             if (j == idxDev)
-                return pUSBDev[i].szDriverRegName;
+                return g_pUSBDev[i].szDriverRegName;
             j++;
         }
     }
 
-    Log(("USB: usblibQueryHandle returned -1; cMaxDevices = %d\n", cMaxDevices));
+    Log(("USB: usblibQueryHandle returned -1; g_cMaxDevices = %d\n", g_cMaxDevices));
     return NULL;
 }
@@ -982 +983 @@
     // Port indices are 1 based, not 0 based.
     //
-    for (index=1; index <= NumPorts; index++)
+    for (index = 1; index <= NumPorts; index++)
     {
         ULONG nBytes;
@@ -1784 +1785 @@
     {
 #ifdef VBOX_WITH_ANNOYING_USB_ASSERTIONS
-        AssertMsgFailed(("DeviceIoControl IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION %d != %d\n", configDesc->wTotalLength, (nBytes - sizeof(USB_DESCRIPTOR_REQUEST)));
+        AssertMsgFailed(("DeviceIoControl IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION %d != %d\n", configDesc->wTotalLength, (nBytes - sizeof(USB_DESCRIPTOR_REQUEST))));
 #else
         LogRel(("DeviceIoControl IOCTL_USB_GET_DESCRIPTOR_FROM_NODE_CONNECTION %d != %d\n", configDesc->wTotalLength, (nBytes - sizeof(USB_DESCRIPTOR_REQUEST)) ));
@@ -2206 +2207 @@
     ULONG i;
 
-    for (i=0; i<NumLanguageIDs; i++)
+    for (i = 0; i < NumLanguageIDs; i++)
     {
         StringDescNodeTail->Next = GetStringDescriptor(hHubDevice,
@@ -2703 +2704 @@
 USBLIB_DECL(int) USBLibGetDevices(PUSBDEVICE *ppDevices, uint32_t *pcDevices)
 {
-    DWORD cbReturned;
     USBSUP_GETNUMDEV numdev;
-    char *pszDevname = NULL;
     PUSBDEVICE pDevice = NULL;
     PUSBDEVICE pCaptured = NULL;
     PUSBDEVICE pList = NULL;
+    Log(("usbLibGetDevices: enter\n"));
+
+    if (g_hUSBMonitor == INVALID_HANDLE_VALUE)
+        return VERR_NOT_SUPPORTED;
+
+    /* 1: Enumerate all usb devices attached to the host */
     PUSBDEVICE pHostDevices = NULL;
     uint32_t   cHostDevices = 0;
-    Log(("usbLibGetDevices: enter\n"));
-
-    if (g_hUSBMonitor == INVALID_HANDLE_VALUE)
-        return VERR_NOT_SUPPORTED;
-
-    /* 1: Enumerate all usb devices attached to the host */
     usbLibEnumerateHostControllers(&pHostDevices, &cHostDevices);
 #ifdef LOG_ENABLED
@@ -2722 +2721 @@
     pDevice = pHostDevices;
     int iDevice = 0;
-    while(pDevice)
+    while (pDevice)
     {
         iDevice++;
@@ -2772 +2771 @@
      */
 
-    for (int i=0;i<100;i++)
+    for (int i = 0; i < 100; i++)
     {
         /*
          * Get the number of USB devices.
          */
-        cbReturned = 0;
+        DWORD cbReturned = 0;
         if (!DeviceIoControl(g_hUSBMonitor, SUPUSBFLT_IOCTL_GET_NUM_DEVICES, NULL, 0, &numdev, sizeof(numdev), &cbReturned, NULL))
         {
@@ -2790 +2789 @@
         Log(("Monitor detected %d captured devices\n", numdev.cUSBDevices));
 
-        usblibEnumDevices(numdev.cUSBDevices, (uint32_t *)pcDevices);
+        usblibEnumDevices(numdev.cUSBDevices, pcDevices);
         Log(("usblibEnumDevices detected %d devices\n", *pcDevices));
 
@@ -2817 +2816 @@
         HANDLE hDev;
 
-        pszDevname = usblibQueryDeviceName(i);
+        char *pszDevname = usblibQueryDeviceName(i);
         hDev = CreateFile(pszDevname, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_WRITE | FILE_SHARE_READ, NULL,
                           OPEN_EXISTING,  FILE_ATTRIBUTE_SYSTEM, NULL);
@@ -2823 +2822 @@
         if (hDev != INVALID_HANDLE_VALUE)
         {
-            cbReturned = 0;
+            DWORD cbReturned = 0;
             if (!DeviceIoControl(hDev, SUPUSB_IOCTL_GET_DEVICE, &dev, sizeof(dev), &dev, sizeof(dev), &cbReturned, NULL))
             {
@@ -2874 +2873 @@
     /* 3: Add all host devices to array of captured devices; obviously making sure there are no duplicates */
     Assert(pHostDevices && pCaptured);
-    pList   = pCaptured;
-    for (uint32_t i=0;i<numdev.cUSBDevices;i++)
+    pList = pCaptured;
+    for (uint32_t i = 0; i < numdev.cUSBDevices; i++)
     {
         uint32_t j;
@@ -2882 +2881 @@
         Assert(pDevice);
 
-        for (j=0;j<cHostDevices;j++)
+        for (j = 0; j < cHostDevices; j++)
         {
             char *pszDeviceRegPath = usblibQueryDeviceRegPath(i);
@@ -2948 +2947 @@
     pDevice = pHostDevices;
     iDevice = 0;
-    while(pDevice)
+    while (pDevice)
     {
         iDevice++;