diff options
| author | Jennifer Averett <Jennifer.Averett@OARcorp.com> | 2005-05-10 18:27:46 +0000 |
|---|---|---|
| committer | Jennifer Averett <Jennifer.Averett@OARcorp.com> | 2005-05-10 18:27:46 +0000 |
| commit | 34e458a38e9af9fdfa4b1e56fbd7c3fe1a303a12 (patch) | |
| tree | e96fc5819785b32fbed524b9dd6e0362d17bc929 /c/src/lib/libbsp/powerpc/shared/bootloader/misc.c | |
| parent | 2005-05-10 Jennifer Averett <jennifer.averett@oarcorp.com> (diff) | |
| download | rtems-34e458a38e9af9fdfa4b1e56fbd7c3fe1a303a12.tar.bz2 | |
2005-05-10 Jennifer Averett <jennifer.averett@oarcorp.com>
* bootloader/bootldr.h, bootloader/em86.c, bootloader/misc.c,
bootloader/pci.c, bootloader/pci.h: Modified to depend upon
rtems/pci.h
Diffstat (limited to '')
| -rw-r--r-- | c/src/lib/libbsp/powerpc/shared/bootloader/misc.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c b/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c index 934c102a56..c4531672df 100644 --- a/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c +++ b/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c @@ -328,7 +328,7 @@ setup_hw(void) /* Only one can be active in text mode, which for now will * be assumed as equivalent to having I/O response enabled. */ - pci_read_config_word(p, PCI_COMMAND, &cmd); + pci_bootloader_read_config_word(p, PCI_COMMAND, &cmd); if(cmd & PCI_COMMAND_IO || !default_vga) { default_vga=p; default_vga_cmd=cmd; @@ -337,7 +337,7 @@ setup_hw(void) /* Disable the enabled VGA device, if any. */ if (default_vga) - pci_write_config_word(default_vga, PCI_COMMAND, + pci_bootloader_write_config_word(default_vga, PCI_COMMAND, default_vga_cmd& ~(PCI_COMMAND_IO|PCI_COMMAND_MEMORY)); init_v86(); @@ -348,19 +348,19 @@ setup_hw(void) ((p->class) >> 16 != PCI_BASE_CLASS_DISPLAY)) continue; if (p->bus->number != 0) continue; - pci_read_config_word(p, PCI_COMMAND, &cmd); - pci_write_config_word(p, PCI_COMMAND, + pci_bootloader_read_config_word(p, PCI_COMMAND, &cmd); + pci_bootloader_write_config_word(p, PCI_COMMAND, cmd|PCI_COMMAND_IO|PCI_COMMAND_MEMORY); printk("Calling the emulator.\n"); em86_main(p); - pci_write_config_word(p, PCI_COMMAND, cmd); + pci_bootloader_write_config_word(p, PCI_COMMAND, cmd); } cleanup_v86_mess(); #endif /* Reenable the primary VGA device */ if (default_vga) { - pci_write_config_word(default_vga, PCI_COMMAND, + pci_bootloader_write_config_word(default_vga, PCI_COMMAND, default_vga_cmd| (PCI_COMMAND_IO|PCI_COMMAND_MEMORY)); if (err) { @@ -524,12 +524,12 @@ find_max_mem( struct pci_dev *dev ) (dev->device == PCI_DEVICE_ID_MOTOROLA_MPC105)) || ((dev->vendor == PCI_VENDOR_ID_IBM) && (dev->device == 0x0037/*IBM 660 Bridge*/)) ) { - pci_read_config_byte(dev, 0xa0, &banks); + pci_bootloader_read_config_byte(dev, 0xa0, &banks); for (i = 0; i < 8; i++) { if ( banks & (1<<i) ) { - pci_read_config_byte(dev, 0x90+i, &tmp); + pci_bootloader_read_config_byte(dev, 0x90+i, &tmp); top = tmp; - pci_read_config_byte(dev, 0x98+i, &tmp); + pci_bootloader_read_config_byte(dev, 0x98+i, &tmp); top |= (tmp&3)<<8; if ( top > max ) max = top; } |