Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 17:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USBUHCI][USBOHCI][USBEHCI]

Browse source 
- 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
This commit is contained in:
Cameron Gutman 2012-02-29 04:58:27 +00:00
parent 6a2de16a81
commit 90e94e42c5
3 changed files with 0 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
reactos/drivers/usb/usbehci/hardware.cpp
View file

@ -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
//

32
reactos/drivers/usb/usbohci/hardware.cpp
View file

@ -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;
}

5
reactos/drivers/usb/usbuhci/hardware.cpp
View file

@ -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;