We define IO_APIC_ADDR in <arch/ioapic.h>, let's use it.

[coreboot.git] / src / northbridge / via / cx700 / cx700_lpc.c

diff --git a/src/northbridge/via/cx700/cx700_lpc.c b/src/northbridge/via/cx700/cx700_lpc.c
index 115d66c235d290089139666cde58b257d7cc8386..77ab97c145d52dd0394144bb47dd8c6fe0cadfa4 100644 (file)
--- a/src/northbridge/via/cx700/cx700_lpc.c
+++ b/src/northbridge/via/cx700/cx700_lpc.c
@@ -19,17 +19,14 @@
 
 #include <arch/io.h>
 #include <console/console.h>
-
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
 #include <device/pci_ids.h>
-
 #include <pc80/mc146818rtc.h>
 #include <pc80/i8259.h>
 #include <pc80/keyboard.h>
 #include <pc80/isa-dma.h>
-
 #include <cpu/x86/lapic.h>
 #include <arch/ioapic.h>
 #include <stdlib.h>
@@ -56,7 +53,7 @@ static unsigned char *pin_to_irq(const unsigned char *pin)
 
 static void pci_routing_fixup(struct device *dev)
 {
-       printk_debug("%s: device is %p\n", __FUNCTION__, dev);
+       printk(BIOS_DEBUG, "%s: device is %p\n", __FUNCTION__, dev);
 
        /* set up PCI IRQ routing */
        pci_write_config8(dev, 0x55, pci_irqs[0] << 4);
@@ -64,17 +61,17 @@ static void pci_routing_fixup(struct device *dev)
        pci_write_config8(dev, 0x57, pci_irqs[3] << 4);
 
        /* Assigning IRQs */
-       printk_debug("Setting up USB interrupts.\n");
+       printk(BIOS_DEBUG, "Setting up USB interrupts.\n");
        pci_assign_irqs(0, 0x10, pin_to_irq(usb_pins));
 
-       printk_debug("Setting up VGA interrupts.\n");
+       printk(BIOS_DEBUG, "Setting up VGA interrupts.\n");
        pci_assign_irqs(1, 0x00, pin_to_irq(vga_pins));
 
-       printk_debug("Setting up PCI slot interrupts.\n");
+       printk(BIOS_DEBUG, "Setting up PCI slot interrupts.\n");
        pci_assign_irqs(2, 0x04, pin_to_irq(slot_pins));
        // more?
 
-       printk_debug("Setting up AC97 interrupts.\n");
+       printk(BIOS_DEBUG, "Setting up AC97 interrupts.\n");
        pci_assign_irqs(0x80, 0x1, pin_to_irq(ac97_pins));
 }
 
@@ -84,7 +81,7 @@ static void pci_routing_fixup(struct device *dev)
  * can't figure out how to do !!!!
  */
 
-void setup_pm(device_t dev)
+static void setup_pm(device_t dev)
 {
        /* Debounce LID and PWRBTN# Inputs for 16ms. */
        pci_write_config8(dev, 0x80, 0x20);
@@ -169,7 +166,7 @@ static void cx700_set_lpc_registers(struct device *dev)
 {
        unsigned char enables;
 
-       printk_debug("VIA CX700 LPC bridge init\n");
+       printk(BIOS_DEBUG, "VIA CX700 LPC bridge init\n");
 
        // enable the internal I/O decode
        enables = pci_read_config8(dev, 0x6C);
@@ -236,7 +233,7 @@ static void cx700_set_lpc_registers(struct device *dev)
 
 }
 
-void cx700_read_resources(device_t dev)
+static void cx700_read_resources(device_t dev)
 {
        struct resource *res;
 
@@ -253,12 +250,12 @@ void cx700_read_resources(device_t dev)
        res->flags = IORESOURCE_IO | IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
 
        res = new_resource(dev, 3); /* IOAPIC */
-       res->base = 0xfec00000;
+       res->base = IO_APIC_ADDR;
        res->size = 0x00001000;
        res->flags = IORESOURCE_MEM | IORESOURCE_ASSIGNED | IORESOURCE_FIXED;
 }
 
-void cx700_set_resources(device_t dev)
+static void cx700_set_resources(device_t dev)
 {
        struct resource *resource;
        resource = find_resource(dev, 1);
@@ -266,11 +263,10 @@ void cx700_set_resources(device_t dev)
        pci_dev_set_resources(dev);
 }
 
-void cx700_enable_resources(device_t dev)
+static void cx700_enable_resources(device_t dev)
 {
        /* Enable SuperIO decoding */
        pci_dev_enable_resources(dev);
-       enable_childrens_resources(dev);
 }
 
 static void cx700_lpc_init(struct device *dev)
@@ -294,7 +290,7 @@ static void cx700_lpc_init(struct device *dev)
        isa_dma_init();
 
        /* Initialize keyboard controller */
-       init_pc_keyboard(0x60, 0x64, 0);
+       pc_keyboard_init(0);
 }
 
 static struct device_operations cx700_lpc_ops = {