[ros-diffs] [janderwald] 51573: [USBEHCI_NEW] - Fix warnings - Fix mingw build

Author: janderwald
Date: Wed May  4 12:09:07 2011
New Revision: 51573

URL: http://svn.reactos.org/svn/reactos?rev=51573&view=rev
Log:
[USBEHCI_NEW]
- Fix warnings
- Fix mingw build

Modified:
    branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp
    branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp

Modified: branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci…
==============================================================================
--- branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1]
(original)
+++ branches/usb-bringup/drivers/usb/usbehci_new/hub_controller.cpp [iso-8859-1] Wed May 
4 12:09:07 2011
@@ -2277,7 +2277,6 @@
 {
     PUSBDEVICE OldUsbDevice, NewUsbDevice;
     CHubController * Controller;
-    NTSTATUS Status;
 
     DPRINT1("USBHI_RestoreUsbDevice\n");
 
@@ -2430,8 +2429,11 @@
     //
     // store result length
     //
+#ifdef _MSC_VER
     *LengthReturned = FIELD_OFFSET(USB_DEVICE_INFORMATION_0,
PipeList[DeviceInfo->NumberOfOpenPipes]);
-
+#else
+    *LengthReturned = sizeof(USB_DEVICE_INFORMATION_0) +
(DeviceInfo->NumberOfOpenPipes > 1 ? (DeviceInfo->NumberOfOpenPipes - 1) *
sizeof(USB_PIPE_INFORMATION_0) : 0);
+#endif
     //
     // done
     //

Modified: branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp
URL:
http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbehci…
==============================================================================
--- branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] (original)
+++ branches/usb-bringup/drivers/usb/usbehci_new/usb_queue.cpp [iso-8859-1] Wed May  4
12:09:07 2011
@@ -177,6 +177,7 @@
         default:
             /* BUG */
             PC_ASSERT(FALSE);
+            Status = STATUS_NOT_SUPPORTED;
     }
 
     //