[janderwald] 52038: [USBSTOR] - Remove superflous declaration - Fix bug when quering for compatible ids - Remove unused local variable

Author: janderwald
Date: Wed Jun  1 11:31:34 2011
New Revision: 52038

URL: http://svn.reactos.org/svn/reactos?rev=52038&view=rev
Log:
[USBSTOR]
- Remove superflous declaration
- Fix bug when quering for compatible ids
- Remove unused local variable

Modified:
    branches/usb-bringup/drivers/usb/usbstor/error.c
    branches/usb-bringup/drivers/usb/usbstor/pdo.c
    branches/usb-bringup/drivers/usb/usbstor/usbstor.h

Modified: branches/usb-bringup/drivers/usb/usbstor/error.c
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor/...
==============================================================================
--- branches/usb-bringup/drivers/usb/usbstor/error.c [iso-8859-1] (original)
+++ branches/usb-bringup/drivers/usb/usbstor/error.c [iso-8859-1] Wed Jun  1 11:31:34 2011
@@ -65,7 +65,6 @@
 {
    NTSTATUS Status;
    PIO_STACK_LOCATION Stack;
-	PURB Urb;
    USBD_PIPE_HANDLE PipeHandle;
    PSCSI_REQUEST_BLOCK Request;

Modified: branches/usb-bringup/drivers/usb/usbstor/pdo.c
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor/...
==============================================================================
--- branches/usb-bringup/drivers/usb/usbstor/pdo.c [iso-8859-1] (original)
+++ branches/usb-bringup/drivers/usb/usbstor/pdo.c [iso-8859-1] Wed Jun  1 11:31:34 2011
@@ -600,8 +600,8 @@
     //
     // format instance id
     //
-    Length = sprintf(Buffer, L"USBSTOR\%s", DeviceType) + 1;
-    Length += sprintf(&Buffer[Length], L"USBSTOR\%s", L"RAW") + 2;
+    Length = sprintf(Buffer, "USBSTOR\%s", DeviceType) + 1;
+    Length += sprintf(&Buffer[Length], "USBSTOR\%s", "RAW") + 2;

//
     // allocate instance id

Modified: branches/usb-bringup/drivers/usb/usbstor/usbstor.h
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor/...
==============================================================================
--- branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original)
+++ branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] Wed Jun  1 11:31:34 2011
@@ -37,12 +37,6 @@

#define USB_RECOVERABLE_ERRORS (USBD_STATUS_STALL_PID | USBD_STATUS_DEV_NOT_RESPONDING \
    | USBD_STATUS_ENDPOINT_HALTED | USBD_STATUS_NO_BANDWIDTH)
-
-NTSTATUS NTAPI
-IoAttachDeviceToDeviceStackSafe(
-  IN PDEVICE_OBJECT SourceDevice,
-  IN PDEVICE_OBJECT TargetDevice,
-  OUT PDEVICE_OBJECT *AttachedToDeviceObject);

typedef struct __COMMON_DEVICE_EXTENSION__
 {