[PATCH] m68k: zorro updates [20/20]

- small compile fixes
- id update
- add asm-ppc/zorro.h

diff --git a/drivers/zorro/zorro.c b/drivers/zorro/zorro.c
index 1c4d618aa77c3ff5fde089bd4c7b88c61ac46126..365eafb12aee6b53497a42549f1c3bbf134112d1 100644 (file)
--- a/drivers/zorro/zorro.c
+++ b/drivers/zorro/zorro.c
@@ -124,13 +124,13 @@ static struct resource __init *zorro_find_parent_resource(struct zorro_dev *z)
      *  Initialization
      */
 
-void __init zorro_init(void)
+static int __init zorro_init(void)
 {
     struct zorro_dev *dev;
     u_int i;
 
     if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(ZORRO))
-       return;
+       return 0;
 
     printk("Zorro: Probing AutoConfig expansion devices: %d device%s\n",
           zorro_num_autocon, zorro_num_autocon == 1 ? "" : "s");
@@ -168,6 +168,8 @@ void __init zorro_init(void)
        if (m68k_memory[i].addr < 16*1024*1024)
            mark_region(m68k_memory[i].addr,
                        m68k_memory[i].addr+m68k_memory[i].size, 0);
+
+    return 0;
 }
 
 subsys_initcall(zorro_init);

diff --git a/drivers/zorro/zorro.ids b/drivers/zorro/zorro.ids
index aec74bbba34eb5358ac4bd01dd76e2964b4073bf..92b0c9184a1f6280b60f77f7709ed09b4da8f6cc 100644 (file)
--- a/drivers/zorro/zorro.ids
+++ b/drivers/zorro/zorro.ids
@@ -4,7 +4,7 @@
 #      Maintained by Geert Uytterhoeven <zorro@linux-m68k.org>
 #      If you have any new entries, please send them to the maintainer.
 #
-#      $Id: zorro.ids,v 1.16 2000/09/28 18:45:47 geert Exp $
+#      $Id: zorro.ids,v 1.17 2001/10/25 08:21:39 geert Exp $
 #
 
 # Manufacturers and Products. Please keep sorted.
@@ -229,6 +229,7 @@
        0a00  Impact Series II [RAM Expansion]
 081e  Interworks Network
 0820  Hardital Synthesis
+       0100  Super Big Bang [Accelerator, SCSI Host Adapter and RAM Expansion]
        1400  TQM 68030+68882 [Accelerator]
 0828  Applied Engineering
        1000  DL2000 [Modem]
@@ -383,7 +384,7 @@
        ff00  Pixel64 RAM [Graphics Card]
 1212  Individual Computers
        0000  Buddha [IDE Interface]
-       1700  X-Surf [Ethernet Card]
+       1700  X-Surf [Ethernet Card and IDE Interface]
        2a00  Catweasel [IDE Interface and Floppy Controller]
 1248  Kupke
        0100  Golem HD 3000 [HD Controller]

diff --git a/include/asm-ppc/zorro.h b/include/asm-ppc/zorro.h
new file mode 100644 (file)
index 0000000..b3c75cd
--- /dev/null
+++ b/include/asm-ppc/zorro.h
@@ -0,0 +1,30 @@
+#ifndef _ASM_PPC_ZORRO_H
+#define _ASM_PPC_ZORRO_H
+
+#include <asm/io.h>
+
+#define z_readb in_8
+#define z_readw in_be16
+#define z_readl in_be32
+
+#define z_writeb(val, port) out_8((port), (val))
+#define z_writew(val, port) out_be16((port), (val))
+#define z_writel(val, port) out_be32((port), (val))
+
+#define z_memset_io(a,b,c)     memset((void *)(a),(b),(c))
+#define z_memcpy_fromio(a,b,c) memcpy((a),(void *)(b),(c))
+#define z_memcpy_toio(a,b,c)   memcpy((void *)(a),(b),(c))
+
+extern void *__ioremap(unsigned long address, unsigned long size,
+                      unsigned long flags);
+
+extern void *ioremap(unsigned long address, unsigned long size);
+extern void iounmap(void *addr);
+
+extern void *__ioremap(unsigned long address, unsigned long size,
+                       unsigned long flags);
+
+#define z_ioremap ioremap
+#define z_iounmap iounmap
+
+#endif /* _ASM_ZORRO_H */

diff --git a/include/linux/zorro.h b/include/linux/zorro.h
index ac27f4b832871b5642b61f9d61211544939d0d61..f2a191cc5b365631cf52db1da0ca9f3c38664cf2 100644 (file)
--- a/include/linux/zorro.h
+++ b/include/linux/zorro.h
@@ -155,6 +155,8 @@ CD_sizeof   = CD_Unused+(4*4)
 #include <linux/init.h>
 #include <linux/ioport.h>
 
+#include <asm/zorro.h>
+
 struct zorro_dev {
     struct ExpansionRom rom;
     zorro_id id;
@@ -172,7 +174,6 @@ extern struct zorro_dev zorro_autocon[ZORRO_NUM_AUTO];
      *  Zorro Functions
      */
 
-extern void zorro_init(void);
 extern void zorro_name_device(struct zorro_dev *dev);
 
 extern struct zorro_dev *zorro_find_device(zorro_id id,