lby/lk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[platform][pc] fix up bios32 PCI support, get pci IDE working again

Browse Source 
-Spiff up the device driver starting logic to allow for statically
started devices, instead of always automatic.
This commit is contained in:
Travis Geiselbrecht
2018-12-31 16:47:32 -08:00
parent 1fbb67228d
commit 4c29a608e9
10 changed files with 166 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
target/pc-x86/config.c
View File

@@ -44,23 +44,39 @@ static const struct platform_uart_config uart0_config = {
DEVICE_INSTANCE(uart, uart0, &uart0_config);
#endif
#ifndef ARCH_X86_64
// two legacy ISA IDE devices
static const struct platform_ide_config ide0_config = {
.legacy_index = 0,
};
DEVICE_INSTANCE(ide, ide0, &ide0_config);
DEVICE_INSTANCE(ide, ide0, &ide0_config, 0);
static const struct platform_ide_config ide1_config = {
.legacy_index = 1,
};
DEVICE_INSTANCE(ide, ide1, &ide1_config, 0);
DEVICE_INSTANCE(ide, ide1, &ide1_config);
// two PCI IDE devices
static const struct platform_ide_config pci_ide0_config = {
.legacy_index = 0x80,
};
DEVICE_INSTANCE(ide, pci_ide0, &pci_ide0_config, 0);
#endif
static const struct platform_ide_config pci_ide1_config = {
.legacy_index = 0x81,
};
DEVICE_INSTANCE(ide, pci_ide1, &pci_ide1_config, 0);
void target_init(void)
{
// initialize static devices
device_init_all();
// try to initialize pci ide first
if (device_init(&__device_ide_pci_ide0) < 0 || device_init(&__device_ide_pci_ide1) < 0) {
// if that fails, initialize the legacy ISA IDE controllers
device_init(&__device_ide_ide0);
device_init(&__device_ide_ide1);
}
}