From d29883b254f7a8b1b5b751f0d467645a6c461fe0 Mon Sep 17 00:00:00 2001 From: peter Date: Mon, 17 Nov 2003 06:10:15 +0000 Subject: Widen the enable/disable helper function's argument in line with the ithread_create() changes etc. This should be mostly a NOP. --- sys/alpha/alpha/interrupt.c | 6 +++--- sys/alpha/include/intr.h | 7 ++++--- sys/alpha/isa/isa.c | 7 ++++--- sys/alpha/mcbus/mcpcia.c | 16 ++++++++-------- sys/alpha/pci/apecs.c | 4 ++-- sys/alpha/pci/cia.c | 4 ++-- sys/alpha/pci/t2.c | 4 ++-- sys/alpha/pci/tsunami.c | 4 ++-- 8 files changed, 27 insertions(+), 25 deletions(-) (limited to 'sys/alpha') diff --git a/sys/alpha/alpha/interrupt.c b/sys/alpha/alpha/interrupt.c index 75f59c8..4bce4cd 100644 --- a/sys/alpha/alpha/interrupt.c +++ b/sys/alpha/alpha/interrupt.c @@ -327,7 +327,7 @@ LIST_HEAD(alpha_intr_list, alpha_intr); struct alpha_intr { LIST_ENTRY(alpha_intr) list; /* chain handlers in this hash bucket */ - int vector; /* vector to match */ + uintptr_t vector; /* vector to match */ struct ithd *ithd; /* interrupt thread */ volatile long *cntp; /* interrupt counter */ }; @@ -346,9 +346,9 @@ ithds_init(void *dummy) SYSINIT(ithds_init, SI_SUB_INTR, SI_ORDER_SECOND, ithds_init, NULL); int -alpha_setup_intr(const char *name, int vector, driver_intr_t handler, void *arg, +alpha_setup_intr(const char *name, uintptr_t vector, driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep, volatile long *cntp, - void (*disable)(int), void (*enable)(int)) + void (*disable)(uintptr_t), void (*enable)(uintptr_t)) { int h = HASHVEC(vector); struct alpha_intr *i; diff --git a/sys/alpha/include/intr.h b/sys/alpha/include/intr.h index ea71e3f..90a0bbf 100644 --- a/sys/alpha/include/intr.h +++ b/sys/alpha/include/intr.h @@ -31,9 +31,10 @@ extern struct mtx icu_lock; -int alpha_setup_intr(const char *name, int vector, driver_intr_t handler, - void *arg, enum intr_type flags, void **cookiep, - volatile long *cntp, void (*disable)(int), void (*enable)(int)); +int alpha_setup_intr(const char *name, uintptr_t vector, + driver_intr_t handler, void *arg, enum intr_type flags, + void **cookiep, volatile long *cntp, + void (*disable)(uintptr_t), void (*enable)(uintptr_t)); int alpha_teardown_intr(void *cookie); void alpha_dispatch_intr(void *frame, unsigned long vector); diff --git a/sys/alpha/isa/isa.c b/sys/alpha/isa/isa.c index aa37264..f2054e7 100644 --- a/sys/alpha/isa/isa.c +++ b/sys/alpha/isa/isa.c @@ -310,10 +310,11 @@ isa_handle_intr(void *arg) */ static void -isa_disable_intr(int vector) +isa_disable_intr(uintptr_t vector) { - int irq = (vector - 0x800) >> 4; + int irq; + irq = (vector - 0x800) >> 4; mtx_lock_spin(&icu_lock); if (irq > 7) outb(IO_ICU2, 0x20 | (irq & 7)); @@ -324,7 +325,7 @@ isa_disable_intr(int vector) } static void -isa_enable_intr(int vector) +isa_enable_intr(uintptr_t vector) { int irq; diff --git a/sys/alpha/mcbus/mcpcia.c b/sys/alpha/mcbus/mcpcia.c index 442a47b..c1010e4 100644 --- a/sys/alpha/mcbus/mcpcia.c +++ b/sys/alpha/mcbus/mcpcia.c @@ -304,13 +304,13 @@ mcpcia_disable_intr(struct mcpcia_softc *sc, int irq) } static void -mcpcia_disable_intr_vec(int vector) +mcpcia_disable_intr_vec(uintptr_t vector) { int mid, irq; struct mcpcia_softc *sc = mcpcia_root; if (vector < MCPCIA_VEC_PCI) { - printf("EISA disable (0x%x)\n", vector); + printf("EISA disable (0x%lx)\n", vector); return; } @@ -324,7 +324,7 @@ mcpcia_disable_intr_vec(int vector) tmp &= (MCPCIA_VECWIDTH_PER_MCPCIA - 1); slot = tmp / MCPCIA_VECWIDTH_PER_SLOT; if (slot < 2 || slot > 5) { - printf("Bad slot (%d) for vector %x\n", slot, vector); + printf("Bad slot (%d) for vector %lx\n", slot, vector); return; } tmp -= (2 * MCPCIA_VECWIDTH_PER_SLOT); @@ -338,7 +338,7 @@ mcpcia_disable_intr_vec(int vector) sc = sc->next; } if (sc == NULL) { - panic("couldn't find MCPCIA softc for vector 0x%x", vector); + panic("couldn't find MCPCIA softc for vector 0x%lx", vector); } mtx_lock_spin(&icu_lock); mcpcia_disable_intr(sc, irq); @@ -346,13 +346,13 @@ mcpcia_disable_intr_vec(int vector) } static void -mcpcia_enable_intr_vec(int vector) +mcpcia_enable_intr_vec(uintptr_t vector) { int mid, irq; struct mcpcia_softc *sc = mcpcia_root; if (vector < MCPCIA_VEC_PCI) { - printf("EISA ensable (0x%x)\n", vector); + printf("EISA ensable (0x%lx)\n", vector); return; } @@ -366,7 +366,7 @@ mcpcia_enable_intr_vec(int vector) tmp &= (MCPCIA_VECWIDTH_PER_MCPCIA - 1); slot = tmp / MCPCIA_VECWIDTH_PER_SLOT; if (slot < 2 || slot > 5) { - printf("Bad slot (%d) for vector %x\n", slot, vector); + printf("Bad slot (%d) for vector %lx\n", slot, vector); return; } tmp -= (2 * MCPCIA_VECWIDTH_PER_SLOT); @@ -380,7 +380,7 @@ mcpcia_enable_intr_vec(int vector) sc = sc->next; } if (sc == NULL) { - panic("couldn't find MCPCIA softc for vector 0x%x", vector); + panic("couldn't find MCPCIA softc for vector 0x%lx", vector); } mtx_lock_spin(&icu_lock); mcpcia_enable_intr(sc, irq); diff --git a/sys/alpha/pci/apecs.c b/sys/alpha/pci/apecs.c index a94ac84..cd9da04 100644 --- a/sys/alpha/pci/apecs.c +++ b/sys/alpha/pci/apecs.c @@ -308,7 +308,7 @@ apecs_attach(device_t dev) } static void -apecs_disable_intr(int vector) +apecs_disable_intr(uintptr_t vector) { int irq; @@ -319,7 +319,7 @@ apecs_disable_intr(int vector) } static void -apecs_enable_intr(int vector) +apecs_enable_intr(uintptr_t vector) { int irq; diff --git a/sys/alpha/pci/cia.c b/sys/alpha/pci/cia.c index 962ac65..6e6c7fe 100644 --- a/sys/alpha/pci/cia.c +++ b/sys/alpha/pci/cia.c @@ -515,7 +515,7 @@ cia_attach(device_t dev) } static void -cia_disable_intr(int vector) +cia_disable_intr(uintptr_t vector) { int irq; @@ -526,7 +526,7 @@ cia_disable_intr(int vector) } static void -cia_enable_intr(int vector) +cia_enable_intr(uintptr_t vector) { int irq; diff --git a/sys/alpha/pci/t2.c b/sys/alpha/pci/t2.c index 72cf4b2..bc561f2 100644 --- a/sys/alpha/pci/t2.c +++ b/sys/alpha/pci/t2.c @@ -457,7 +457,7 @@ t2_eoi( int vector) } static void -t2_enable_vec(int vector) +t2_enable_vec(uintptr_t vector) { int irq, hose; u_long IC_mask, scratch; @@ -491,7 +491,7 @@ t2_enable_vec(int vector) } static void -t2_disable_vec(int vector) +t2_disable_vec(uintptr_t vector) { int hose, irq; u_long scratch, IC_mask; diff --git a/sys/alpha/pci/tsunami.c b/sys/alpha/pci/tsunami.c index 12db80e..9efc44c 100644 --- a/sys/alpha/pci/tsunami.c +++ b/sys/alpha/pci/tsunami.c @@ -308,7 +308,7 @@ tsunami_attach(device_t dev) } static void -tsunami_disable_intr_vec(int vector) +tsunami_disable_intr_vec(uintptr_t vector) { int irq; @@ -319,7 +319,7 @@ tsunami_disable_intr_vec(int vector) } static void -tsunami_enable_intr_vec(int vector) +tsunami_enable_intr_vec(uintptr_t vector) { int irq; -- cgit v1.1