From owner-p4-projects@FreeBSD.ORG Sun Nov 16 16:37:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 622B716A4D0; Sun, 16 Nov 2003 16:37:41 -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 1D4DB16A4CE for ; Sun, 16 Nov 2003 16:37:41 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 61B5143FCB for ; Sun, 16 Nov 2003 16:37:40 -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 hAH0beXJ037594 for ; Sun, 16 Nov 2003 16:37:40 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAH0bd3E037591 for perforce@freebsd.org; Sun, 16 Nov 2003 16:37:39 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sun, 16 Nov 2003 16:37:39 -0800 (PST) Message-Id: <200311170037.hAH0bd3E037591@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 42599 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 00:37:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=42599 Change 42599 by peter@peter_overcee on 2003/11/16 16:37:00 take a stab at updating for the ithread_create api on powerpc Affected files ... .. //depot/projects/hammer/sys/powerpc/include/intr_machdep.h#3 edit .. //depot/projects/hammer/sys/powerpc/powermac/hrowpic.c#2 edit .. //depot/projects/hammer/sys/powerpc/powerpc/intr_machdep.c#3 edit .. //depot/projects/hammer/sys/powerpc/powerpc/openpic.c#4 edit Differences ... ==== //depot/projects/hammer/sys/powerpc/include/intr_machdep.h#3 (text+ko) ==== @@ -40,7 +40,7 @@ u_int ih_flags; }; -void intr_init(void (*)(void), int, void (*)(int), void (*)(int)); +void intr_init(void (*)(void), int, void (*)(void *), void (*)(void *)); void intr_setup(u_int, ih_func_t *, void *, u_int); int inthand_add(const char *, u_int, void (*)(void *), void *, int, void **); ==== //depot/projects/hammer/sys/powerpc/powermac/hrowpic.c#2 (text+ko) ==== @@ -94,8 +94,8 @@ * Local routines */ static void hrowpic_intr(void); -static void hrowpic_ext_enable_irq(int); -static void hrowpic_ext_disable_irq(int); +static void hrowpic_ext_enable_irq(void *); +static void hrowpic_ext_disable_irq(void *); static void hrowpic_toggle_irq(struct hrowpic_softc *sc, int, int); /* @@ -375,14 +375,18 @@ } static void -hrowpic_ext_enable_irq(int irq) +hrowpic_ext_enable_irq(void *cookie) { + int irq = (uintptr_t)cookie; + hrowpic_toggle_irq(hpicsoftc, irq, 1); } static void -hrowpic_ext_disable_irq(int irq) +hrowpic_ext_disable_irq(void *cookie) { + int irq = (uintptr_t)cookie; + hrowpic_toggle_irq(hpicsoftc, irq, 0); } ==== //depot/projects/hammer/sys/powerpc/powerpc/intr_machdep.c#3 (text+ko) ==== @@ -99,12 +99,12 @@ static ih_func_t intr_stray_handler; static ih_func_t sched_ithd; -static void (*irq_enable)(int); -static void (*irq_disable)(int); +static void (*irq_enable)(void *); +static void (*irq_disable)(void *); void -intr_init(void (*handler)(void), int nirq, void (*irq_e)(int), - void (*irq_d)(int)) +intr_init(void (*handler)(void), int nirq, void (*irq_e)(void *), + void (*irq_d)(void *)) { int i; u_int32_t msr; @@ -247,7 +247,7 @@ intr_handlers[irq].ih_func(intr_handlers[irq].ih_arg); if ((intr_handlers[irq].ih_flags & INTR_FAST) != 0) - irq_enable(irq); + irq_enable((void *)(uintptr_t)irq); } static void ==== //depot/projects/hammer/sys/powerpc/powerpc/openpic.c#4 (text+ko) ==== @@ -85,8 +85,8 @@ static void openpic_disable_irq(struct openpic_softc *, int); static void openpic_set_priority(struct openpic_softc *, int, int); static void openpic_intr(void); -static void irq_enable(int); -static void irq_disable(int); +static void irq_enable(void *); +static void irq_disable(void *); /* * Driver methods. @@ -476,15 +476,17 @@ } static void -irq_enable(int irq) +irq_enable(void *cookie) { + int irq = (uintptr_t)cookie; openpic_enable_irq(softc, irq, IST_LEVEL); } static void -irq_disable(int irq) +irq_disable(void *cookie) { + int irq = (uintptr_t)cookie; openpic_disable_irq(softc, irq); }