[PATCH] use the mach resources we added before

Now hw resources can be per mach- and we dont need a pile of ugly
ifdefs for weird shite

diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index 968a71ec009ec336d572738daf812222dd6d8f14..28b6d62a29db8d722fa5b773afdcf4b312782d82 100644 (file)
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -44,6 +44,7 @@
 #include <asm/setup.h>
 #include <asm/arch_hooks.h>
 #include "setup_arch_pre.h"
+#include "mach_resources.h"
 
 int disable_pse __initdata = 0;
 
@@ -53,7 +54,6 @@ static inline char * __init machine_specific_memory_setup(void);
  * Machine setup..
  */
 
-char ignore_irq13;             /* set if exception 16 works */
 /* cpu data as detected by the assembly code in head.S */
 struct cpuinfo_x86 new_cpu_data __initdata = { 0, 0, 0, 0, -1, 1, 0, 0, -1 };
 /* common cpu data for all cpus */
@@ -106,97 +106,20 @@ unsigned long saved_videomode;
 static char command_line[COMMAND_LINE_SIZE];
        char saved_command_line[COMMAND_LINE_SIZE];
 
-struct resource standard_io_resources[] = {
-       { "dma1", 0x00, 0x1f, IORESOURCE_BUSY },
-       { "pic1", 0x20, 0x3f, IORESOURCE_BUSY },
-       { "timer", 0x40, 0x5f, IORESOURCE_BUSY },
-       { "keyboard", 0x60, 0x6f, IORESOURCE_BUSY },
-       { "dma page reg", 0x80, 0x8f, IORESOURCE_BUSY },
-       { "pic2", 0xa0, 0xbf, IORESOURCE_BUSY },
-       { "dma2", 0xc0, 0xdf, IORESOURCE_BUSY },
-       { "fpu", 0xf0, 0xff, IORESOURCE_BUSY }
-};
-#ifdef CONFIG_MELAN
-standard_io_resources[1] = { "pic1", 0x20, 0x21, IORESOURCE_BUSY };
-standard_io_resources[5] = { "pic2", 0xa0, 0xa1, IORESOURCE_BUSY };
-#endif
-
-#define STANDARD_IO_RESOURCES (sizeof(standard_io_resources)/sizeof(struct resource))
-
 static struct resource code_resource = { "Kernel code", 0x100000, 0 };
 static struct resource data_resource = { "Kernel data", 0, 0 };
-static struct resource vram_resource = { "Video RAM area", 0xa0000, 0xbffff, IORESOURCE_BUSY };
-
-/* System ROM resources */
-#define MAXROMS 6
-static struct resource rom_resources[MAXROMS] = {
-       { "System ROM", 0xF0000, 0xFFFFF, IORESOURCE_BUSY },
-       { "Video ROM", 0xc0000, 0xc7fff, IORESOURCE_BUSY }
-};
-
-#define romsignature(x) (*(unsigned short *)(x) == 0xaa55)
 
 static void __init probe_roms(void)
 {
        int roms = 1;
-       unsigned long base;
-       unsigned char *romstart;
 
        request_resource(&iomem_resource, rom_resources+0);
 
        /* Video ROM is standard at C000:0000 - C7FF:0000, check signature */
-       for (base = 0xC0000; base < 0xE0000; base += 2048) {
-               romstart = isa_bus_to_virt(base);
-               if (!romsignature(romstart))
-                       continue;
-               request_resource(&iomem_resource, rom_resources + roms);
-               roms++;
-               break;
-       }
-
-       /* Extension roms at C800:0000 - DFFF:0000 */
-       for (base = 0xC8000; base < 0xE0000; base += 2048) {
-               unsigned long length;
+       probe_video_rom(roms);
 
-               romstart = isa_bus_to_virt(base);
-               if (!romsignature(romstart))
-                       continue;
-               length = romstart[2] * 512;
-               if (length) {
-                       unsigned int i;
-                       unsigned char chksum;
-
-                       chksum = 0;
-                       for (i = 0; i < length; i++)
-                               chksum += romstart[i];
-
-                       /* Good checksum? */
-                       if (!chksum) {
-                               rom_resources[roms].start = base;
-                               rom_resources[roms].end = base + length - 1;
-                               rom_resources[roms].name = "Extension ROM";
-                               rom_resources[roms].flags = IORESOURCE_BUSY;
-
-                               request_resource(&iomem_resource, rom_resources + roms);
-                               roms++;
-                               if (roms >= MAXROMS)
-                                       return;
-                       }
-               }
-       }
-
-       /* Final check for motherboard extension rom at E000:0000 */
-       base = 0xE0000;
-       romstart = isa_bus_to_virt(base);
-
-       if (romsignature(romstart)) {
-               rom_resources[roms].start = base;
-               rom_resources[roms].end = base + 65535;
-               rom_resources[roms].name = "Extension ROM";
-               rom_resources[roms].flags = IORESOURCE_BUSY;
-
-               request_resource(&iomem_resource, rom_resources + roms);
-       }
+       /* Extension roms */
+       probe_extension_roms(roms);
 }
 
 static void __init limit_regions (unsigned long long size)
@@ -861,7 +784,8 @@ static void __init register_memory(unsigned long max_low_pfn)
                        request_resource(res, &data_resource);
                }
        }
-       request_resource(&iomem_resource, &vram_resource);
+
+       request_graphics_resource();
 
        /* request I/O space for devices used on all i[345]86 PCs */
        for (i = 0; i < STANDARD_IO_RESOURCES; i++)