From owner-p4-projects@FreeBSD.ORG Tue Dec 19 00:05:16 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 9C5C016A417; Tue, 19 Dec 2006 00:05:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7378216A415 for ; Tue, 19 Dec 2006 00:05:16 +0000 (UTC) (envelope-from piso@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.FreeBSD.org (Postfix) with ESMTP id C264B43CA5 for ; Tue, 19 Dec 2006 00:05:15 +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 kBJ05FVx083398 for ; Tue, 19 Dec 2006 00:05:15 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBJ05FbP083395 for perforce@freebsd.org; Tue, 19 Dec 2006 00:05:15 GMT (envelope-from piso@freebsd.org) Date: Tue, 19 Dec 2006 00:05:15 GMT Message-Id: <200612190005.kBJ05FbP083395@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 111913 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: Tue, 19 Dec 2006 00:05:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=111913 Change 111913 by piso@piso_newluxor on 2006/12/19 00:05:02 Put a check about filters: if people really want to use filters on this hw, they'll have to modify the bridge driver in them. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/sound/isa/gusc.c#4 edit .. //depot/projects/soc2006/intr_filter/dev/sound/isa/sbc.c#5 edit .. //depot/projects/soc2006/intr_filter/dev/sound/pci/csa.c#4 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/sound/isa/gusc.c#4 (text+ko) ==== @@ -424,18 +424,16 @@ sc_p scp = (sc_p)device_get_softc(dev); devclass_t devclass; + if (filter != NULL) { + printf("gusc.c: we cannot use a filter here\n"); + return (EINVAL); + } devclass = device_get_devclass(child); if (strcmp(devclass_get_name(devclass), "midi") == 0) { - /* - * XXX_FILTER this code doesn't take care of filters. - */ scp->midi_intr.intr = intr; scp->midi_intr.arg = arg; return 0; } else if (strcmp(devclass_get_name(devclass), "pcm") == 0) { - /* - * XXX_FILTER this code doesn't take care of filters. - */ scp->pcm_intr.intr = intr; scp->pcm_intr.arg = arg; return 0; ==== //depot/projects/soc2006/intr_filter/dev/sound/isa/sbc.c#5 (text+ko) ==== @@ -503,13 +503,17 @@ static int sbc_setup_intr(device_t dev, device_t child, struct resource *irq, - int flags, driver_filter_t *filter __unused, driver_intr_t *intr, + int flags, driver_filter_t *filter, driver_intr_t *intr, void *arg, void **cookiep) { struct sbc_softc *scp = device_get_softc(dev); struct sbc_ihl *ihl = NULL; int i, ret; + if (filter != NULL) { + printf("sbc.c: we cannot use a filter here\n"); + return (EINVAL); + } sbc_lock(scp); i = 0; while (i < IRQ_MAX) { ==== //depot/projects/soc2006/intr_filter/dev/sound/pci/csa.c#4 (text+ko) ==== @@ -440,13 +440,17 @@ static int csa_setup_intr(device_t bus, device_t child, struct resource *irq, int flags, - driver_filter_t *filter __unused, driver_intr_t *intr, void *arg, + driver_filter_t *filter, driver_intr_t *intr, void *arg, void **cookiep) { sc_p scp; csa_res *resp; struct sndcard_func *func; + if (filter != NULL) { + printf("ata-csa.c: we cannot use a filter here\n"); + return (EINVAL); + } scp = device_get_softc(bus); resp = &scp->res; @@ -460,17 +464,11 @@ switch (func->func) { case SCF_PCM: - /* - * XXX_FILTER this code doesn't take care of filters. - */ scp->pcmintr = intr; scp->pcmintr_arg = arg; break; case SCF_MIDI: - /* - * XXX_FILTER this code doesn't take care of filters. - */ scp->midiintr = intr; scp->midiintr_arg = arg; break;