Factor out a few commonly duplicated functions from northbridge.c.

[coreboot.git] / src / northbridge / via / vx800 / northbridge.c

diff --git a/src/northbridge/via/vx800/northbridge.c b/src/northbridge/via/vx800/northbridge.c
index 4dfe843bae562f146228cc8ef6231e805abfe2df..f3cfa418aa56642e305df56073b3cff06294cdf1 100644 (file)
--- a/src/northbridge/via/vx800/northbridge.c
+++ b/src/northbridge/via/vx800/northbridge.c
@@ -74,51 +74,9 @@ static const struct pci_driver memctrl_driver __pci_driver = {
        .device = PCI_DEVICE_ID_VIA_VX855_MEMCTRL,
 };
 
-static void ram_resource(device_t dev, unsigned long index,
-                        unsigned long basek, unsigned long sizek)
-{
-       struct resource *resource;
-
-       if (!sizek) {
-               return;
-       }
-       resource = new_resource(dev, index);
-       resource->base = ((resource_t) basek) << 10;
-       resource->size = ((resource_t) sizek) << 10;
-       resource->flags = IORESOURCE_MEM | IORESOURCE_CACHEABLE |
-           IORESOURCE_FIXED | IORESOURCE_STORED | IORESOURCE_ASSIGNED;
-}
-
-static void tolm_test(void *gp, struct device *dev, struct resource *new)
-{
-       struct resource **best_p = gp;
-       struct resource *best;
-       best = *best_p;
-       if (!best || (best->base > new->base)) {
-               best = new;
-       }
-       *best_p = best;
-}
-
-static u32 find_pci_tolm(struct bus *bus)
-{
-       print_debug("Entering find_pci_tolm\n");
-       struct resource *min;
-       u32 tolm;
-       min = 0;
-       search_bus_resources(bus, IORESOURCE_MEM, IORESOURCE_MEM,
-                            tolm_test, &min);
-       tolm = 0xffffffffUL;
-       if (min && tolm > min->base) {
-               tolm = min->base;
-       }
-       print_debug("Leaving find_pci_tolm\n");
-       return tolm;
-}
-
 static void pci_domain_set_resources(device_t dev)
 {
-       /* 
+       /*
         * the order is important to find the correct ram size.
         */
        u8 ramregs[] = { 0x43, 0x42, 0x41, 0x40 };
@@ -128,7 +86,7 @@ static void pci_domain_set_resources(device_t dev)
 
        printk(BIOS_SPEW, "Entering vx800 pci_domain_set_resources.\n");
 
-       pci_tolm = find_pci_tolm(&dev->link[0]);
+       pci_tolm = find_pci_tolm(dev->link_list);
        mc_dev = dev_find_device(PCI_VENDOR_ID_VIA,
                                 PCI_DEVICE_ID_VIA_VX855_MEMCTRL, 0);
 
@@ -175,20 +133,20 @@ if register with invalid value we set frame buffer size to 32M for default, but
                /* Leave a hole for vga, 0xa0000 - 0xc0000 */
                ram_resource(dev, idx++, 768, (tolmk - 768));
        }
-       assign_resources(&dev->link[0]);
+       assign_resources(dev->link_list);
 }
 
 static struct device_operations pci_domain_ops = {
        .read_resources = pci_domain_read_resources,
        .set_resources = pci_domain_set_resources,
-       .enable_resources = enable_childrens_resources,
-       .init = 0,
+       .enable_resources = NULL,
+       .init = NULL,
        .scan_bus = pci_domain_scan_bus,
 };
 
 static void cpu_bus_init(device_t dev)
 {
-       initialize_cpus(&dev->link[0]);
+       initialize_cpus(dev->link_list);
 }
 
 static void cpu_bus_noop(device_t dev)