From owner-p4-projects@FreeBSD.ORG Wed Jun 28 15:26:13 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 7391316A410; Wed, 28 Jun 2006 15:26:13 +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 4FFDB16A407 for ; Wed, 28 Jun 2006 15:26:13 +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 0D53844AA7 for ; Wed, 28 Jun 2006 15:26:13 +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 k5SFQC9u015796 for ; Wed, 28 Jun 2006 15:26:12 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5SFQCXn015793 for perforce@freebsd.org; Wed, 28 Jun 2006 15:26:12 GMT (envelope-from piso@freebsd.org) Date: Wed, 28 Jun 2006 15:26:12 GMT Message-Id: <200606281526.k5SFQCXn015793@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 100208 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: Wed, 28 Jun 2006 15:26:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=100208 Change 100208 by piso@piso_newluxor on 2006/06/28 15:25:52 Various fixes for pc98 and ia64: mostly are bus_setup_intr() that i missed to convert in the previous commits, and in one case i mistakenly inverted the filter/driver parameter. Affected files ... .. //depot/projects/soc2006/intr_filter/dev/aic/aic_cbus.c#2 edit .. //depot/projects/soc2006/intr_filter/dev/ata/ata-cbus.c#3 edit .. //depot/projects/soc2006/intr_filter/dev/ct/ct_isa.c#2 edit .. //depot/projects/soc2006/intr_filter/dev/ed/if_ed_cbus.c#2 edit .. //depot/projects/soc2006/intr_filter/dev/le/if_le_cbus.c#2 edit .. //depot/projects/soc2006/intr_filter/dev/snc/if_snc_cbus.c#2 edit .. //depot/projects/soc2006/intr_filter/dev/snc/if_snc_pccard.c#2 edit .. //depot/projects/soc2006/intr_filter/ia64/ia64/interrupt.c#4 edit .. //depot/projects/soc2006/intr_filter/ia64/ia64/nexus.c#3 edit .. //depot/projects/soc2006/intr_filter/ia64/include/intr.h#3 edit .. //depot/projects/soc2006/intr_filter/pc98/cbus/fdc.c#2 edit .. //depot/projects/soc2006/intr_filter/pc98/cbus/pckbd.c#2 edit .. //depot/projects/soc2006/intr_filter/pc98/cbus/sio.c#4 edit Differences ... ==== //depot/projects/soc2006/intr_filter/dev/aic/aic_cbus.c#2 (text+ko) ==== @@ -211,7 +211,7 @@ } error = bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_CAM|INTR_ENTROPY, - aic_intr, aic, &sc->sc_ih); + NULL, aic_intr, aic, &sc->sc_ih); if (error) { device_printf(dev, "failed to register interrupt handler\n"); aic_isa_release_resources(dev); ==== //depot/projects/soc2006/intr_filter/dev/ata/ata-cbus.c#3 (text+ko) ==== @@ -144,7 +144,7 @@ } if ((bus_setup_intr(dev, ctlr->irq, ATA_INTR_FLAGS, - ata_cbus_intr, ctlr, &ctlr->ih))) { + NULL, ata_cbus_intr, ctlr, &ctlr->ih))) { device_printf(dev, "unable to setup interrupt\n"); bus_release_resource(dev, SYS_RES_IOPORT, ATA_IOADDR_RID, ctlr->io); bus_release_resource(dev, SYS_RES_IOPORT, ATA_CTLADDR_RID, ctlr->ctlio); ==== //depot/projects/soc2006/intr_filter/dev/ct/ct_isa.c#2 (text+ko) ==== @@ -330,7 +330,7 @@ splx(s); if (bus_setup_intr(dev, ct->irq_res, INTR_TYPE_CAM, - (driver_intr_t *)ctintr, ct, &ct->sc_ih)) { + NULL, (driver_intr_t *)ctintr, ct, &ct->sc_ih)) { ct_space_unmap(dev, ct); return ENXIO; } ==== //depot/projects/soc2006/intr_filter/dev/ed/if_ed_cbus.c#2 (text+ko) ==== @@ -243,7 +243,7 @@ ed_alloc_irq(dev, sc->irq_rid, 0); error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET | INTR_MPSAFE, - edintr, sc, &sc->irq_handle); + NULL, edintr, sc, &sc->irq_handle); if (error) { ed_release_resources(dev); return (error); ==== //depot/projects/soc2006/intr_filter/dev/le/if_le_cbus.c#2 (text) ==== @@ -377,7 +377,7 @@ } error = bus_setup_intr(dev, lesc->sc_ires, INTR_TYPE_NET | INTR_MPSAFE, - am7990_intr, sc, &lesc->sc_ih); + NULL, am7990_intr, sc, &lesc->sc_ih); if (error != 0) { device_printf(dev, "cannot set up interrupt\n"); goto fail_am7990; ==== //depot/projects/soc2006/intr_filter/dev/snc/if_snc_cbus.c#2 (text+ko) ==== @@ -190,7 +190,7 @@ snc_alloc_irq(dev, 0, 0); error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET, - sncintr, sc, &sc->irq_handle); + NULL, sncintr, sc, &sc->irq_handle); if (error) { printf("snc_isa_attach: bus_setup_intr() failed\n"); snc_release_resources(dev); ==== //depot/projects/soc2006/intr_filter/dev/snc/if_snc_pccard.c#2 (text+ko) ==== @@ -135,7 +135,7 @@ snc_alloc_irq(dev, 0, 0); error = bus_setup_intr(dev, sc->irq, INTR_TYPE_NET, - sncintr, sc, &sc->irq_handle); + NULL, sncintr, sc, &sc->irq_handle); if (error) { printf("snc_isa_attach: bus_setup_intr() failed\n"); snc_release_resources(dev); ==== //depot/projects/soc2006/intr_filter/ia64/ia64/interrupt.c#4 (text+ko) ==== @@ -283,8 +283,8 @@ } int -ia64_setup_intr(const char *name, int irq, driver_intr_t handler, - driver_filter_t filter,void *arg, enum intr_type flags, +ia64_setup_intr(const char *name, int irq, driver_filter_t filter, + driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep, volatile long *cntp) { struct ia64_intr *i; ==== //depot/projects/soc2006/intr_filter/ia64/ia64/nexus.c#3 (text+ko) ==== ==== //depot/projects/soc2006/intr_filter/ia64/include/intr.h#3 (text+ko) ==== @@ -51,8 +51,8 @@ struct sapic; void ia64_add_sapic(struct sapic *sa); -int ia64_setup_intr(const char *name, int irq, driver_intr_t handler, - driver_filter_t filter, void *arg, enum intr_type flags, +int ia64_setup_intr(const char *name, int irq, driver_filter_t filter, + driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep, volatile long *cntp); int ia64_teardown_intr(void *cookie); void ia64_dispatch_intr(void *frame, unsigned long vector); ==== //depot/projects/soc2006/intr_filter/pc98/cbus/fdc.c#2 (text+ko) ==== @@ -821,7 +821,7 @@ fdc = device_get_softc(dev); fdc->fdc_dev = dev; error = bus_setup_intr(dev, fdc->res_irq, - INTR_TYPE_BIO | INTR_ENTROPY, fdc_intr, fdc, + INTR_TYPE_BIO | INTR_ENTROPY, NULL, fdc_intr, fdc, &fdc->fdc_intr); if (error) { device_printf(dev, "cannot setup interrupt\n"); ==== //depot/projects/soc2006/intr_filter/pc98/cbus/pckbd.c#2 (text+ko) ==== @@ -136,7 +136,7 @@ res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, RF_ACTIVE); if (res == NULL) return ENXIO; - bus_setup_intr(dev, res, INTR_TYPE_TTY, pckbd_isa_intr, kbd, &ih); + bus_setup_intr(dev, res, INTR_TYPE_TTY, NULL, pckbd_isa_intr, kbd, &ih); return 0; } ==== //depot/projects/soc2006/intr_filter/pc98/cbus/sio.c#4 (text+ko) ==== @@ -1745,7 +1745,7 @@ if (ret) { ret = bus_setup_intr(dev, com->irqres, INTR_TYPE_TTY, - siointr, com, &com->cookie); + NULL, siointr, com, &com->cookie); if (ret == 0) device_printf(dev, "unable to activate interrupt in fast mode - using normal mode\n"); }