mirror of
https://github.com/reactos/reactos.git
synced 2024-08-19 09:59:44 +00:00
[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
This commit is contained in:
parent
6a2de16a81
commit
90e94e42c5
|
@ -466,13 +466,6 @@ CUSBHardwareDevice::PnpStart(
|
||||||
return STATUS_INSUFFICIENT_RESOURCES;
|
return STATUS_INSUFFICIENT_RESOURCES;
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
|
||||||
// Stop the controller before modifying schedules
|
|
||||||
//
|
|
||||||
Status = StopController();
|
|
||||||
if (!NT_SUCCESS(Status))
|
|
||||||
return Status;
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// Initialize the DMAMemoryManager
|
// Initialize the DMAMemoryManager
|
||||||
//
|
//
|
||||||
|
|
|
@ -201,38 +201,6 @@ CUSBHardwareDevice::Initialize(
|
||||||
m_VendorID = PciConfig.VendorID;
|
m_VendorID = PciConfig.VendorID;
|
||||||
m_DeviceID = PciConfig.DeviceID;
|
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;
|
return STATUS_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -227,11 +227,6 @@ CUSBHardwareDevice::Initialize(
|
||||||
return STATUS_SUCCESS;
|
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_VendorID = PciConfig.VendorID;
|
||||||
m_DeviceID = PciConfig.DeviceID;
|
m_DeviceID = PciConfig.DeviceID;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue