diff options
Diffstat (limited to 'sys/arch/powerpc/isa/isa_machdep.h')
| -rw-r--r-- | sys/arch/powerpc/isa/isa_machdep.h | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/sys/arch/powerpc/isa/isa_machdep.h b/sys/arch/powerpc/isa/isa_machdep.h index dd1d1d95436..984933181b3 100644 --- a/sys/arch/powerpc/isa/isa_machdep.h +++ b/sys/arch/powerpc/isa/isa_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: isa_machdep.h,v 1.5 1998/09/20 22:11:47 rahnds Exp $ */ +/* $OpenBSD: isa_machdep.h,v 1.6 1999/11/09 04:51:35 rahnds Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -34,7 +34,7 @@ #ifndef _ISA_MACHDEP_H_ #define _ISA_MACHDEP_H_ -typedef struct p4e_isa_bus *isa_chipset_tag_t; +typedef struct ppc_isa_bus *isa_chipset_tag_t; /* * I/O macros to access isa bus ports/memory. @@ -42,10 +42,10 @@ typedef struct p4e_isa_bus *isa_chipset_tag_t; * However, the cpu executes an instruction every <10 ns * so the bus is much slower so it doesn't matter, really. */ -#define isa_outb(x,y) outb(p4e_isa_io.bus_base + (x), y) -#define isa_inb(x) inb(p4e_isa_io.bus_base + (x)) +#define isa_outb(x,y) outb(ppc_isa_io.bus_base + (x), y) +#define isa_inb(x) inb(ppc_isa_io.bus_base + (x)) -struct p4e_isa_bus { +struct ppc_isa_bus { void *ic_data; void (*ic_attach_hook) __P((struct device *, struct device *, @@ -68,20 +68,6 @@ struct p4e_isa_bus { #define __NO_ISA_INTR_CHECK /* FIXME */ -/* - * Interrupt control struct used to control the ICU setup. - */ - -struct intrhand { - struct intrhand *ih_next; - int (*ih_fun) __P((void *)); - void *ih_arg; - u_long ih_count; - int ih_level; - int ih_irq; - char *ih_what; -}; - #define ICU_LEN 16 /* Number of possible interrupt sources */ /* |