From owner-p4-projects@FreeBSD.ORG Mon Jun 26 12:03:05 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 BF04416A407; Mon, 26 Jun 2006 12:03:05 +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 8301316A400 for ; Mon, 26 Jun 2006 12:03:05 +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 BEC2644922 for ; Mon, 26 Jun 2006 11:35:08 +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 k5QBZ8N4055934 for ; Mon, 26 Jun 2006 11:35:08 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5QBZ7Dq055931 for perforce@freebsd.org; Mon, 26 Jun 2006 11:35:07 GMT (envelope-from piso@freebsd.org) Date: Mon, 26 Jun 2006 11:35:07 GMT Message-Id: <200606261135.k5QBZ7Dq055931@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 100048 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 12:03:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=100048 Change 100048 by piso@piso_newluxor on 2006/06/26 11:34:21 Add a filter parameter (even if unused) to scc_bus_setup_intr(). Affected files ... .. //depot/projects/soc2006/intr_filter/dev/scc/scc_bfe.h#2 edit .. //depot/projects/soc2006/intr_filter/dev/scc/scc_core.c#4 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/scc/scc_bfe.h#2 (text) ==== @@ -146,7 +146,7 @@ int scc_bus_read_ivar(device_t, device_t, int, uintptr_t *); int scc_bus_release_resource(device_t, device_t, int, int, struct resource *); int scc_bus_setup_intr(device_t, device_t, struct resource *, int, - void (*)(void *), void *, void **); + driver_filter_t *, void (*)(void *), void *, void **); int scc_bus_teardown_intr(device_t, device_t, struct resource *, void *); #endif /* _DEV_SCC_BFE_H_ */ ==== //depot/projects/soc2006/intr_filter/dev/scc/scc_core.c#4 (text) ==== @@ -498,7 +498,8 @@ int scc_bus_setup_intr(device_t dev, device_t child, struct resource *r, int flags, - void (*ihand)(void *), void *arg, void **cookiep) + driver_filter_t *filter __unused, void (*ihand)(void *), void *arg, + void **cookiep) { struct scc_chan *ch; struct scc_mode *m; @@ -525,7 +526,7 @@ bus_teardown_intr(dev, ch->ch_ires, ch->ch_icookie); bus_setup_intr(dev, ch->ch_ires, INTR_TYPE_TTY | INTR_MPSAFE, - NULL, (driver_intr_t *)scc_bfe_intr, sc, &ch->ch_icookie); + scc_bfe_intr, NULL, sc, &ch->ch_icookie); } }