summaryrefslogtreecommitdiff
path: root/src/drivers/generic
diff options
context:
space:
mode:
Diffstat (limited to 'src/drivers/generic')
-rw-r--r--src/drivers/generic/ioapic/chip.h2
-rw-r--r--src/drivers/generic/ioapic/ioapic.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/drivers/generic/ioapic/chip.h b/src/drivers/generic/ioapic/chip.h
index 665e926aea..e74c60c1a2 100644
--- a/src/drivers/generic/ioapic/chip.h
+++ b/src/drivers/generic/ioapic/chip.h
@@ -27,7 +27,7 @@ typedef struct drivers_generic_ioapic_config {
u8 irq_on_fsb;
u8 enable_virtual_wire;
u8 have_isa_interrupts;
- u32 base;
+ void *base;
} ioapic_config_t;
#endif
diff --git a/src/drivers/generic/ioapic/ioapic.c b/src/drivers/generic/ioapic/ioapic.c
index 463474a30d..44f1b02424 100644
--- a/src/drivers/generic/ioapic/ioapic.c
+++ b/src/drivers/generic/ioapic/ioapic.c
@@ -18,7 +18,7 @@ static void ioapic_init(struct device *dev)
u32 bsp_lapicid = lapicid();
u32 low, high;
u32 i, ioapic_interrupts;
- u32 ioapic_base;
+ void *ioapic_base;
u8 ioapic_id;
if (!dev->enabled || !config)
@@ -27,7 +27,7 @@ static void ioapic_init(struct device *dev)
ioapic_base = config->base;
ioapic_id = config->apicid;
- printk(BIOS_DEBUG, "IOAPIC: Initializing IOAPIC at 0x%08x\n",
+ printk(BIOS_DEBUG, "IOAPIC: Initializing IOAPIC at 0x%p\n",
ioapic_base);
printk(BIOS_DEBUG, "IOAPIC: Bootstrap Processor Local APIC = 0x%02x\n",
bsp_lapicid);
@@ -93,7 +93,7 @@ static void ioapic_read_resources(struct device *dev)
struct resource *res;
res = new_resource(dev, 0);
- res->base = config->base;
+ res->base = (resource_t)(uintptr_t)config->base;
res->size = 0x1000;
res->flags = IORESOURCE_MEM | IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
}