[USBOHCI]

- Fix warning
- Remove assert
[USBEHCI]
- Remove assert

svn path=/branches/usb-bringup-trunk/; revision=55122

diff --git a/drivers/usb/usbehci_new/hcd_controller.cpp b/drivers/usb/usbehci_new/hcd_controller.cpp
index 5a6318e..ff72060 100644 (file)
--- a/drivers/usb/usbehci_new/hcd_controller.cpp
+++ b/drivers/usb/usbehci_new/hcd_controller.cpp
@@ -502,7 +502,6 @@ CHCDController::HandlePnp(
                 //
                 // not supported
                 //
                 //
                 // not supported
                 //

-                PC_ASSERT(0);

                 Status = STATUS_NOT_SUPPORTED;
             }
             break;
                 Status = STATUS_NOT_SUPPORTED;
             }
             break;

diff --git a/drivers/usb/usbohci/hcd_controller.cpp b/drivers/usb/usbohci/hcd_controller.cpp
index e5a2815..55f45c1 100644 (file)
--- a/drivers/usb/usbohci/hcd_controller.cpp
+++ b/drivers/usb/usbohci/hcd_controller.cpp
@@ -502,7 +502,6 @@ CHCDController::HandlePnp(
                 //
                 // not supported
                 //
                 //
                 // not supported
                 //

-                PC_ASSERT(0);

                 Status = STATUS_NOT_SUPPORTED;
             }
             break;
                 Status = STATUS_NOT_SUPPORTED;
             }
             break;

diff --git a/drivers/usb/usbohci/usb_request.cpp b/drivers/usb/usbohci/usb_request.cpp
index 8fe0320..609d4c3 100644 (file)
--- a/drivers/usb/usbohci/usb_request.cpp
+++ b/drivers/usb/usbohci/usb_request.cpp
@@ -654,7 +654,7 @@ NTSTATUS
 CUSBRequest::BuildIsochronousEndpoint(
     POHCI_ENDPOINT_DESCRIPTOR * OutEndpointDescriptor)
 {
 CUSBRequest::BuildIsochronousEndpoint(
     POHCI_ENDPOINT_DESCRIPTOR * OutEndpointDescriptor)
 {

-    POHCI_ISO_TD FirstDescriptor, PreviousDescriptor = NULL, CurrentDescriptor;
+    POHCI_ISO_TD FirstDescriptor = NULL, PreviousDescriptor = NULL, CurrentDescriptor = NULL;

     POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor;
     ULONG Index = 0, SubIndex, NumberOfPackets, PageOffset, Page;
     NTSTATUS Status;
     POHCI_ENDPOINT_DESCRIPTOR EndpointDescriptor;
     ULONG Index = 0, SubIndex, NumberOfPackets, PageOffset, Page;
     NTSTATUS Status;