diff options
| author | Li-Ta Lo <ollie@lanl.gov> | 2005-01-19 23:19:26 +0000 |
|---|---|---|
| committer | Li-Ta Lo <ollie@lanl.gov> | 2005-01-19 23:19:26 +0000 |
| commit | bec039cb93b72b068370662933d961b1cd4aeaea (patch) | |
| tree | fe17932d8215153fe84ea142072a2b956e2a5d0a /src/devices | |
| parent | af021575308fffc104a7add2ba8183cef079876c (diff) | |
| download | coreboot-bec039cb93b72b068370662933d961b1cd4aeaea.tar.xz | |
minor reformat
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1892 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/devices')
| -rw-r--r-- | src/devices/emulator/biosemu.c | 9 | ||||
| -rw-r--r-- | src/devices/pci_device.c | 3 | ||||
| -rw-r--r-- | src/devices/pci_rom.c | 18 |
3 files changed, 13 insertions, 17 deletions
diff --git a/src/devices/emulator/biosemu.c b/src/devices/emulator/biosemu.c index c1f48a28b9..59785fb229 100644 --- a/src/devices/emulator/biosemu.c +++ b/src/devices/emulator/biosemu.c @@ -46,9 +46,6 @@ int run_bios_int(int num) X86_CS = MEM_RW((num << 2) + 2); X86_IP = MEM_RW(num << 2); - //printk_debug("%s: INT %x CS:IP = %x:%x\n", __FUNCTION__, - // num, MEM_RW((num << 2) + 2), MEM_RW(num << 2)); - return 1; } @@ -116,7 +113,7 @@ void do_int(int num) { int ret = 0; - //printk_debug("int%x vector at %x\n", num, getIntVect(num)); + printk_debug("int%x vector at %x\n", num, getIntVect(num)); switch (num) { #ifndef _PC @@ -156,10 +153,6 @@ void do_int(int num) if (!ret) ret = run_bios_int(num); - if (!ret) { - printk_debug("\nint%x: not implemented\n", num); - x86emu_dump_xregs(); - } } #define SYS_BIOS 0xf0000 /* diff --git a/src/devices/pci_device.c b/src/devices/pci_device.c index 4aef2229b3..0ad4e55915 100644 --- a/src/devices/pci_device.c +++ b/src/devices/pci_device.c @@ -218,7 +218,8 @@ static void pci_get_rom_resource(struct device *dev, unsigned long index) unsigned long value; resource_t moving, limit; - if ((dev->on_mainboard) && (dev->rom_address == 0)) { //skip it if rom_address is not set in MB Config.lb + if ((dev->on_mainboard) && (dev->rom_address == 0)) { + //skip it if rom_address is not set in MB Config.lb return; } diff --git a/src/devices/pci_rom.c b/src/devices/pci_rom.c index 3639af7177..557553ab5a 100644 --- a/src/devices/pci_rom.c +++ b/src/devices/pci_rom.c @@ -13,18 +13,19 @@ struct rom_header * pci_rom_probe(struct device *dev) rom_address = pci_read_config32(dev, PCI_ROM_ADDRESS); if (rom_address == 0x00000000 || rom_address == 0xffffffff) { - if(dev->on_mainboard && (dev->rom_address!=0) ) { // in case some device PCI_ROM_ADDRESS can not be set + if (dev->on_mainboard && (dev->rom_address!=0) ) { + // in case some device PCI_ROM_ADDRESS can not be set rom_address = dev->rom_address; - } - else + } else { return NULL; + } } - printk_debug("rom address for %s = %x\n", - dev_path(dev), rom_address); + printk_debug("rom address for %s = %x\n", dev_path(dev), rom_address); /* enable expansion ROM address decoding */ - pci_write_config32(dev, PCI_ROM_ADDRESS, rom_address|PCI_ROM_ADDRESS_ENABLE); + pci_write_config32(dev, PCI_ROM_ADDRESS, + rom_address|PCI_ROM_ADDRESS_ENABLE); rom_header = rom_address; printk_spew("PCI Expansion ROM, signature 0x%04x, \n\t" @@ -38,10 +39,11 @@ struct rom_header * pci_rom_probe(struct device *dev) } rom_data = (unsigned char *) rom_header + le32_to_cpu(rom_header->data); - printk_spew("PCI ROM Image, Vendor %04x, Device %04x,\n", + printk_spew("PCI ROM Image, Vendor %04x, Device %04x,\n", rom_data->vendor, rom_data->device); if (dev->vendor != rom_data->vendor || dev->device != rom_data->device) { - printk_err("Device or Vendor ID mismatch Vendor %04x, Device %04x\n", rom_data->vendor, rom_data->device); + printk_err("Device or Vendor ID mismatch Vendor %04x, Device %04x\n", + rom_data->vendor, rom_data->device); return NULL; } |