[USBEHCI_NEW]

- Fix warnings
- Fix mingw build

svn path=/branches/usb-bringup/; revision=51573

diff --git a/drivers/usb/usbehci_new/hub_controller.cpp b/drivers/usb/usbehci_new/hub_controller.cpp
index 90fc2ce..5e37d4a 100644 (file)
--- a/drivers/usb/usbehci_new/hub_controller.cpp
+++ b/drivers/usb/usbehci_new/hub_controller.cpp
@@ -2277,7 +2277,6 @@ USBHI_RestoreUsbDevice(
 {
     PUSBDEVICE OldUsbDevice, NewUsbDevice;
     CHubController * Controller;
-    NTSTATUS Status;
 
     DPRINT1("USBHI_RestoreUsbDevice\n");
 
@@ -2430,8 +2429,11 @@ USBHI_QueryDeviceInformation(
     //
     // 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
     //

diff --git a/drivers/usb/usbehci_new/usb_queue.cpp b/drivers/usb/usbehci_new/usb_queue.cpp
index a17a3b8..c25fdaa 100644 (file)
--- a/drivers/usb/usbehci_new/usb_queue.cpp
+++ b/drivers/usb/usbehci_new/usb_queue.cpp
@@ -177,6 +177,7 @@ CUSBQueue::AddUSBRequest(
         default:
             /* BUG */
             PC_ASSERT(FALSE);
+            Status = STATUS_NOT_SUPPORTED;
     }
 
     //