From owner-p4-projects@FreeBSD.ORG Sun Nov 16 19:06:53 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A4D3E16A4D0; Sun, 16 Nov 2003 19:06:53 -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 7C23116A4CE for ; Sun, 16 Nov 2003 19:06:53 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6AF6643FA3 for ; Sun, 16 Nov 2003 19:06:52 -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 hAH36qXJ056888 for ; Sun, 16 Nov 2003 19:06:52 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAH36pFW056885 for perforce@freebsd.org; Sun, 16 Nov 2003 19:06:51 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sun, 16 Nov 2003 19:06:51 -0800 (PST) Message-Id: <200311170306.hAH36pFW056885@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 42612 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 03:06:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=42612 Change 42612 by peter@peter_freefall on 2003/11/16 19:06:45 make alpha compile Affected files ... .. //depot/projects/hammer/sys/alpha/alpha/interrupt.c#7 edit .. //depot/projects/hammer/sys/alpha/include/intr.h#3 edit .. //depot/projects/hammer/sys/alpha/isa/isa.c#6 edit .. //depot/projects/hammer/sys/alpha/pci/t2.c#5 edit Differences ... ==== //depot/projects/hammer/sys/alpha/alpha/interrupt.c#7 (text+ko) ==== @@ -321,13 +321,13 @@ return (mc_received); } -#define HASHVEC(vector) ((vector) % 31) +#define HASHVEC(vector) (((uintptr_t)(vector)) % 31) 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 */ + void *vector; /* vector to match */ struct ithd *ithd; /* interrupt thread */ volatile long *cntp; /* interrupt counter */ }; @@ -346,7 +346,7 @@ 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, void *vector, driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep, volatile long *cntp, void (*disable)(void *), void (*enable)(void *)) { @@ -411,7 +411,8 @@ * Walk the hash bucket for this vector looking for this vector's * interrupt thread. */ - for (i = LIST_FIRST(&alpha_intr_hash[h]); i && i->vector != vector; + for (i = LIST_FIRST(&alpha_intr_hash[h]); + i && i->vector != (void *)(uintptr_t)vector; i = LIST_NEXT(i, list)) ; /* nothing */ if (i == NULL) ==== //depot/projects/hammer/sys/alpha/include/intr.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ extern struct mtx icu_lock; -int alpha_setup_intr(const char *name, int vector, driver_intr_t handler, +int alpha_setup_intr(const char *name, void *vector, driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep, volatile long *cntp, void (*disable)(void *), void (*enable)(void *)); int alpha_teardown_intr(void *cookie); ==== //depot/projects/hammer/sys/alpha/isa/isa.c#6 (text+ko) ==== @@ -329,7 +329,7 @@ isa_enable_intr(void *cookie) { int vector = (uintptr_t)cookie; - int irq + int irq; irq = (vector - 0x800) >> 4; mtx_lock_spin(&icu_lock); ==== //depot/projects/hammer/sys/alpha/pci/t2.c#5 (text+ko) ==== @@ -572,7 +572,7 @@ return error; /* Enable interrupt */ - t2_enable_vec(vector); + t2_enable_vec((void *)(uintptr_t)vector); if (bootverbose != 0) device_printf(child,