[ros-diffs] [janderwald] 58627: [USB] - Return the controller type as ascii string CORE-7009 #resolve

Author: janderwald
Date: Sun Mar 31 07:41:31 2013
New Revision: 58627

URL: http://svn.reactos.org/svn/reactos?rev=58627&view=rev
Log:
[USB]
- Return the controller type as ascii string
CORE-7009 #resolve

Modified:
    trunk/reactos/drivers/usb/usbehci/hardware.cpp
    trunk/reactos/drivers/usb/usbohci/hardware.cpp
    trunk/reactos/drivers/usb/usbuhci/hardware.cpp
    trunk/reactos/lib/drivers/libusb/common_interfaces.h
    trunk/reactos/lib/drivers/libusb/hcd_controller.cpp
    trunk/reactos/lib/drivers/libusb/hub_controller.cpp
    trunk/reactos/lib/drivers/libusb/usb_device.cpp

Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hardwa…
==============================================================================
--- trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] Sun Mar 31 07:41:31 2013
@@ -127,11 +127,11 @@
     return STATUS_UNSUCCESSFUL;
 }
 
-LPCWSTR
+LPCSTR
 STDMETHODCALLTYPE
 CUSBHardwareDevice::GetUSBType()
 {
-    return L"USBEHCI";
+    return "USBEHCI";
 }
 
 NTSTATUS

Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwa…
==============================================================================
--- trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Sun Mar 31 07:41:31 2013
@@ -124,11 +124,11 @@
     return STATUS_UNSUCCESSFUL;
 }
 
-LPCWSTR
+LPCSTR
 STDMETHODCALLTYPE
 CUSBHardwareDevice::GetUSBType()
 {
-    return L"USBOHCI";
+    return "USBOHCI";
 }
 
 

Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/hardwa…
==============================================================================
--- trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] Sun Mar 31 07:41:31 2013
@@ -145,11 +145,11 @@
     return STATUS_UNSUCCESSFUL;
 }
 
-LPCWSTR
+LPCSTR
 STDMETHODCALLTYPE
 CUSBHardwareDevice::GetUSBType()
 {
-    return L"USBUHCI";
+    return "USBUHCI";
 }
 
 

Modified: trunk/reactos/lib/drivers/libusb/common_interfaces.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/common_…
==============================================================================
--- trunk/reactos/lib/drivers/libusb/common_interfaces.h [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/libusb/common_interfaces.h [iso-8859-1] Sun Mar 31 07:41:31
2013
@@ -184,7 +184,7 @@
         IN PVOID CallBack,                                                  \
         IN PVOID Context) PURE;                                             \
                                                                             \
-     STDMETHOD_(LPCWSTR, GetUSBType)(THIS) PURE;
+     STDMETHOD_(LPCSTR, GetUSBType)(THIS) PURE;
 
 
 #define IMP_IUSBHARDWAREDEVICE                                              \
@@ -232,7 +232,7 @@
         IN PVOID CallBack,                                                  \
         IN PVOID Context);                                                  \
                                                                             \
-     STDMETHODIMP_(LPCWSTR) GetUSBType();
+     STDMETHODIMP_(LPCSTR) GetUSBType();
 
 DECLARE_INTERFACE_(IUSBHardwareDevice, IUnknown)
 {

Modified: trunk/reactos/lib/drivers/libusb/hcd_controller.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/hcd_con…
==============================================================================
--- trunk/reactos/lib/drivers/libusb/hcd_controller.cpp [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/libusb/hcd_controller.cpp [iso-8859-1] Sun Mar 31 07:41:31
2013
@@ -60,7 +60,7 @@
     PUSBHARDWAREDEVICE m_Hardware;
     PHUBCONTROLLER m_HubController;
     ULONG m_FDODeviceNumber;
-    LPCWSTR m_USBType;
+    LPCSTR m_USBType;
 };
 

//=================================================================================================
@@ -138,7 +138,7 @@
     Status = m_Hardware->Initialize(m_DriverObject, m_FunctionalDeviceObject,
m_PhysicalDeviceObject, m_NextDeviceObject);
     if (!NT_SUCCESS(Status))
     {
-        DPRINT1("[%S] Failed to initialize hardware object %x\n",
m_Hardware->GetUSBType(), Status);
+        DPRINT1("[%s] Failed to initialize hardware object %x\n", Status);
 
         //
         // failed to initialize hardware object, detach from device stack
@@ -240,7 +240,7 @@
     //
     PC_ASSERT(DeviceExtension->IsFDO);
 
-    DPRINT1("[%S] HandleDeviceControl>Type: IoCtl %x InputBufferLength %lu
OutputBufferLength %lu\n", m_USBType,
+    DPRINT1("[%s] HandleDeviceControl>Type: IoCtl %x InputBufferLength %lu
OutputBufferLength %lu\n", m_USBType,
         IoStack->Parameters.DeviceIoControl.IoControlCode,
         IoStack->Parameters.DeviceIoControl.InputBufferLength,
         IoStack->Parameters.DeviceIoControl.OutputBufferLength);
@@ -285,7 +285,7 @@
                         //
                         // informal debug print
                         //
-                        DPRINT1("[%S] Result %S\n", m_USBType,
DriverKey->DriverKeyName);
+                        DPRINT1("[%s] Result %S\n", m_USBType,
DriverKey->DriverKeyName);
                     }
                 }
 
@@ -337,7 +337,7 @@
                 PC_ASSERT(IoStack->Parameters.DeviceIoControl.OutputBufferLength -
sizeof(ULONG) - sizeof(WCHAR) >= ResultLength);
 
                 DriverKey->DriverKeyName[ResultLength / sizeof(WCHAR)] =
L'\0';
-                DPRINT1("[%S] Result %S\n", m_USBType,
DriverKey->DriverKeyName);
+                DPRINT1("[%s] Result %S\n", m_USBType,
DriverKey->DriverKeyName);
             }
 
             //
@@ -400,7 +400,7 @@
     {
         case IRP_MN_START_DEVICE:
         {
-            DPRINT("[%S] HandlePnp IRP_MN_START FDO\n", m_USBType);
+            DPRINT("[%s] HandlePnp IRP_MN_START FDO\n", m_USBType);
 
             //
             // first start lower device object
@@ -429,12 +429,12 @@
                 Status = SetSymbolicLink(TRUE);
             }
 
-            DPRINT("[%S] HandlePnp IRP_MN_START FDO: Status %x\n", m_USBType
,Status);
+            DPRINT("[%s] HandlePnp IRP_MN_START FDO: Status %x\n", m_USBType
,Status);
             break;
         }
         case IRP_MN_QUERY_DEVICE_RELATIONS:
         {
-            DPRINT("[%S] HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %lx\n",
m_USBType, IoStack->Parameters.QueryDeviceRelations.Type);
+            DPRINT("[%s] HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %lx\n",
m_USBType, IoStack->Parameters.QueryDeviceRelations.Type);
 
             if (m_HubController == NULL)
             {
@@ -514,7 +514,7 @@
         }
         case IRP_MN_STOP_DEVICE:
         {
-            DPRINT("[%S] HandlePnp IRP_MN_STOP_DEVICE\n", m_USBType);
+            DPRINT("[%s] HandlePnp IRP_MN_STOP_DEVICE\n", m_USBType);
 
             if (m_Hardware)
             {
@@ -555,7 +555,7 @@
             IoSkipCurrentIrpStackLocation(Irp);
             return IoCallDriver(m_NextDeviceObject, Irp);
 #else
-            DPRINT1("[%S] Denying controller removal due to reinitialization
bugs\n", m_USBType);
+            DPRINT1("[%s] Denying controller removal due to reinitialization
bugs\n", m_USBType);
             Irp->IoStatus.Status = STATUS_UNSUCCESSFUL;
             IoCompleteRequest(Irp, IO_NO_INCREMENT);
             return STATUS_UNSUCCESSFUL;
@@ -563,7 +563,7 @@
         }
         case IRP_MN_REMOVE_DEVICE:
         {
-            DPRINT("[%S] HandlePnp IRP_MN_REMOVE_DEVICE FDO\n", m_USBType);
+            DPRINT("[%s] HandlePnp IRP_MN_REMOVE_DEVICE FDO\n", m_USBType);
 
             //
             // delete the symbolic link
@@ -635,7 +635,7 @@
         //
         // construct device name
         //
-        swprintf(CharDeviceName, L"\\Device\\USBFDO-%lu", UsbDeviceNumber);
+        swprintf(CharDeviceName, L"\\Device\\USBFDO-%d", UsbDeviceNumber);
 
         //
         // initialize device name
@@ -676,7 +676,7 @@
         //
         if (!NT_SUCCESS(Status))
         {
-            DPRINT1("[%S] CreateFDO: Failed to create %wZ, Status %x\n",
m_USBType, &DeviceName, Status);
+            DPRINT1("[%s] CreateFDO: Failed to create %wZ, Status %x\n",
m_USBType, &DeviceName, Status);
             return Status;
         }
     }
@@ -686,7 +686,7 @@
     //
     m_FDODeviceNumber = UsbDeviceNumber;
 
-    DPRINT("[%S] CreateFDO: DeviceName %wZ\n", m_USBType, &DeviceName);
+    DPRINT("[%s] CreateFDO: DeviceName %wZ\n", m_USBType, &DeviceName);
 
     /* done */
     return Status;
@@ -706,8 +706,8 @@
         //
         // create legacy link
         //
-        swprintf(LinkName, L"\\DosDevices\\HCD%lu", m_FDODeviceNumber);
-        swprintf(FDOName, L"\\Device\\USBFDO-%lu", m_FDODeviceNumber);
+        swprintf(LinkName, L"\\DosDevices\\HCD%d", m_FDODeviceNumber);
+        swprintf(FDOName, L"\\Device\\USBFDO-%d", m_FDODeviceNumber);
         RtlInitUnicodeString(&Link, LinkName);
         RtlInitUnicodeString(&FDO, FDOName);
 
@@ -729,7 +729,7 @@
         //
         // create legacy link
         //
-        swprintf(LinkName, L"\\DosDevices\\HCD%lu", m_FDODeviceNumber);
+        swprintf(LinkName, L"\\DosDevices\\HCD%d", m_FDODeviceNumber);
         RtlInitUnicodeString(&Link, LinkName);
 
         //

Modified: trunk/reactos/lib/drivers/libusb/hub_controller.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/hub_con…
==============================================================================
--- trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/libusb/hub_controller.cpp [iso-8859-1] Sun Mar 31 07:41:31
2013
@@ -105,7 +105,7 @@
     PULONG m_DeviceAddressBitmapBuffer;
     LIST_ENTRY m_UsbDeviceList;
     PIRP m_PendingSCEIrp;
-    LPCWSTR m_USBType;
+    LPCSTR m_USBType;
 
 
     //Internal Functions
@@ -310,7 +310,7 @@
     // Get the number of ports and check each one for device connected
     //
     m_Hardware->GetDeviceDetails(NULL, NULL, &PortCount, NULL);
-    DPRINT1("[%S] SCE Request %p TransferBufferLength %lu Flags %x MDL %p\n",
m_USBType, Urb->UrbBulkOrInterruptTransfer.TransferBuffer,
Urb->UrbBulkOrInterruptTransfer.TransferBufferLength,
Urb->UrbBulkOrInterruptTransfer.TransferFlags,
Urb->UrbBulkOrInterruptTransfer.TransferBufferMDL);
+    DPRINT1("[%s] SCE Request %p TransferBufferLength %lu Flags %x MDL %p\n",
m_USBType, Urb->UrbBulkOrInterruptTransfer.TransferBuffer,
Urb->UrbBulkOrInterruptTransfer.TransferBufferLength,
Urb->UrbBulkOrInterruptTransfer.TransferFlags,
Urb->UrbBulkOrInterruptTransfer.TransferBufferMDL);
 
     TransferBuffer = (PUCHAR)Urb->UrbBulkOrInterruptTransfer.TransferBuffer;
 
@@ -321,7 +321,7 @@
     {
         m_Hardware->GetPortStatus(PortId, &PortStatus, &PortChange);
 
-        DPRINT1("[%S] Port %lu: Status %x, Change %x\n", m_USBType, PortId,
PortStatus, PortChange);
+        DPRINT1("[%s] Port %d: Status %x, Change %x\n", m_USBType, PortId,
PortStatus, PortChange);
 
 
         //
@@ -329,7 +329,7 @@
         //
         if (PortChange != 0)
         {
-            DPRINT1("[%S] Change state on port %lu\n", m_USBType, PortId);
+            DPRINT1("[%s] Change state on port %d\n", m_USBType, PortId);
             // Set the value for the port number
              *TransferBuffer = 1 << ((PortId + 1) & 7);
             Changed = TRUE;
@@ -432,7 +432,7 @@
     {
         case IRP_MN_START_DEVICE:
         {
-            DPRINT("[%S] HandlePnp IRP_MN_START_DEVICE\n", m_USBType);
+            DPRINT("[%s] HandlePnp IRP_MN_START_DEVICE\n", m_USBType);
             //
             // register device interface
             //
@@ -450,7 +450,7 @@
         }
         case IRP_MN_QUERY_ID:
         {
-            DPRINT("[%S] HandlePnp IRP_MN_QUERY_ID Type %x\n", m_USBType,
IoStack->Parameters.QueryId.IdType);
+            DPRINT("[%s] HandlePnp IRP_MN_QUERY_ID Type %x\n", m_USBType,
IoStack->Parameters.QueryId.IdType);
 
             if (IoStack->Parameters.QueryId.IdType == BusQueryDeviceID)
             {
@@ -525,7 +525,7 @@
 
                     if (!NT_SUCCESS(Status))
                     {
-                         DPRINT1("[%S] HandlePnp> failed to get hardware id
%x\n", m_USBType, Status);
+                         DPRINT1("[%s] HandlePnp> failed to get hardware id
%x\n", m_USBType, Status);
                          VendorID = 0x8086;
                          DeviceID = 0x3A37;
                     }
@@ -553,7 +553,7 @@
                    Index++;
 
 
-                    DPRINT1("[%S] Name %S\n", m_USBType, Buffer);
+                    DPRINT1("[%s] Name %S\n", m_USBType, Buffer);
 
                     //
                     // allocate buffer
@@ -587,7 +587,7 @@
         }
         case IRP_MN_QUERY_CAPABILITIES:
         {
-            DPRINT("[%S] HandlePnp IRP_MN_QUERY_CAPABILITIES\n", m_USBType);
+            DPRINT("[%s] HandlePnp IRP_MN_QUERY_CAPABILITIES\n", m_USBType);
 
             DeviceCapabilities =
(PDEVICE_CAPABILITIES)IoStack->Parameters.DeviceCapabilities.Capabilities;
 
@@ -619,7 +619,7 @@
         }
         case IRP_MN_QUERY_INTERFACE:
         {
-            DPRINT("[%S] HandlePnp IRP_MN_QUERY_INTERFACE\n", m_USBType);
+            DPRINT("[%s] HandlePnp IRP_MN_QUERY_INTERFACE\n", m_USBType);
 
             //
             // handle device interface requests
@@ -629,7 +629,7 @@
         }
         case IRP_MN_REMOVE_DEVICE:
         {
-            DPRINT("[%S] HandlePnp IRP_MN_REMOVE_DEVICE\n", m_USBType);
+            DPRINT("[%s] HandlePnp IRP_MN_REMOVE_DEVICE\n", m_USBType);
 
             //
             // deactivate device interface for BUS PDO
@@ -659,7 +659,7 @@
         }
         case IRP_MN_QUERY_DEVICE_RELATIONS:
         {
-            DPRINT("[%S] HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %x\n",
m_USBType, IoStack->Parameters.QueryDeviceRelations.Type);
+            DPRINT("[%s] HandlePnp IRP_MN_QUERY_DEVICE_RELATIONS Type %x\n",
m_USBType, IoStack->Parameters.QueryDeviceRelations.Type);
 
             if (IoStack->Parameters.QueryDeviceRelations.Type ==
TargetDeviceRelation)
             {
@@ -700,7 +700,7 @@
         }
         case IRP_MN_QUERY_BUS_INFORMATION:
         {
-            DPRINT("[%S] HandlePnp IRP_MN_QUERY_BUS_INFORMATION\n",
m_USBType);
+            DPRINT("[%s] HandlePnp IRP_MN_QUERY_BUS_INFORMATION\n",
m_USBType);
 
             //
             // allocate buffer for bus information
@@ -733,7 +733,7 @@
         }
         case IRP_MN_STOP_DEVICE:
         {
-            DPRINT("[%S] HandlePnp IRP_MN_STOP_DEVICE\n", m_USBType);
+            DPRINT("[%s] HandlePnp IRP_MN_STOP_DEVICE\n", m_USBType);
             //
             // stop device
             //
@@ -742,7 +742,7 @@
         }
         case IRP_MN_SURPRISE_REMOVAL:
         {
-            DPRINT("[%S] HandlePnp IRP_MN_SURPRISE_REMOVAL\n", m_USBType);
+            DPRINT("[%s] HandlePnp IRP_MN_SURPRISE_REMOVAL\n", m_USBType);
             Status = STATUS_SUCCESS;
             break;
         }
@@ -796,7 +796,7 @@
 
     if (!EndPointDesc)
     {
-        DPRINT1("[%S] Error No EndpointDesc\n", m_USBType);
+        DPRINT1("[%s] Error No EndpointDesc\n", m_USBType);
         Urb->UrbIsochronousTransfer.Hdr.Status = USBD_STATUS_INVALID_PIPE_HANDLE;
         return STATUS_INVALID_PARAMETER;
     }
@@ -805,7 +805,7 @@
     // sanity checks
     //
     ASSERT(EndPointDesc);
-    DPRINT("[%S] HandleIsochronousTransfer EndPointDesc %p Address %x bmAttributes
%x\n", m_USBType, EndPointDesc, EndPointDesc->bEndpointAddress,
EndPointDesc->bmAttributes);
+    DPRINT("[%s] HandleIsochronousTransfer EndPointDesc %p Address %x bmAttributes
%x\n", m_USBType, EndPointDesc, EndPointDesc->bEndpointAddress,
EndPointDesc->bmAttributes);
     ASSERT((EndPointDesc->bmAttributes & USB_ENDPOINT_TYPE_MASK) ==
USB_ENDPOINT_TYPE_ISOCHRONOUS);
 
     //
@@ -813,7 +813,7 @@
     //
     if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle)))
     {
-        DPRINT1("[%S] HandleIsochronousTransfer invalid device handle %p\n",
m_USBType, Urb->UrbHeader.UsbdDeviceHandle);
+        DPRINT1("[%s] HandleIsochronousTransfer invalid device handle %p\n",
m_USBType, Urb->UrbHeader.UsbdDeviceHandle);
 
         //
         // invalid device handle
@@ -856,7 +856,7 @@
         //
         // Else pend the IRP, to be completed when a device connects or disconnects.
         //
-        DPRINT("[%S] Pending SCE Irp\n", m_USBType);
+        DPRINT("[%s] Pending SCE Irp\n", m_USBType);
         m_PendingSCEIrp = Irp;
         IoMarkIrpPending(Irp);
         return STATUS_PENDING;
@@ -878,7 +878,7 @@
     //
     if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle)))
     {
-        DPRINT1("[%S] HandleBulkOrInterruptTransfer invalid device handle
%p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle);
+        DPRINT1("[%s] HandleBulkOrInterruptTransfer invalid device handle
%p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle);
 
         //
         // invalid device handle
@@ -905,7 +905,7 @@
     ULONG NumPort;
     ULONG PortId;
 
-    DPRINT("[%S] HandleClassOther> Request %x Value %x\n", m_USBType,
Urb->UrbControlVendorClassRequest.Request,
Urb->UrbControlVendorClassRequest.Value);
+    DPRINT("[%s] HandleClassOther> Request %x Value %x\n", m_USBType,
Urb->UrbControlVendorClassRequest.Request,
Urb->UrbControlVendorClassRequest.Value);
 
     //
     // get number of ports available
@@ -947,7 +947,7 @@
                 //
                 // request contains buffer of 2 ushort which are used from submitting
port status and port change status
                 //
-                DPRINT("[%S] PortId %x PortStatus %x PortChange %x\n",
m_USBType, PortId, PortStatus, PortChange);
+                DPRINT("[%s] PortId %x PortStatus %x PortChange %x\n",
m_USBType, PortId, PortStatus, PortChange);
                 Buffer = (PUSHORT)Urb->UrbControlVendorClassRequest.TransferBuffer;
 
                 //
@@ -974,7 +974,7 @@
                     Status = m_Hardware->ClearPortStatus(PortId, C_PORT_RESET);
                     break;
                 default:
-                    DPRINT("[%S] Unknown Value for Clear Feature %x \n",
m_USBType, Urb->UrbControlVendorClassRequest.Value);
+                    DPRINT("[%s] Unknown Value for Clear Feature %x \n",
m_USBType, Urb->UrbControlVendorClassRequest.Value);
                     break;
            }
 
@@ -1023,13 +1023,13 @@
                     break;
                 }
                 default:
-                    DPRINT1("[%S] Unsupported request id %x\n", m_USBType,
Urb->UrbControlVendorClassRequest.Value);
+                    DPRINT1("[%s] Unsupported request id %x\n", m_USBType,
Urb->UrbControlVendorClassRequest.Value);
                     PC_ASSERT(FALSE);
             }
             break;
         }
         default:
-            DPRINT1("[%S] HandleClassOther Unknown request code %x\n",
m_USBType, Urb->UrbControlVendorClassRequest.Request);
+            DPRINT1("[%s] HandleClassOther Unknown request code %x\n",
m_USBType, Urb->UrbControlVendorClassRequest.Request);
             PC_ASSERT(0);
             Status = STATUS_INVALID_DEVICE_REQUEST;
     }
@@ -1095,7 +1095,7 @@
         //
         if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle)))
         {
-            DPRINT1("[%S] HandleSelectConfiguration invalid device handle
%p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle);
+            DPRINT1("[%s] HandleSelectConfiguration invalid device handle
%p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle);
 
             //
             // invalid device handle
@@ -1151,7 +1151,7 @@
         //
         if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle)))
         {
-            DPRINT1("[%S] HandleSelectInterface invalid device handle %p\n",
m_USBType, Urb->UrbHeader.UsbdDeviceHandle);
+            DPRINT1("[%s] HandleSelectInterface invalid device handle %p\n",
m_USBType, Urb->UrbHeader.UsbdDeviceHandle);
 
             //
             // invalid device handle
@@ -1208,7 +1208,7 @@
     //
     if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle)))
     {
-        DPRINT1("[%S] HandleGetStatusFromDevice invalid device handle %p\n",
m_USBType, Urb->UrbHeader.UsbdDeviceHandle);
+        DPRINT1("[%s] HandleGetStatusFromDevice invalid device handle %p\n",
m_USBType, Urb->UrbHeader.UsbdDeviceHandle);
 
         //
         // invalid device handle
@@ -1252,7 +1252,7 @@
     //
     Status = UsbDevice->SubmitSetupPacket(&CtrlSetup,
Urb->UrbControlDescriptorRequest.TransferBufferLength,
Urb->UrbControlDescriptorRequest.TransferBuffer);
     ASSERT(Status == STATUS_SUCCESS);
-    DPRINT1("[%S] HandleGetStatusFromDevice Status %x Length %lu DeviceStatus
%x\n", m_USBType, Status, Urb->UrbControlDescriptorRequest.TransferBufferLength,
*DeviceStatus);
+    DPRINT1("[%s] HandleGetStatusFromDevice Status %x Length %lu DeviceStatus
%x\n", m_USBType, Status, Urb->UrbControlDescriptorRequest.TransferBufferLength,
*DeviceStatus);
 
     //
     // done
@@ -1273,7 +1273,7 @@
     PUSBDEVICE UsbDevice;
     USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup;
 
-    DPRINT("[%S] HandleClassDevice Request %x Class %x\n", m_USBType,
Urb->UrbControlVendorClassRequest.Request, Urb->UrbControlVendorClassRequest.Value
>> 8);
+    DPRINT("[%s] HandleClassDevice Request %x Class %x\n", m_USBType,
Urb->UrbControlVendorClassRequest.Request, Urb->UrbControlVendorClassRequest.Value
>> 8);
 
     //
     // check class request type
@@ -1287,7 +1287,7 @@
             //
             if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle)))
             {
-                DPRINT1("[%S] HandleClassDevice invalid device handle %p\n",
m_USBType, Urb->UrbHeader.UsbdDeviceHandle);
+                DPRINT1("[%s] HandleClassDevice invalid device handle %p\n",
m_USBType, Urb->UrbHeader.UsbdDeviceHandle);
 
                 //
                 // invalid device handle
@@ -1371,7 +1371,7 @@
                     {
                         if
(!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle)))
                         {
-                            DPRINT1("[%S] HandleClassDevice invalid device handle
%p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle);
+                            DPRINT1("[%s] HandleClassDevice invalid device handle
%p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle);
                             //
                             // invalid device handle
                             //
@@ -1387,7 +1387,7 @@
                     break;
                }
                default:
-                   DPRINT1("[%S] HandleClassDevice Class %x not implemented\n",
m_USBType, Urb->UrbControlVendorClassRequest.Value >> 8);
+                   DPRINT1("[%s] HandleClassDevice Class %x not implemented\n",
m_USBType, Urb->UrbControlVendorClassRequest.Value >> 8);
                    break;
             }
             break;
@@ -1399,7 +1399,7 @@
             //
             if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle)))
             {
-                DPRINT1("[%S] HandleClassDevice invalid device handle %p\n",
m_USBType, Urb->UrbHeader.UsbdDeviceHandle);
+                DPRINT1("[%s] HandleClassDevice invalid device handle %p\n",
m_USBType, Urb->UrbHeader.UsbdDeviceHandle);
 
                 //
                 // invalid device handle
@@ -1465,7 +1465,7 @@
     //
     if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle)))
     {
-        DPRINT1("[%S] HandleGetDescriptorFromInterface invalid device handle
%p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle);
+        DPRINT1("[%s] HandleGetDescriptorFromInterface invalid device handle
%p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle);
 
         //
         // invalid device handle
@@ -1494,7 +1494,7 @@
     Status = UsbDevice->SubmitSetupPacket(&CtrlSetup,
Urb->UrbControlDescriptorRequest.TransferBufferLength,
Urb->UrbControlDescriptorRequest.TransferBuffer);
     if (!NT_SUCCESS(Status))
     {
-        DPRINT1("[%S] HandleGetDescriptorFromInterface failed with %x\n",
m_USBType, Status);
+        DPRINT1("[%s] HandleGetDescriptorFromInterface failed with %x\n",
m_USBType, Status);
     }
 
     //
@@ -1515,7 +1515,7 @@
     PUSBDEVICE UsbDevice;
     ULONG Length, BufferLength;
 
-    DPRINT("[%S] HandleGetDescriptor Type %x\n", m_USBType,
Urb->UrbControlDescriptorRequest.DescriptorType);
+    DPRINT("[%s] HandleGetDescriptor Type %x\n", m_USBType,
Urb->UrbControlDescriptorRequest.DescriptorType);
 
     //
     // check descriptor type
@@ -1547,7 +1547,7 @@
                 //
                 if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle)))
                 {
-                    DPRINT1("[%S] HandleGetDescriptor invalid device handle
%p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle);
+                    DPRINT1("[%s] HandleGetDescriptor invalid device handle
%p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle);
 
                     //
                     // invalid device handle
@@ -1654,7 +1654,7 @@
                 //
                 if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle)))
                 {
-                    DPRINT1("[%S] USB_CONFIGURATION_DESCRIPTOR_TYPE invalid device
handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle);
+                    DPRINT1("[%s] USB_CONFIGURATION_DESCRIPTOR_TYPE invalid device
handle %p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle);
 
                     //
                     // invalid device handle
@@ -1719,7 +1719,7 @@
             //
             if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle)))
             {
-                DPRINT1("[%S] USB_STRING_DESCRIPTOR_TYPE invalid device handle
%p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle);
+                DPRINT1("[%s] USB_STRING_DESCRIPTOR_TYPE invalid device handle
%p\n", m_USBType, Urb->UrbHeader.UsbdDeviceHandle);
 
                 //
                 // invalid device handle
@@ -1749,7 +1749,7 @@
             break;
         }
         default:
-            DPRINT1("[%S] CHubController::HandleGetDescriptor DescriptorType %x
unimplemented\n", m_USBType, Urb->UrbControlDescriptorRequest.DescriptorType);
+            DPRINT1("[%s] CHubController::HandleGetDescriptor DescriptorType %x
unimplemented\n", m_USBType, Urb->UrbControlDescriptorRequest.DescriptorType);
             break;
     }
 
@@ -1781,7 +1781,7 @@
     //
     if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle)))
     {
-        DPRINT1("[%S] HandleClassEndpoint invalid device handle %p\n",
m_USBType, Urb->UrbHeader.UsbdDeviceHandle);
+        DPRINT1("[%s] HandleClassEndpoint invalid device handle %p\n",
m_USBType, Urb->UrbHeader.UsbdDeviceHandle);
 
         //
         // invalid device handle
@@ -1798,8 +1798,8 @@
     DPRINT1("URB_FUNCTION_CLASS_ENDPOINT\n");
     DPRINT1("TransferFlags %x\n",
Urb->UrbControlVendorClassRequest.TransferFlags);
     DPRINT1("TransferBufferLength %x\n",
Urb->UrbControlVendorClassRequest.TransferBufferLength);
-    DPRINT1("TransferBuffer %p\n",
Urb->UrbControlVendorClassRequest.TransferBuffer);
-    DPRINT1("TransferBufferMDL %p\n",
Urb->UrbControlVendorClassRequest.TransferBufferMDL);
+    DPRINT1("TransferBuffer %x\n",
Urb->UrbControlVendorClassRequest.TransferBuffer);
+    DPRINT1("TransferBufferMDL %x\n",
Urb->UrbControlVendorClassRequest.TransferBufferMDL);
     DPRINT1("RequestTypeReservedBits %x\n",
Urb->UrbControlVendorClassRequest.RequestTypeReservedBits);
     DPRINT1("Request %x\n", Urb->UrbControlVendorClassRequest.Request);
     DPRINT1("Value %x\n", Urb->UrbControlVendorClassRequest.Value);
@@ -1862,7 +1862,7 @@
     //
     if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle)))
     {
-        DPRINT1("[%S] HandleVendorDevice invalid device handle %p\n",
m_USBType, Urb->UrbHeader.UsbdDeviceHandle);
+        DPRINT1("[%s] HandleVendorDevice invalid device handle %p\n",
m_USBType, Urb->UrbHeader.UsbdDeviceHandle);
 
         //
         // invalid device handle
@@ -1930,7 +1930,7 @@
     //
     if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle)))
     {
-        DPRINT1("[%S] HandleSyncResetAndClearStall invalid device handle %p\n",
m_USBType, Urb->UrbHeader.UsbdDeviceHandle);
+        DPRINT1("[%s] HandleSyncResetAndClearStall invalid device handle %p\n",
m_USBType, Urb->UrbHeader.UsbdDeviceHandle);
 
         //
         // invalid device handle
@@ -1947,7 +1947,7 @@
         //
         // failed
         //
-        DPRINT1("[%S] failed to reset pipe %x\n", m_USBType, Status);
+        DPRINT1("[%s] failed to reset pipe %x\n", m_USBType, Status);
     }
 
 
@@ -1967,7 +1967,7 @@
         //
         Status = HandleClearStall(Irp, Urb);
     }
-    DPRINT1("[%S] URB_FUNCTION_SYNC_RESET_PIPE_AND_CLEAR_STALL Status %x\n",
m_USBType, Status);
+    DPRINT1("[%s] URB_FUNCTION_SYNC_RESET_PIPE_AND_CLEAR_STALL Status %x\n",
m_USBType, Status);
 
     //
     // reset data toggle
@@ -2003,7 +2003,7 @@
     //
     if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle)))
     {
-        DPRINT1("[%S] HandleAbortPipe invalid device handle %p\n", m_USBType,
Urb->UrbHeader.UsbdDeviceHandle);
+        DPRINT1("[%s] HandleAbortPipe invalid device handle %p\n", m_USBType,
Urb->UrbHeader.UsbdDeviceHandle);
 
         //
         // invalid device handle
@@ -2026,7 +2026,7 @@
     // issue request
     //
     Status = UsbDevice->AbortPipe(EndpointDescriptor);
-    DPRINT1("[%S] URB_FUNCTION_ABORT_PIPE Status %x\n", m_USBType, Status);
+    DPRINT1("[%s] URB_FUNCTION_ABORT_PIPE Status %x\n", m_USBType, Status);
 
     //
     // done
@@ -2059,7 +2059,7 @@
     //
     if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle)))
     {
-        DPRINT1("[%S] HandleClearStall invalid device handle %p\n", m_USBType,
Urb->UrbHeader.UsbdDeviceHandle);
+        DPRINT1("[%s] HandleClearStall invalid device handle %p\n", m_USBType,
Urb->UrbHeader.UsbdDeviceHandle);
 
         //
         // invalid device handle
@@ -2076,7 +2076,7 @@
     // get device
     //
     UsbDevice = PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle);
-    DPRINT1("[%S] URB_FUNCTION_SYNC_CLEAR_STALL\n", m_USBType);
+    DPRINT1("[%s] URB_FUNCTION_SYNC_CLEAR_STALL\n", m_USBType);
 
     //
     // initialize setup packet
@@ -2093,7 +2093,7 @@
     //
     Status = UsbDevice->SubmitSetupPacket(&CtrlSetup, 0, 0);
 
-    DPRINT1("[%S] URB_FUNCTION_CLEAR_STALL Status %x\n", m_USBType, Status);
+    DPRINT1("[%s] URB_FUNCTION_CLEAR_STALL Status %x\n", m_USBType, Status);
 
     //
     // done
@@ -2124,7 +2124,7 @@
     //
     if (!ValidateUsbDevice(PUSBDEVICE(Urb->UrbHeader.UsbdDeviceHandle)))
     {
-        DPRINT1("[%S] HandleClassInterface invalid device handle %p\n",
m_USBType, Urb->UrbHeader.UsbdDeviceHandle);
+        DPRINT1("[%s] HandleClassInterface invalid device handle %p\n",
m_USBType, Urb->UrbHeader.UsbdDeviceHandle);
 
         //
         // invalid device handle
@@ -2141,8 +2141,8 @@
     DPRINT1("URB_FUNCTION_CLASS_INTERFACE\n");
     DPRINT1("TransferFlags %x\n",
Urb->UrbControlVendorClassRequest.TransferFlags);
     DPRINT1("TransferBufferLength %x\n",
Urb->UrbControlVendorClassRequest.TransferBufferLength);
-    DPRINT1("TransferBuffer %p\n",
Urb->UrbControlVendorClassRequest.TransferBuffer);
-    DPRINT1("TransferBufferMDL %p\n",
Urb->UrbControlVendorClassRequest.TransferBufferMDL);
+    DPRINT1("TransferBuffer %x\n",
Urb->UrbControlVendorClassRequest.TransferBuffer);
+    DPRINT1("TransferBufferMDL %x\n",
Urb->UrbControlVendorClassRequest.TransferBufferMDL);
     DPRINT1("RequestTypeReservedBits %x\n",
Urb->UrbControlVendorClassRequest.RequestTypeReservedBits);
     DPRINT1("Request %x\n", Urb->UrbControlVendorClassRequest.Request);
     DPRINT1("Value %x\n", Urb->UrbControlVendorClassRequest.Value);
@@ -2178,7 +2178,7 @@
         //
         // display error
         //
-        DPRINT1("[%S] URB_FUNCTION_CLASS_INTERFACE failed with Urb Status
%x\n", m_USBType, Urb->UrbHeader.Status);
+        DPRINT1("[%s] URB_FUNCTION_CLASS_INTERFACE failed with Urb Status
%x\n", m_USBType, Urb->UrbHeader.Status);
     }
 
     //
@@ -2272,7 +2272,7 @@
                     Status = HandleVendorDevice(Irp, Urb);
                     break;
                 default:
-                    DPRINT1("[%S] IOCTL_INTERNAL_USB_SUBMIT_URB Function %x NOT
IMPLEMENTED\n", m_USBType, Urb->UrbHeader.Function);
+                    DPRINT1("[%s] IOCTL_INTERNAL_USB_SUBMIT_URB Function %x NOT
IMPLEMENTED\n", m_USBType, Urb->UrbHeader.Function);
                     break;
             }
             //
@@ -2282,7 +2282,7 @@
         }
         case IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE:
         {
-            DPRINT("[%S] IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE %p\n", m_USBType,
this);
+            DPRINT("[%s] IOCTL_INTERNAL_USB_GET_DEVICE_HANDLE %p\n", m_USBType,
this);
 
             if (IoStack->Parameters.Others.Argument1)
             {
@@ -2307,7 +2307,7 @@
         }
         case IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO:
         {
-            DPRINT("[%S] IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO\n", m_USBType);
+            DPRINT("[%s] IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO\n", m_USBType);
 
             //
             // this is the first request send, it delivers the PDO to the caller
@@ -2336,7 +2336,7 @@
         }
         case IOCTL_INTERNAL_USB_GET_HUB_COUNT:
         {
-            DPRINT("[%S] IOCTL_INTERNAL_USB_GET_HUB_COUNT\n", m_USBType);
+            DPRINT("[%s] IOCTL_INTERNAL_USB_GET_HUB_COUNT\n", m_USBType);
 
             //
             // after IOCTL_INTERNAL_USB_GET_ROOTHUB_PDO is delivered, the usbhub driver
@@ -2359,13 +2359,13 @@
         }
         case IOCTL_INTERNAL_USB_SUBMIT_IDLE_NOTIFICATION:
         {
-            DPRINT1("[%S] IOCTL_INTERNAL_USB_SUBMIT_IDLE_NOTIFICATION
UNIMPLEMENTED\n", m_USBType);
+            DPRINT1("[%s] IOCTL_INTERNAL_USB_SUBMIT_IDLE_NOTIFICATION
UNIMPLEMENTED\n", m_USBType);
             Status = STATUS_SUCCESS;
             break;
         }
         default:
         {
-            DPRINT1("[%S] HandleDeviceControl>Type: IoCtl %x InputBufferLength
%lu OutputBufferLength %lu NOT IMPLEMENTED\n", m_USBType,
+            DPRINT1("[%s] HandleDeviceControl>Type: IoCtl %x InputBufferLength
%lu OutputBufferLength %lu NOT IMPLEMENTED\n", m_USBType,
                     IoStack->Parameters.DeviceIoControl.IoControlCode,
                     IoStack->Parameters.DeviceIoControl.InputBufferLength,
                     IoStack->Parameters.DeviceIoControl.OutputBufferLength);
@@ -3853,7 +3853,7 @@
         //
         // construct device name
         //
-        swprintf(CharDeviceName, L"\\Device\\USBPDO-%lu", UsbDeviceNumber);
+        swprintf(CharDeviceName, L"\\Device\\USBPDO-%d", UsbDeviceNumber);
 
         //
         // initialize device name

Modified: trunk/reactos/lib/drivers/libusb/usb_device.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/libusb/usb_dev…
==============================================================================
--- trunk/reactos/lib/drivers/libusb/usb_device.cpp [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/libusb/usb_device.cpp [iso-8859-1] Sun Mar 31 07:41:31 2013
@@ -86,7 +86,7 @@
     ULONG m_PortStatus;
     PUSBQUEUE m_Queue;
     PDMAMEMORYMANAGER m_DmaManager;
-    LPCWSTR m_USBType;
+    LPCSTR m_USBType;
 
     PUSB_CONFIGURATION m_ConfigurationDescriptors;
 };
@@ -141,7 +141,7 @@
         //
         // failed to get usb queue
         //
-        DPRINT1("[%S] GetUsbQueue failed with %x\n", m_USBType, Status);
+        DPRINT1("[%s] GetUsbQueue failed with %x\n", m_USBType, Status);
         return Status;
     }
 
@@ -154,7 +154,7 @@
         //
         // failed to get dma manager
         //
-        DPRINT1("[%S] GetDMA failed with %x\n", m_USBType, Status);
+        DPRINT1("[%s] GetDMA failed with %x\n", m_USBType, Status);
         return Status;
     }
 
@@ -172,7 +172,7 @@
         //
         // failed to get device descriptor
         //
-        DPRINT1("[%S] Failed to get device descriptor with %x\n", m_USBType,
Status);
+        DPRINT1("[%s] Failed to get device descriptor with %x\n", m_USBType,
Status);
         return Status;
     }
 
@@ -276,7 +276,7 @@
         return Usb20Device;
     }
 
-    DPRINT1("[%S] GetType Unknown bcdUSB Type %x\n", m_USBType,
m_DeviceDescriptor.bcdUSB);
+    DPRINT1("[%s] GetType Unknown bcdUSB Type %x\n", m_USBType,
m_DeviceDescriptor.bcdUSB);
     //PC_ASSERT(FALSE);
 
     return Usb11Device;
@@ -311,7 +311,7 @@
     UCHAR OldAddress;
     UCHAR Index;
 
-    DPRINT1("[%S] SetDeviceAddress> Address %x\n", m_USBType,
DeviceAddress);
+    DPRINT1("[%s] SetDeviceAddress> Address %x\n", m_USBType,
DeviceAddress);
 
     CtrlSetup = (PUSB_DEFAULT_PIPE_SETUP_PACKET)ExAllocatePoolWithTag(NonPagedPool,
sizeof(USB_DEFAULT_PIPE_SETUP_PACKET), TAG_USBLIB);
     if (!CtrlSetup)
@@ -334,7 +334,7 @@
     if (!NT_SUCCESS(Status))
     {
         // failed to set device address
-        DPRINT1("[%S] SetDeviceAddress> failed to set device address with %lx
Address %x\n", m_USBType, Status, DeviceAddress);
+        DPRINT1("[%s] SetDeviceAddress> failed to set device address with %lx
Address %x\n", m_USBType, Status, DeviceAddress);
         return Status;
     }
 
@@ -351,7 +351,7 @@
     Status = CreateDeviceDescriptor();
     if (!NT_SUCCESS(Status))
     {
-        DPRINT1("[%S] SetDeviceAddress failed to retrieve device descriptor with
device address set Error %lx\n", m_USBType, Status);
+        DPRINT1("[%s] SetDeviceAddress failed to retrieve device descriptor with
device address set Error %lx\n", m_USBType, Status);
         // return error status
         return Status;
     }
@@ -362,7 +362,7 @@
         m_DeviceDescriptor.bNumConfigurations == 0)
     {
         // failed to retrieve device descriptor
-        DPRINT1("[%S] SetDeviceAddress> device returned bogus device
descriptor\n", m_USBType);
+        DPRINT1("[%s] SetDeviceAddress> device returned bogus device
descriptor\n", m_USBType);
         DumpDeviceDescriptor(&m_DeviceDescriptor);
 
         // return error status
@@ -388,7 +388,7 @@
         Status = CreateConfigurationDescriptor(Index);
         if (!NT_SUCCESS(Status))
         {
-            DPRINT1("[%S] SetDeviceAddress> failed to retrieve configuration
%lu\n", m_USBType, Index);
+            DPRINT1("[%s] SetDeviceAddress> failed to retrieve configuration
%lu\n", m_USBType, Index);
             break;
         }
     }
@@ -431,7 +431,7 @@
         //
         // no queue, wtf?
         //
-        DPRINT1("[%S] CommitIrp> no queue / dma !!!\n", m_USBType);
+        DPRINT1("[%s] CommitIrp> no queue / dma !!!\n", m_USBType);
         return STATUS_UNSUCCESSFUL;
     }
 
@@ -444,7 +444,7 @@
         //
         // failed to build request
         //
-        DPRINT1("[%S] CommitIrp> CreateUSBRequest failed with %lx\n",
m_USBType, Status);
+        DPRINT1("[%s] CommitIrp> CreateUSBRequest failed with %lx\n",
m_USBType, Status);
         return Status;
     }
 
@@ -467,7 +467,7 @@
         //
         // failed to add request
         //
-        DPRINT1("[%S] failed add request to queue with %lx\n", m_USBType,
Status);
+        DPRINT1("[%s] failed add request to queue with %lx\n", m_USBType,
Status);
         Request->Release();
         return Status;
     }
@@ -520,7 +520,7 @@
         //
         // no queue, wtf?
         //
-        DPRINT1("[%S] CommitSetupPacket> no queue!!!\n", m_USBType);
+        DPRINT1("[%s] CommitSetupPacket> no queue!!!\n", m_USBType);
         return STATUS_UNSUCCESSFUL;
     }
 
@@ -533,7 +533,7 @@
         //
         // failed to build request
         //
-        DPRINT1("[%S] CommitSetupPacket> CreateUSBRequest failed with %x\n",
m_USBType, Status);
+        DPRINT1("[%s] CommitSetupPacket> CreateUSBRequest failed with %x\n",
m_USBType, Status);
         return Status;
     }
 
@@ -546,7 +546,7 @@
         //
         // failed to initialize request
         //
-        DPRINT1("[%S] CommitSetupPacket failed to initialize  usb request with
%x\n", m_USBType, Status);
+        DPRINT1("[%s] CommitSetupPacket failed to initialize  usb request with
%x\n", m_USBType, Status);
         Request->Release();
         return Status;
     }
@@ -560,7 +560,7 @@
         //
         // failed to add request
         //
-        DPRINT1("[%S] CommitSetupPacket> failed add request to queue with
%x\n", m_USBType, Status);
+        DPRINT1("[%s] CommitSetupPacket> failed add request to queue with
%x\n", m_USBType, Status);
         Request->Release();
         return Status;
     }
@@ -761,7 +761,7 @@
         //
         // failed to get partial configuration descriptor
         //
-        DPRINT1("[%S] Failed to get partial configuration descriptor Status %x Index
%x\n", m_USBType, Status, Index);
+        DPRINT1("[%s] Failed to get partial configuration descriptor Status %x Index
%x\n", m_USBType, Status, Index);
         ExFreePoolWithTag(ConfigurationDescriptor, TAG_USBLIB);
         return Status;
     }
@@ -775,7 +775,7 @@
         //
         // failed to get full configuration descriptor
         //
-        DPRINT1("[%S] Failed to get full configuration descriptor Status %x Index
%x\n", m_USBType, Status, Index);
+        DPRINT1("[%s] Failed to get full configuration descriptor Status %x Index
%x\n", m_USBType, Status, Index);
         ExFreePoolWithTag(ConfigurationDescriptor, TAG_USBLIB);
         return Status;
     }
@@ -970,7 +970,7 @@
             if (EndpointDescriptor->bLength == 0 ||
EndpointDescriptor->bDescriptorType == USB_INTERFACE_DESCRIPTOR_TYPE)
             {
                 // bogus configuration descriptor
-                DPRINT1("[%S] Bogus descriptor found in InterfaceNumber %x Alternate
%x EndpointIndex %x bLength %x bDescriptorType %x\n", m_USBType,
InterfaceDescriptor->bInterfaceNumber, InterfaceDescriptor->bAlternateSetting,
PipeIndex,
+                DPRINT1("[%s] Bogus descriptor found in InterfaceNumber %x Alternate
%x EndpointIndex %x bLength %x bDescriptorType %x\n", m_USBType,
InterfaceDescriptor->bInterfaceNumber, InterfaceDescriptor->bAlternateSetting,
PipeIndex,
                        EndpointDescriptor->bLength,
EndpointDescriptor->bDescriptorType);
 
                 // failed
@@ -1042,7 +1042,7 @@
 
         if (!Found)
         {
-            DPRINT1("[%S] invalid configuration value %u\n", m_USBType,
ConfigurationDescriptor->bConfigurationValue);
+            DPRINT1("[%s] invalid configuration value %u\n", m_USBType,
ConfigurationDescriptor->bConfigurationValue);
             return STATUS_INVALID_PARAMETER;
         }
 
@@ -1064,13 +1064,13 @@
     if (!ConfigurationDescriptor)
     {
         // unconfigure request
-        DPRINT1("[%S] SelectConfiguration Unconfigure Request Status %lx\n",
m_USBType, Status);
+        DPRINT1("[%s] SelectConfiguration Unconfigure Request Status %lx\n",
m_USBType, Status);
         m_ConfigurationIndex = 0;
         return Status;
     }
 
     // informal debug print
-    DPRINT1("[%S] SelectConfiguration New Configuration %x Old Configuration %x
Result %lx\n", m_USBType, ConfigurationIndex, m_ConfigurationIndex, Status);
+    DPRINT1("[%s] SelectConfiguration New Configuration %x Old Configuration %x
Result %lx\n", m_USBType, ConfigurationIndex, m_ConfigurationIndex, Status);
     if (!NT_SUCCESS(Status))
     {
         //
@@ -1125,7 +1125,7 @@
         if (!NT_SUCCESS(Status))
         {
             // failed
-            DPRINT1("[%S] Failed to copy interface descriptor Index %lu
InterfaceDescriptor %p InterfaceInfo %p\n", m_USBType, ConfigurationIndex,
InterfaceDescriptor, InterfaceInfo);
+            DPRINT1("[%s] Failed to copy interface descriptor Index %lu
InterfaceDescriptor %p InterfaceInfo %p\n", m_USBType, ConfigurationIndex,
InterfaceDescriptor, InterfaceInfo);
             break;
         }
 
@@ -1167,7 +1167,7 @@
     if (!Found)
     {
         // invalid handle passed
-        DPRINT1("[%S] Invalid configuration handle passed %p\n", m_USBType,
ConfigurationHandle);
+        DPRINT1("[%s] Invalid configuration handle passed %p\n", m_USBType,
ConfigurationHandle);
         return STATUS_INVALID_PARAMETER;
     }
 
@@ -1182,7 +1182,7 @@
     Status = CommitSetupPacket(&CtrlSetup, NULL, 0, NULL);
 
     // informal debug print
-    DPRINT1("[%S] SelectInterface AlternateSetting %x InterfaceNumber %x Status
%lx\n", m_USBType, InterfaceInfo->AlternateSetting,
InterfaceInfo->InterfaceNumber, Status);
+    DPRINT1("[%s] SelectInterface AlternateSetting %x InterfaceNumber %x Status
%lx\n", m_USBType, InterfaceInfo->AlternateSetting,
InterfaceInfo->InterfaceNumber, Status);
 #if 0
     if (!NT_SUCCESS(Status))
     {
@@ -1218,7 +1218,7 @@
         InterfaceDescriptor =
USBD_ParseConfigurationDescriptor(m_ConfigurationDescriptors[ConfigurationIndex].ConfigurationDescriptor,
InterfaceInfo->InterfaceNumber, InterfaceInfo->AlternateSetting);
         if (!InterfaceDescriptor)
         {
-            DPRINT1("[%S] No such interface Alternate %x InterfaceNumber %x\n",
m_USBType, InterfaceInfo->AlternateSetting, InterfaceInfo->InterfaceNumber);
+            DPRINT1("[%s] No such interface Alternate %x InterfaceNumber %x\n",
m_USBType, InterfaceInfo->AlternateSetting, InterfaceInfo->InterfaceNumber);
             return STATUS_UNSUCCESSFUL;
         }
 
@@ -1227,7 +1227,7 @@
         if (!NT_SUCCESS(Status))
         {
             // failed
-            DPRINT1("[%S] Failed to build interface descriptor Status %x\n",
m_USBType, Status);
+            DPRINT1("[%s] Failed to build interface descriptor Status %x\n",
m_USBType, Status);
             return Status;
         }
     }