Changeset 59176 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Dec 17, 2015 3:11:01 PM (9 years ago)

Author:

vboxsync

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

104780

Message:

Solaris/USB: Take the easy way out for now.

Location:

trunk/src/VBox/HostDrivers/VBoxUSB/solaris

Files:

• VBoxUSB-solaris.c (modified) (2 diffs)
• VBoxUSBMon-solaris.c (modified) (1 diff)

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

@@ -696 +696 @@
                                                     if (RT_SUCCESS(rc))
                                                     {
+#if 0
                                                         LogRel((DEVICE_NAME ": Captured %s %s (Ident=%s)\n", pState->szMfg,
                                                                 pState->szProduct, pState->ClientInfo.szDeviceIdent));
+#else
+                                                        /* Until IPRT R0 logging is fixed. See @bugref{6657#c7} */
+                                                        cmn_err(CE_CONT, "Captured %s %s (Ident=%s)\n", pState->szMfg,
+                                                                pState->szProduct, pState->ClientInfo.szDeviceIdent);
+#endif
                                                         return DDI_SUCCESS;
                                                     }
@@ -886 +892 @@
             ddi_remove_minor_node(pState->pDip, NULL);
 
+#if 0
             LogRel((DEVICE_NAME ": Released %s %s (Ident=%s)\n", pState->szMfg, pState->szProduct,
                     pState->ClientInfo.szDeviceIdent));
+#else
+            /* Until IPRT R0 logging is fixed. See @bugref{6657#c7} */
+            cmn_err(CE_CONT, "Released %s %s (Ident=%s)\n", pState->szMfg, pState->szProduct, pState->ClientInfo.szDeviceIdent);
+#endif
 
             ddi_soft_state_free(g_pVBoxUSBSolarisState, instance);

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

@@ -1028 +1028 @@
 
     *ppszDrv = ddi_strdup(VBOXUSB_DRIVER_NAME, KM_SLEEP);
+#if 0
     LogRel((DEVICE_NAME ": Capturing %s %s %#x:%#x:%s Bus=%d Port=%d\n",
             pDevStrings->usb_mfg ? pDevStrings->usb_mfg : "<Unknown Manufacturer>",
             pDevStrings->usb_product ? pDevStrings->usb_product : "<Unnamed USB device>",
             pDevDesc->idVendor, pDevDesc->idProduct, pszDevicePath, Bus, Port));
+#else
+    /* Until IPRT R0 logging is fixed. See @bugref{6657#c7} */
+    cmn_err(CE_CONT, "Capturing %s %s 0x%x:0x%x:%s Bus=%d Port=%d\n",
+            pDevStrings->usb_mfg ? pDevStrings->usb_mfg : "<Unknown Manufacturer>",
+            pDevStrings->usb_product ? pDevStrings->usb_product : "<Unnamed USB device>",
+            pDevDesc->idVendor, pDevDesc->idProduct, pszDevicePath, Bus, Port);
+#endif
     return USB_SUCCESS;
 }