diff options
| author | Ronald G. Minnich <Ronald G. Minnich> | 2005-11-21 23:22:21 +0000 |
|---|---|---|
| committer | Ronald G. Minnich <rminnich@gmail.com> | 2005-11-21 23:22:21 +0000 |
| commit | 86cbd33837207e06a9ae41efe65ac2401e885c4b (patch) | |
| tree | 74c8a26ef615076219186565dbbc6aa26a664931 /src/devices | |
| parent | 7272fcb2a466d2554b29e082c8e57038bfc4ebe6 (diff) | |
This was posted on issue tracker and approve by ron minnich
Signed-off-by: Ronald G. Minnich
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2089 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/devices')
| -rw-r--r-- | src/devices/emulator/biosemu.c | 1 | ||||
| -rw-r--r-- | src/devices/pci_rom.c | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/devices/emulator/biosemu.c b/src/devices/emulator/biosemu.c index b007ec41be..d6ad4e23a0 100644 --- a/src/devices/emulator/biosemu.c +++ b/src/devices/emulator/biosemu.c @@ -122,7 +122,6 @@ void do_int(int num) case 0x6D: if (getIntVect(num) == 0x0000) { printk_debug("un-inited int vector\n"); - return 1; } if (getIntVect(num) == 0xFF065) { //ret = int42_handler(); diff --git a/src/devices/pci_rom.c b/src/devices/pci_rom.c index ac2e413cc0..64a85bb700 100644 --- a/src/devices/pci_rom.c +++ b/src/devices/pci_rom.c @@ -27,7 +27,7 @@ struct rom_header * pci_rom_probe(struct device *dev) pci_write_config32(dev, PCI_ROM_ADDRESS, rom_address|PCI_ROM_ADDRESS_ENABLE); - rom_header = rom_address; + rom_header = (struct rom_header *) rom_address; printk_spew("PCI Expansion ROM, signature 0x%04x, \n\t" "INIT size 0x%04x, data ptr 0x%04x\n", le32_to_cpu(rom_header->signature), @@ -38,7 +38,7 @@ struct rom_header * pci_rom_probe(struct device *dev) return NULL; } - rom_data = (unsigned char *) rom_header + le32_to_cpu(rom_header->data); + rom_data = (struct pci_data *) ((unsigned char *) rom_header + le32_to_cpu(rom_header->data)); 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) { @@ -76,8 +76,8 @@ struct rom_header *pci_rom_load(struct device *dev, struct rom_header *rom_heade rom_address = pci_read_config32(dev, PCI_ROM_ADDRESS); do { - rom_header = (unsigned char *) rom_header + image_size; // get next image - rom_data = (unsigned char *) rom_header + le32_to_cpu(rom_header->data); + rom_header = (struct rom_header *) ((unsigned char *) rom_header + image_size); // get next image + rom_data = (struct pci_data *) ((unsigned char *) rom_header + le32_to_cpu(rom_header->data)); image_size = le32_to_cpu(rom_data->ilen) * 512; } while ((rom_data->type!=0) && (rom_data->indicator!=0)); // make sure we got x86 version |