Date: Sun, 16 Nov 2003 16:48:58 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 42602 for review Message-ID: <200311170048.hAH0mwBD047851@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=42602 Change 42602 by peter@peter_overcee on 2003/11/16 16:48:06 update alpha for ithread_create changes Affected files ... .. //depot/projects/hammer/sys/alpha/alpha/interrupt.c#6 edit .. //depot/projects/hammer/sys/alpha/include/intr.h#2 edit .. //depot/projects/hammer/sys/alpha/isa/isa.c#5 edit .. //depot/projects/hammer/sys/alpha/mcbus/mcpcia.c#6 edit .. //depot/projects/hammer/sys/alpha/pci/apecs.c#4 edit .. //depot/projects/hammer/sys/alpha/pci/cia.c#4 edit .. //depot/projects/hammer/sys/alpha/pci/t2.c#4 edit .. //depot/projects/hammer/sys/alpha/pci/tsunami.c#4 edit .. //depot/projects/hammer/sys/alpha/tlsb/dwlpx.c#6 edit Differences ... ==== //depot/projects/hammer/sys/alpha/alpha/interrupt.c#6 (text+ko) ==== @@ -348,7 +348,7 @@ 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)) + void (*disable)(void *), void (*enable)(void *)) { int h = HASHVEC(vector); struct alpha_intr *i; ==== //depot/projects/hammer/sys/alpha/include/intr.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ 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)); + volatile long *cntp, void (*disable)(void *), void (*enable)(void *)); int alpha_teardown_intr(void *cookie); void alpha_dispatch_intr(void *frame, unsigned long vector); ==== //depot/projects/hammer/sys/alpha/isa/isa.c#5 (text+ko) ==== @@ -310,10 +310,12 @@ */ static void -isa_disable_intr(int vector) +isa_disable_intr(void *cookie) { - int irq = (vector - 0x800) >> 4; + int vector = (uintptr_t)cookie; + int irq; + irq = (vector - 0x800) >> 4; mtx_lock_spin(&icu_lock); if (irq > 7) outb(IO_ICU2, 0x20 | (irq & 7)); @@ -324,9 +326,10 @@ } static void -isa_enable_intr(int vector) +isa_enable_intr(void *cookie) { - int irq; + int vector = (uintptr_t)cookie; + int irq irq = (vector - 0x800) >> 4; mtx_lock_spin(&icu_lock); @@ -363,7 +366,7 @@ error = alpha_setup_intr( device_get_nameunit(child ? child : dev), - 0x800 + (irq->r_start << 4), + (void *)(uintptr_t)(0x800 + (irq->r_start << 4)), ((flags & INTR_FAST) ? isa_handle_fast_intr : isa_handle_intr), ii, flags, &ii->ih, &intrcnt[INTRCNT_ISA_IRQ + irq->r_start], ==== //depot/projects/hammer/sys/alpha/mcbus/mcpcia.c#6 (text+ko) ==== @@ -304,8 +304,9 @@ } static void -mcpcia_disable_intr_vec(int vector) +mcpcia_disable_intr_vec(void *cookie) { + int vector = (uintptr_t)cookie; int mid, irq; struct mcpcia_softc *sc = mcpcia_root; @@ -346,8 +347,9 @@ } static void -mcpcia_enable_intr_vec(int vector) +mcpcia_enable_intr_vec(void *cookie) { + int vector = (uintptr_t)cookie; int mid, irq; struct mcpcia_softc *sc = mcpcia_root; @@ -448,7 +450,8 @@ 2 * MCPCIA_VECWIDTH_PER_SLOT; } birq = irq + INTRCNT_KN300_IRQ; - error = alpha_setup_intr(device_get_nameunit(child), h, + error = alpha_setup_intr(device_get_nameunit(child), + (void *)(uintptr_t)h, intr, arg, flags, cp, &intrcnt[birq], mcpcia_disable_intr_vec, mcpcia_enable_intr_vec); if (error) ==== //depot/projects/hammer/sys/alpha/pci/apecs.c#4 (text+ko) ==== @@ -308,8 +308,9 @@ } static void -apecs_disable_intr(int vector) +apecs_disable_intr(void *cookie) { + int vector = (uintptr_t)cookie; int irq; irq = (vector - 0x900) >> 4; @@ -319,8 +320,9 @@ } static void -apecs_enable_intr(int vector) +apecs_enable_intr(void *cookie) { + int vector = (uintptr_t)cookie; int irq; irq = (vector - 0x900) >> 4; @@ -349,7 +351,8 @@ return error; error = alpha_setup_intr(device_get_nameunit(child ? child : dev), - 0x900 + (irq->r_start << 4), intr, arg, flags, cookiep, + (void *)(uintptr_t)(0x900 + (irq->r_start << 4)), + intr, arg, flags, cookiep, &intrcnt[INTRCNT_EB64PLUS_IRQ + irq->r_start], apecs_disable_intr, apecs_enable_intr); if (error) ==== //depot/projects/hammer/sys/alpha/pci/cia.c#4 (text+ko) ==== @@ -515,8 +515,9 @@ } static void -cia_disable_intr(int vector) +cia_disable_intr(void *cookie) { + int vector = (uintptr_t)cookie; int irq; irq = (vector - 0x900) >> 4; @@ -526,8 +527,9 @@ } static void -cia_enable_intr(int vector) +cia_enable_intr(void *cookie) { + int vector = (uintptr_t)cookie; int irq; irq = (vector - 0x900) >> 4; @@ -549,7 +551,8 @@ error = alpha_setup_intr( device_get_nameunit(child ? child : dev), - 0x900 + (irq->r_start << 4), intr, arg, flags, cookiep, + (void *)(uintptr_t)(0x900 + (irq->r_start << 4)), + intr, arg, flags, cookiep, &intrcnt[INTRCNT_EB164_IRQ + irq->r_start], cia_disable_intr, cia_enable_intr); if (error) ==== //depot/projects/hammer/sys/alpha/pci/t2.c#4 (text+ko) ==== @@ -457,8 +457,9 @@ } static void -t2_enable_vec(int vector) +t2_enable_vec(void *cookie) { + int vector = (uintptr_t)cookie; int irq, hose; u_long IC_mask, scratch; @@ -491,8 +492,9 @@ } static void -t2_disable_vec(int vector) +t2_disable_vec(void *cookie) { + int vector = (uintptr_t)cookie; int hose, irq; u_long scratch, IC_mask; @@ -563,7 +565,7 @@ return error; error = alpha_setup_intr(device_get_nameunit(child ? child : dev), - vector, intr, arg, flags, cookiep, + (void *)(uintptr_t)vector, intr, arg, flags, cookiep, &intrcnt[irq->r_start], t2_disable_vec, t2_enable_vec); if (error) ==== //depot/projects/hammer/sys/alpha/pci/tsunami.c#4 (text+ko) ==== @@ -308,8 +308,9 @@ } static void -tsunami_disable_intr_vec(int vector) +tsunami_disable_intr_vec(void *cookie) { + int vector = (uintptr_t)cookie; int irq; irq = (vector - 0x900) >> 4; @@ -319,8 +320,9 @@ } static void -tsunami_enable_intr_vec(int vector) +tsunami_enable_intr_vec(void *cookie) { + int vector = (uintptr_t)cookie; int irq; irq = (vector - 0x900) >> 4; @@ -341,7 +343,8 @@ return error; error = alpha_setup_intr(device_get_nameunit(child ? child : dev), - 0x900 + (irq->r_start << 4), intr, arg, flags, cookiep, + (void *)(uintptr_t)(0x900 + (irq->r_start << 4)), + intr, arg, flags, cookiep, &intrcnt[INTRCNT_EB164_IRQ + irq->r_start], tsunami_disable_intr_vec, tsunami_enable_intr_vec); if (error) ==== //depot/projects/hammer/sys/alpha/tlsb/dwlpx.c#6 (text+ko) ==== @@ -392,7 +392,7 @@ vector = DWLPX_MVEC(ionode, hose, slot); error = alpha_setup_intr(device_get_nameunit(child ? child : dev), - vector, intr, arg, flags, cookiep, + (void *)(uintptr_t)vector, intr, arg, flags, cookiep, &intrcnt[INTRCNT_KN8AE_IRQ], NULL, NULL); if (error) return error;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311170048.hAH0mwBD047851>