Changeset 36341 in vbox for trunk/src/VBox/HostDrivers/VBoxUSB

Timestamp:

Mar 22, 2011 1:27:34 PM (14 years ago)

Author:

vboxsync

Message:

HostDrivers/VBoxUSB/solaris: LogRel device capture/release and fix misleading variable names.

Location:

trunk/src/VBox/HostDrivers/VBoxUSB/solaris

Files:

• USBLib-solaris.cpp (modified) (2 diffs)
• VBoxUSB-solaris.c (modified) (3 diffs)
• VBoxUSBMon-solaris.c (modified) (4 diffs)

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

@@ -201 +201 @@
     VBOXUSBREQ_CLIENT_INFO Req;
     bzero(&Req, sizeof(Req));
-    RTStrPrintf(Req.achDeviceIdent, sizeof(Req.achDeviceIdent), "%s", pszDeviceIdent);
+    RTStrPrintf(Req.szDeviceIdent, sizeof(Req.szDeviceIdent), "%s", pszDeviceIdent);
 
     int rc = usblibDoIOCtl(VBOXUSBMON_IOCTL_CLIENT_INFO, &Req, sizeof(Req));
@@ -207 +207 @@
     {
         *pInstance = Req.Instance;
-        rc = RTStrDupEx(ppszClientPath, Req.achClientPath);
+        rc = RTStrDupEx(ppszClientPath, Req.szClientPath);
         if (RT_SUCCESS(rc))
             return VINF_SUCCESS;
 
-        LogRel((USBLIBR3 ":USBLibGetClientInfo RTStrAPrintf failed! rc=%Rrc achClientPath=%s\n", rc, Req.achClientPath));
+        LogRel((USBLIBR3 ":USBLibGetClientInfo RTStrDupEx failed! rc=%Rrc szClientPath=%s\n", rc, Req.szClientPath));
     }
     else

trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSB-solaris.c

@@ -556 +556 @@
                                                     char szDevicePath[MAXPATHLEN];
                                                     ddi_pathname(pState->pDip, szDevicePath);
-                                                    RTStrPrintf(pState->ClientInfo.achClientPath, sizeof(pState->ClientInfo.achClientPath),
+                                                    RTStrPrintf(pState->ClientInfo.szClientPath, sizeof(pState->ClientInfo.szClientPath),
                                                                 "/devices%s:%s",
                                                                 szDevicePath,
                                                                 DEVICE_NAME);
                                                     RTPathStripFilename(szDevicePath);
-                                                    RTStrPrintf(pState->ClientInfo.achDeviceIdent, sizeof(pState->ClientInfo.achDeviceIdent),
+                                                    RTStrPrintf(pState->ClientInfo.szDeviceIdent, sizeof(pState->ClientInfo.szDeviceIdent),
                                                                 "%#x:%#x:%d:%s",
                                                                 pState->pDevDesc->dev_descr->idVendor,
@@ -570 +570 @@
                                                     rc = VBoxUSBMonSolarisRegisterClient(pState->pDip, &pState->ClientInfo);
                                                     if (RT_SUCCESS(rc))
+                                                    {
+                                                        LogRel((DEVICE_NAME ": Captured %s %s\n",
+                                                                pState->pDevDesc->dev_product ? pState->pDevDesc->dev_product : "<Unnamed USB device>",
+                                                                pState->ClientInfo.szDeviceIdent));
+
                                                         return DDI_SUCCESS;
+                                                    }
                                                     else
                                                     {
                                                         LogRel((DEVICE_NAME ":VBoxUSBMonSolarisRegisterClient failed! rc=%d path=%s instance=%d\n",
-                                                                rc, pState->ClientInfo.achClientPath, instance));
+                                                                rc, pState->ClientInfo.szClientPath, instance));
                                                     }
 
@@ -738 +744 @@
 
             ddi_remove_minor_node(pState->pDip, NULL);
+
+            LogRel((DEVICE_NAME ": Released %s %s\n",
+                    pState->pDevDesc->dev_product ? pState->pDevDesc->dev_product : "<Unnamed USB device>",
+                    pState->ClientInfo.szDeviceIdent));
 
             ddi_soft_state_free(g_pVBoxUSBSolarisState, instance);

trunk/src/VBox/HostDrivers/VBoxUSB/solaris/VBoxUSBMon-solaris.c

@@ -865 +865 @@
     while (pCur)
     {
-        if (strncmp(pClientInfo->achDeviceIdent, pCur->Info.achDeviceIdent, sizeof(pCur->Info.achDeviceIdent) - 1) == 0)
+        if (strncmp(pClientInfo->szDeviceIdent, pCur->Info.szDeviceIdent, sizeof(pCur->Info.szDeviceIdent) - 1) == 0)
         {
             pClientInfo->Instance = pCur->Info.Instance;
-            RTStrPrintf(pClientInfo->achClientPath, sizeof(pClientInfo->achClientPath), "%s", pCur->Info.achClientPath);
+            RTStrPrintf(pClientInfo->szClientPath, sizeof(pClientInfo->szClientPath), "%s", pCur->Info.szClientPath);
 
             mutex_exit(&g_VBoxUSBMonSolarisMtx);
@@ -881 +881 @@
     mutex_exit(&g_VBoxUSBMonSolarisMtx);
 
-    LogRel((DEVICE_NAME ":vboxUSBMonSolarisClientInfo Failed to find client %s\n", pClientInfo->achDeviceIdent));
+    LogRel((DEVICE_NAME ":vboxUSBMonSolarisClientInfo Failed to find client %s\n", pClientInfo->szDeviceIdent));
     return VERR_NOT_FOUND;
 }
@@ -916 +916 @@
 
                 LogFlow((DEVICE_NAME ":VBoxUSBMonSolarisRegisterClient registered. %d %s %s\n",
-                            pClient->Info.Instance, pClient->Info.achClientPath, pClient->Info.achDeviceIdent));
+                            pClient->Info.Instance, pClient->Info.szClientPath, pClient->Info.achDeviceIdent));
 
                 return VINF_SUCCESS;
@@ -964 +964 @@
 
                     LogFlow((DEVICE_NAME ":VBoxUSBMonSolarisUnregisterClient unregistered. %d %s %s\n",
-                                pCur->Info.Instance, pCur->Info.achClientPath, pCur->Info.achDeviceIdent));
+                                pCur->Info.Instance, pCur->Info.szClientPath, pCur->Info.szDeviceIdent));
                     RTMemFree(pCur);
                     pCur = NULL;