From owner-p4-projects@FreeBSD.ORG Mon Jun 26 10:00:11 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C46816A410; Mon, 26 Jun 2006 10:00:11 +0000 (UTC) X-Original-To: perforce@freebsd.org 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 3426F16A40D for ; Mon, 26 Jun 2006 10:00:11 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1AA6243D5E for ; Mon, 26 Jun 2006 10:00:01 +0000 (GMT) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5QA01oN049308 for ; Mon, 26 Jun 2006 10:00:01 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QA01JV049305 for perforce@freebsd.org; Mon, 26 Jun 2006 10:00:01 GMT (envelope-from piso@freebsd.org) Date: Mon, 26 Jun 2006 10:00:01 GMT Message-Id: <200606261000.k5QA01JV049305@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 100042 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Jun 2006 10:00:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=100042 Change 100042 by piso@piso_newluxor on 2006/06/26 09:59:11 Add a filter parameter for nexus_setup_intr() and arm_setup_irqhandler(). Affected files ... .. //depot/projects/soc2006/intr_filter/arm/arm/intr.c#3 edit .. //depot/projects/soc2006/intr_filter/arm/arm/nexus.c#2 edit .. //depot/projects/soc2006/intr_filter/arm/include/intr.h#2 edit Differences ... ==== //depot/projects/soc2006/intr_filter/arm/arm/intr.c#3 (text+ko) ==== @@ -58,7 +58,7 @@ void arm_handler_execute(struct trapframe *, int); void -arm_setup_irqhandler(const char *name, void (*hand)(void*), void *arg, +arm_setup_irqhandler(const char *name, driver_filter_t *filter, void (*hand)(void*), void *arg, int irq, int flags, void **cookiep) { struct intr_event *event; @@ -82,7 +82,7 @@ intrcnt_index++; } - intr_event_add_handler(event, name, hand, arg, + intr_event_add_handler(event, name, filter, hand, arg, intr_priority(flags), flags, cookiep); } ==== //depot/projects/soc2006/intr_filter/arm/arm/nexus.c#2 (text+ko) ==== @@ -81,7 +81,8 @@ struct resource *); static int nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags, - driver_intr_t *intr, void *arg, void **cookiep); + driver_filter_t *filter, driver_intr_t *intr, void *arg, + void **cookiep); static int nexus_teardown_intr(device_t, device_t, struct resource *, void *); @@ -125,10 +126,10 @@ static int nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags, - driver_intr_t *intr, void *arg, void **cookiep) + driver_filter_t *filter, driver_intr_t *intr, void *arg, void **cookiep) { arm_setup_irqhandler(device_get_nameunit(child), - intr, arg, rman_get_start(res), flags, cookiep); + filter, intr, arg, rman_get_start(res), flags, cookiep); return (0); } ==== //depot/projects/soc2006/intr_filter/arm/include/intr.h#2 (text+ko) ==== @@ -50,7 +50,7 @@ int arm_get_next_irq(void); void arm_mask_irq(uintptr_t); void arm_unmask_irq(uintptr_t); -void arm_setup_irqhandler(const char *, void (*)(void*), void *, int, int, - void **); +void arm_setup_irqhandler(const char *, driver_filter_t *, void (*)(void*), + void *, int, int, void **); int arm_remove_irqhandler(void *); #endif /* _MACHINE_INTR_H */