[USBUHCI][USBOHCI][USBEHCI]

- Don't modify PCI configuration in AddDevice function
[USBEHCI]
- Don't halt the controller while the BIOS still has control of it

svn path=/trunk/; revision=55910

diff --git a/reactos/drivers/usb/usbehci/hardware.cpp b/reactos/drivers/usb/usbehci/hardware.cpp
index c952b6f..e43b2e1 100644 (file)
--- a/reactos/drivers/usb/usbehci/hardware.cpp
+++ b/reactos/drivers/usb/usbehci/hardware.cpp
@@ -466,13 +466,6 @@ CUSBHardwareDevice::PnpStart(
         return STATUS_INSUFFICIENT_RESOURCES;
     }
 
-    //
-    // Stop the controller before modifying schedules
-    //
-    Status = StopController();
-    if (!NT_SUCCESS(Status))
-        return Status;
-
     //
     // Initialize the DMAMemoryManager
     //

diff --git a/reactos/drivers/usb/usbohci/hardware.cpp b/reactos/drivers/usb/usbohci/hardware.cpp
index 88eed5d..96c78eb 100644 (file)
--- a/reactos/drivers/usb/usbohci/hardware.cpp
+++ b/reactos/drivers/usb/usbohci/hardware.cpp
@@ -201,38 +201,6 @@ CUSBHardwareDevice::Initialize(
     m_VendorID = PciConfig.VendorID;
     m_DeviceID = PciConfig.DeviceID;
 
-    if (PciConfig.Command & PCI_ENABLE_BUS_MASTER)
-    {
-        //
-        // master is enabled
-        //
-        return STATUS_SUCCESS;
-    }
-
-    DPRINT1("PCI Configuration shows this as a non Bus Mastering device! Enabling...\n");
-
-    PciConfig.Command |= PCI_ENABLE_BUS_MASTER;
-    BusInterface.SetBusData(BusInterface.Context, PCI_WHICHSPACE_CONFIG, &PciConfig, 0, PCI_COMMON_HDR_LENGTH);
-
-    BytesRead = (*BusInterface.GetBusData)(BusInterface.Context,
-                                           PCI_WHICHSPACE_CONFIG,
-                                           &PciConfig,
-                                           0,
-                                           PCI_COMMON_HDR_LENGTH);
-
-    if (BytesRead != PCI_COMMON_HDR_LENGTH)
-    {
-        DPRINT1("Failed to get pci config information!\n");
-        ASSERT(FALSE);
-        return STATUS_SUCCESS;
-    }
-
-    if (!(PciConfig.Command & PCI_ENABLE_BUS_MASTER))
-    {
-        DPRINT1("Failed to enable master\n");
-        return STATUS_UNSUCCESSFUL;
-    }
-
     return STATUS_SUCCESS;
 }
 

diff --git a/reactos/drivers/usb/usbuhci/hardware.cpp b/reactos/drivers/usb/usbuhci/hardware.cpp
index d5e3489..daa4eb2 100644 (file)
--- a/reactos/drivers/usb/usbuhci/hardware.cpp
+++ b/reactos/drivers/usb/usbuhci/hardware.cpp
@@ -227,11 +227,6 @@ CUSBHardwareDevice::Initialize(
         return STATUS_SUCCESS;
     }
 
-    if (!(PciConfig.Command & PCI_ENABLE_BUS_MASTER))
-    {
-        DPRINT1("PCI Configuration shows this as a non Bus Mastering device!\n");
-    }
-
     m_VendorID = PciConfig.VendorID;
     m_DeviceID = PciConfig.DeviceID;