From owner-p4-projects@FreeBSD.ORG Sun Nov 16 21:43:15 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 58C0216A4D0; Sun, 16 Nov 2003 21:43:15 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1C8D516A4CE for ; Sun, 16 Nov 2003 21:43:15 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5FE8943F85 for ; Sun, 16 Nov 2003 21:43:14 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAH5hEXJ072880 for ; Sun, 16 Nov 2003 21:43:14 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAH5hDxH072877 for perforce@freebsd.org; Sun, 16 Nov 2003 21:43:13 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sun, 16 Nov 2003 21:43:13 -0800 (PST) Message-Id: <200311170543.hAH5hDxH072877@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 42625 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Nov 2003 05:43:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=42625 Change 42625 by peter@peter_freefall on 2003/11/16 21:42:30 argh! you are lost in a maze of twisty cut/pasted code, all nearly identical Affected files ... .. //depot/projects/hammer/sys/alpha/alpha/interrupt.c#9 edit .. //depot/projects/hammer/sys/alpha/include/intr.h#5 edit .. //depot/projects/hammer/sys/alpha/mcbus/mcpcia.c#8 edit Differences ... ==== //depot/projects/hammer/sys/alpha/alpha/interrupt.c#9 (text+ko) ==== @@ -348,7 +348,7 @@ 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)(void *), void (*enable)(void *)) + void (*disable)(uintptr_t), void (*enable)(uintptr_t)) { int h = HASHVEC(vector); struct alpha_intr *i; ==== //depot/projects/hammer/sys/alpha/include/intr.h#5 (text+ko) ==== @@ -31,9 +31,10 @@ extern struct mtx icu_lock; -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)(void *), void (*enable)(void *)); +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); ==== //depot/projects/hammer/sys/alpha/mcbus/mcpcia.c#8 (text+ko) ==== @@ -310,7 +310,7 @@ 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 @@ 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 @@ 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); @@ -352,7 +352,7 @@ 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 @@ 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 @@ 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);