diff options
| -rw-r--r-- | sys/arch/powerpc/isa/isa_machdep.h | 24 | ||||
| -rw-r--r-- | sys/arch/powerpc/isa/isabus.c | 28 |
2 files changed, 19 insertions, 33 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 */ /* diff --git a/sys/arch/powerpc/isa/isabus.c b/sys/arch/powerpc/isa/isabus.c index 0675a99ab90..67655a3875b 100644 --- a/sys/arch/powerpc/isa/isabus.c +++ b/sys/arch/powerpc/isa/isabus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: isabus.c,v 1.12 1999/06/15 02:40:05 rahnds Exp $ */ +/* $OpenBSD: isabus.c,v 1.13 1999/11/09 04:51:35 rahnds Exp $ */ /*- * Copyright (c) 1995 Per Fogelstrom @@ -116,7 +116,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. struct isabr_softc { struct device sc_dv; - struct p4e_isa_bus p4e_isa_cs; + struct ppc_isa_bus ppc_isa_cs; struct bushook sc_bus; }; @@ -137,14 +137,14 @@ void *isabr_intr_establish __P((isa_chipset_tag_t, int, int, int, void isabr_intr_disestablish __P((isa_chipset_tag_t, void*)); void isabr_iointr __P((unsigned int, struct clockframe *)); void isabr_initicu __P((void)); -void intr_calculatemasks __P((void)); +static void intr_calculatemasks __P((void)); -struct p4e_bus_space p4e_isa_io = { - MPC106_V_ISA_IO_SPACE, 1 +struct ppc_bus_space ppc_isa_io = { + MPC106_P_ISA_IO_SPACE, 1 }; -struct p4e_bus_space p4e_isa_mem = { - MPC106_V_PCI_MEM_SPACE, 1 +struct ppc_bus_space ppc_isa_mem = { + MPC106_P_PCI_MEM_SPACE, 1 }; int @@ -202,8 +202,8 @@ isabrattach(parent, self, aux) sc->sc_bus.bh_dv = (struct device *)sc; sc->sc_bus.bh_type = BUS_ISABR; - sc->p4e_isa_cs.ic_intr_establish = isabr_intr_establish; - sc->p4e_isa_cs.ic_intr_disestablish = isabr_intr_disestablish; + sc->ppc_isa_cs.ic_intr_establish = isabr_intr_establish; + sc->ppc_isa_cs.ic_intr_disestablish = isabr_intr_disestablish; { int i; @@ -215,9 +215,9 @@ isabrattach(parent, self, aux) } iba.iba_busname = "isa"; - iba.iba_iot = (bus_space_tag_t)&p4e_isa_io; - iba.iba_memt = (bus_space_tag_t)&p4e_isa_mem; - iba.iba_ic = &sc->p4e_isa_cs; + iba.iba_iot = (bus_space_tag_t)&ppc_isa_io; + iba.iba_memt = (bus_space_tag_t)&ppc_isa_mem; + iba.iba_ic = &sc->ppc_isa_cs; config_found(self, &iba, isabrprint); } @@ -231,7 +231,7 @@ isabrprint(aux, pnp) if (pnp) printf("%s at %s", ca->ca_name, pnp); printf(" isa_io_base 0x%lx isa_mem_base 0x%lx", - p4e_isa_io.bus_base, p4e_isa_mem.bus_base); + ppc_isa_io.bus_base, ppc_isa_mem.bus_base); return (UNCONF); } @@ -274,7 +274,7 @@ isa_setirqstat(int irq, int enabled, int type) * would be faster, but the code would be nastier, and we don't expect this to * happen very much anyway. */ -void +static void intr_calculatemasks() { int irq, level; |