Commit 3c3403c5 authored by Roman Zippel's avatar Roman Zippel Committed by Linus Torvalds

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

- small compile fixes
- id update
- add asm-ppc/zorro.h
parent 592ca1fe
...@@ -124,13 +124,13 @@ static struct resource __init *zorro_find_parent_resource(struct zorro_dev *z) ...@@ -124,13 +124,13 @@ static struct resource __init *zorro_find_parent_resource(struct zorro_dev *z)
* Initialization * Initialization
*/ */
void __init zorro_init(void) static int __init zorro_init(void)
{ {
struct zorro_dev *dev; struct zorro_dev *dev;
u_int i; u_int i;
if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(ZORRO)) if (!MACH_IS_AMIGA || !AMIGAHW_PRESENT(ZORRO))
return; return 0;
printk("Zorro: Probing AutoConfig expansion devices: %d device%s\n", printk("Zorro: Probing AutoConfig expansion devices: %d device%s\n",
zorro_num_autocon, zorro_num_autocon == 1 ? "" : "s"); zorro_num_autocon, zorro_num_autocon == 1 ? "" : "s");
...@@ -168,6 +168,8 @@ void __init zorro_init(void) ...@@ -168,6 +168,8 @@ void __init zorro_init(void)
if (m68k_memory[i].addr < 16*1024*1024) if (m68k_memory[i].addr < 16*1024*1024)
mark_region(m68k_memory[i].addr, mark_region(m68k_memory[i].addr,
m68k_memory[i].addr+m68k_memory[i].size, 0); m68k_memory[i].addr+m68k_memory[i].size, 0);
return 0;
} }
subsys_initcall(zorro_init); subsys_initcall(zorro_init);
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Maintained by Geert Uytterhoeven <zorro@linux-m68k.org> # Maintained by Geert Uytterhoeven <zorro@linux-m68k.org>
# If you have any new entries, please send them to the maintainer. # 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. # Manufacturers and Products. Please keep sorted.
...@@ -229,6 +229,7 @@ ...@@ -229,6 +229,7 @@
0a00 Impact Series II [RAM Expansion] 0a00 Impact Series II [RAM Expansion]
081e Interworks Network 081e Interworks Network
0820 Hardital Synthesis 0820 Hardital Synthesis
0100 Super Big Bang [Accelerator, SCSI Host Adapter and RAM Expansion]
1400 TQM 68030+68882 [Accelerator] 1400 TQM 68030+68882 [Accelerator]
0828 Applied Engineering 0828 Applied Engineering
1000 DL2000 [Modem] 1000 DL2000 [Modem]
...@@ -383,7 +384,7 @@ ...@@ -383,7 +384,7 @@
ff00 Pixel64 RAM [Graphics Card] ff00 Pixel64 RAM [Graphics Card]
1212 Individual Computers 1212 Individual Computers
0000 Buddha [IDE Interface] 0000 Buddha [IDE Interface]
1700 X-Surf [Ethernet Card] 1700 X-Surf [Ethernet Card and IDE Interface]
2a00 Catweasel [IDE Interface and Floppy Controller] 2a00 Catweasel [IDE Interface and Floppy Controller]
1248 Kupke 1248 Kupke
0100 Golem HD 3000 [HD Controller] 0100 Golem HD 3000 [HD Controller]
......
#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 */
...@@ -155,6 +155,8 @@ CD_sizeof = CD_Unused+(4*4) ...@@ -155,6 +155,8 @@ CD_sizeof = CD_Unused+(4*4)
#include <linux/init.h> #include <linux/init.h>
#include <linux/ioport.h> #include <linux/ioport.h>
#include <asm/zorro.h>
struct zorro_dev { struct zorro_dev {
struct ExpansionRom rom; struct ExpansionRom rom;
zorro_id id; zorro_id id;
...@@ -172,7 +174,6 @@ extern struct zorro_dev zorro_autocon[ZORRO_NUM_AUTO]; ...@@ -172,7 +174,6 @@ extern struct zorro_dev zorro_autocon[ZORRO_NUM_AUTO];
* Zorro Functions * Zorro Functions
*/ */
extern void zorro_init(void);
extern void zorro_name_device(struct zorro_dev *dev); extern void zorro_name_device(struct zorro_dev *dev);
extern struct zorro_dev *zorro_find_device(zorro_id id, extern struct zorro_dev *zorro_find_device(zorro_id id,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment