From 86cbd33837207e06a9ae41efe65ac2401e885c4b Mon Sep 17 00:00:00 2001
From: "Ronald G. Minnich" <Ronald G. Minnich>
Date: Mon, 21 Nov 2005 23:22:21 +0000
Subject: 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
---
 src/cpu/amd/sc520/sc520.c      | 4 +++-
 src/devices/emulator/biosemu.c | 1 -
 src/devices/pci_rom.c          | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/cpu/amd/sc520/sc520.c b/src/cpu/amd/sc520/sc520.c
index 1199ec4b50..f535662797 100644
--- a/src/cpu/amd/sc520/sc520.c
+++ b/src/cpu/amd/sc520/sc520.c
@@ -187,7 +187,8 @@ static unsigned int pci_domain_scan_bus(device_t dev, unsigned int max)
 }
 
 
-static void enable_resources(device_t dev) {
+#if 0
+void sc520_enable_resources(device_t dev) {
 
 	printk_spew("%s\n", __FUNCTION__);
 	printk_spew("THIS IS FOR THE SC520 =============================\n");
@@ -204,6 +205,7 @@ static void enable_resources(device_t dev) {
 	enable_childrens_resources(dev);
 	printk_spew("%s\n", __FUNCTION__);
 }
+#endif
 
 static struct device_operations pci_domain_ops = {
         .read_resources   = pci_domain_read_resources,
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
 
-- 
cgit v1.2.3