[ros-diffs] [cgutman] 55032: [USB-BRINGUP-TRUNK] - Fix usbohci build

[cgutman at svn.reactos.org]

Author: cgutman
Date: Fri Jan 20 23:19:18 2012
New Revision: 55032

URL: http://svn.reactos.org/svn/reactos?rev=55032&view=rev
Log:
[USB-BRINGUP-TRUNK]
- Fix usbohci build

Modified:
    branches/usb-bringup-trunk/drivers/usb/usbohci/CMakeLists.txt
    branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp
    branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp
    branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp

Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/usbohci/CMakeLists.txt?rev=55032&r1=55031&r2=55032&view=diff
==============================================================================
--- branches/usb-bringup-trunk/drivers/usb/usbohci/CMakeLists.txt [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/drivers/usb/usbohci/CMakeLists.txt [iso-8859-1] Fri Jan 20 23:19:18 2012
@@ -19,7 +19,6 @@
 
 target_link_libraries(usbohci
     libcntpr
-    stlport
     ${PSEH_LIB})
 
 if(MSVC)

Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp?rev=55032&r1=55031&r2=55032&view=diff
==============================================================================
--- branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Fri Jan 20 23:19:18 2012
@@ -997,7 +997,7 @@
     ULONG PortId,
     ULONG Status)
 {
-    ULONG Value, Index = 0;
+    ULONG Value;
 
     DPRINT("CUSBHardwareDevice::ClearPortStatus PortId %x Feature %x\n", PortId, Status);
 
@@ -1383,7 +1383,6 @@
 {
     CUSBHardwareDevice *This;
     ULONG CStatus, Index, PortStatus;
-    POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor;
     ULONG DoneHead;
 
     //

Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp?rev=55032&r1=55031&r2=55032&view=diff
==============================================================================
--- branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/drivers/usb/usbohci/usb_device.cpp [iso-8859-1] Fri Jan 20 23:19:18 2012
@@ -1028,7 +1028,6 @@
     IN USBD_CONFIGURATION_HANDLE ConfigurationHandle,
     IN OUT PUSBD_INTERFACE_INFORMATION InterfaceInfo)
 {
-    ULONG ConfigurationIndex = 0;
     PUSB_CONFIGURATION_DESCRIPTOR Configuration;
     ULONG PipeIndex;
     USB_DEFAULT_PIPE_SETUP_PACKET CtrlSetup;

Modified: branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp
URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp?rev=55032&r1=55031&r2=55032&view=diff
==============================================================================
--- branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] (original)
+++ branches/usb-bringup-trunk/drivers/usb/usbohci/usb_queue.cpp [iso-8859-1] Fri Jan 20 23:19:18 2012
@@ -169,7 +169,6 @@
 {
     NTSTATUS Status;
     ULONG Type;
-    KIRQL OldLevel;
     POHCI_ENDPOINT_DESCRIPTOR HeadDescriptor;
     POHCI_ENDPOINT_DESCRIPTOR Descriptor;
     POHCI_ISO_TD CurrentDescriptor;
@@ -289,6 +288,14 @@
 
         PrintEndpointList(m_IsoHeadEndpointDescriptor);
     }
+    else
+    {
+        //
+        // bad request type
+        //
+        Request->Release();
+        return STATUS_INVALID_PARAMETER;
+    }
 
     //
     // set descriptor active
@@ -307,7 +314,6 @@
         //
         m_Hardware->HeadEndpointDescriptorModified(Type);
     }
-
 
     return STATUS_SUCCESS;
 }