[ros-diffs] [cgutman] 55910: [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

Author: cgutman
Date: Wed Feb 29 04:58:27 2012
New Revision: 55910

URL: http://svn.reactos.org/svn/reactos?rev=55910&view=rev
Log:
[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

Modified:
    trunk/reactos/drivers/usb/usbehci/hardware.cpp
    trunk/reactos/drivers/usb/usbohci/hardware.cpp
    trunk/reactos/drivers/usb/usbuhci/hardware.cpp

Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hardwa…
==============================================================================
--- trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] Wed Feb 29 04:58:27 2012
@@ -467,13 +467,6 @@
     }
 
     //
-    // Stop the controller before modifying schedules
-    //
-    Status = StopController();
-    if (!NT_SUCCESS(Status))
-        return Status;
-
-    //
     // Initialize the DMAMemoryManager
     //
     Status = m_MemoryManager->Initialize(this, &m_Lock, PAGE_SIZE * 4,
VirtualBase, PhysicalAddress, 32);

Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwa…
==============================================================================
--- trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Wed Feb 29 04:58:27 2012
@@ -201,38 +201,6 @@
     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;
 }
 

Modified: trunk/reactos/drivers/usb/usbuhci/hardware.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbuhci/hardwa…
==============================================================================
--- trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/usb/usbuhci/hardware.cpp [iso-8859-1] Wed Feb 29 04:58:27 2012
@@ -227,11 +227,6 @@
         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;