From 1b51b0faca8cedb6c54123f64600c6d37cf16703 Mon Sep 17 00:00:00 2001 From: Sepherosa Ziehau Date: Thu, 13 Oct 2005 08:50:33 +0000 Subject: [PATCH] unbreak LINT building --- sys/dev/disk/mcd/mcd.c | 7 ++++--- sys/dev/disk/wt/wt.c | 8 ++++---- sys/dev/misc/labpc/labpc.c | 6 +++--- sys/dev/misc/spigot/spigot.c | 6 +++--- sys/dev/misc/tw/tw.c | 6 +++--- sys/dev/netif/cx/if_cx.c | 6 +++--- sys/dev/netif/el/if_el.c | 6 +++--- sys/dev/netif/le/if_le.c | 6 +++--- sys/dev/netif/rdp/if_rdp.c | 9 +++++---- sys/dev/serial/cy/cy.c | 6 +++--- sys/dev/serial/stl/stallion.c | 6 +++--- sys/i386/isa/asc.c | 8 ++++---- sys/platform/pc32/isa/asc.c | 8 ++++---- 13 files changed, 45 insertions(+), 43 deletions(-) diff --git a/sys/dev/disk/mcd/mcd.c b/sys/dev/disk/mcd/mcd.c index 8c32ee3667..d1ef48a016 100644 --- a/sys/dev/disk/mcd/mcd.c +++ b/sys/dev/disk/mcd/mcd.c @@ -41,7 +41,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/mcd.c,v 1.115 2000/01/29 16:17:34 peter Exp $ - * $DragonFly: src/sys/dev/disk/mcd/Attic/mcd.c,v 1.13 2005/10/13 00:02:30 dillon Exp $ + * $DragonFly: src/sys/dev/disk/mcd/Attic/mcd.c,v 1.14 2005/10/13 08:50:33 sephe Exp $ */ static const char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; @@ -170,7 +170,7 @@ static int mcd_send(int unit, int cmd,int nretrys); static void hsg2msf(int hsg, bcd_t *msf); static int msf2hsg(bcd_t *msf, int relative); static int mcd_volinfo(int unit); -static inthand2_t mcdintr; +static void mcdintr(void *); static int mcd_waitrdy(int port,int dly); static timeout_t mcd_timeout; static void mcd_doread(int state, struct mcd_mbx *mbxin); @@ -248,7 +248,7 @@ int mcd_attach(struct isa_device *dev) int unit = dev->id_unit; struct mcd_data *cd = mcd_data + unit; - dev->id_intr = mcdintr; + dev->id_intr = (inthand2_t *)mcdintr; cd->iobase = dev->id_iobase; cd->flags |= MCDINIT; callout_init(&cd->callout); @@ -965,6 +965,7 @@ mcd_volinfo(int unit) static void mcdintr(void *dummy) { + int unit = (int)dummy; MCD_TRACE("stray interrupt\n"); } diff --git a/sys/dev/disk/wt/wt.c b/sys/dev/disk/wt/wt.c index ca3d46669c..a9f6f9d34c 100644 --- a/sys/dev/disk/wt/wt.c +++ b/sys/dev/disk/wt/wt.c @@ -21,7 +21,7 @@ * * Version 1.3, Thu Nov 11 12:09:13 MSK 1993 * $FreeBSD: src/sys/i386/isa/wt.c,v 1.57.2.1 2000/08/08 19:49:53 peter Exp $ - * $DragonFly: src/sys/dev/disk/wt/wt.c,v 1.11 2005/10/13 00:02:31 dillon Exp $ + * $DragonFly: src/sys/dev/disk/wt/wt.c,v 1.12 2005/10/13 08:50:33 sephe Exp $ * */ @@ -170,7 +170,7 @@ static void wtclock (wtinfo_t *t); static int wtreset (wtinfo_t *t); static int wtsense (wtinfo_t *t, int verb, int ignor); static int wtstatus (wtinfo_t *t); -static inthand2_t wtintr; +static void wtintr(void *); static void wtrewind (wtinfo_t *t); static int wtreadfm (wtinfo_t *t); static int wtwritefm (wtinfo_t *t); @@ -257,7 +257,7 @@ wtattach (struct isa_device *id) { wtinfo_t *t = wttab + id->id_unit; - id->id_intr = wtintr; + id->id_intr = (inthand2_t *)wtintr; if (t->type == ARCHIVE) { printf ("wt%d: type \n", t->unit); outb (t->RDMAPORT, 0); /* reset dma */ @@ -864,7 +864,7 @@ wtimer (void *xt) crit_enter(); if ((inb (t->STATPORT) & (t->BUSY | t->NOEXCEP)) != (t->BUSY | t->NOEXCEP)) { TRACE (("wtimer() -- ")); - wtintr (t->unit); + wtintr ((void *)t->unit); } crit_exit(); diff --git a/sys/dev/misc/labpc/labpc.c b/sys/dev/misc/labpc/labpc.c index 635d192d9c..61492bddd2 100644 --- a/sys/dev/misc/labpc/labpc.c +++ b/sys/dev/misc/labpc/labpc.c @@ -39,7 +39,7 @@ * dufault@hda.com * * $FreeBSD: src/sys/i386/isa/labpc.c,v 1.35 1999/09/25 18:24:08 phk Exp $ - * $DragonFly: src/sys/dev/misc/labpc/labpc.c,v 1.13 2005/10/13 00:02:32 dillon Exp $ + * $DragonFly: src/sys/dev/misc/labpc/labpc.c,v 1.14 2005/10/13 08:50:33 sephe Exp $ * */ @@ -308,7 +308,7 @@ static struct cdevsw labpc_cdevsw = { /* psize */ nopsize }; -static inthand2_t labpcintr; +static void labpcintr(void *); static void start(struct ctlr *ctlr); static void @@ -480,7 +480,7 @@ labpcattach(struct isa_device *dev) { struct ctlr *ctlr = labpcs[dev->id_unit]; - dev->id_intr = labpcintr; + dev->id_intr = (inthand2_t *)labpcintr; callout_init(&ctlr->ch); ctlr->sample_us = (1000000.0 / (double)LABPC_DEFAULT_HERTZ) + .50; reset(ctlr); diff --git a/sys/dev/misc/spigot/spigot.c b/sys/dev/misc/spigot/spigot.c index 0cbce06cd1..cc03b910a1 100644 --- a/sys/dev/misc/spigot/spigot.c +++ b/sys/dev/misc/spigot/spigot.c @@ -43,7 +43,7 @@ * Version 1.7, December 1995. * * $FreeBSD: src/sys/i386/isa/spigot.c,v 1.44 2000/01/29 16:17:36 peter Exp $ - * $DragonFly: src/sys/dev/misc/spigot/spigot.c,v 1.10 2005/10/13 00:02:33 dillon Exp $ + * $DragonFly: src/sys/dev/misc/spigot/spigot.c,v 1.11 2005/10/13 08:50:33 sephe Exp $ * */ @@ -115,7 +115,7 @@ static struct cdevsw spigot_cdevsw = { /* psize */ nopsize }; -static inthand2_t spigintr; +static void spigintr(void *); static int spigot_probe(struct isa_device *devp) @@ -144,7 +144,7 @@ spigot_attach(struct isa_device *devp) int unit; struct spigot_softc *ss= &spigot_softc[unit = devp->id_unit]; - devp->id_intr = spigintr; + devp->id_intr = (inthand2_t *)spigintr; ss->maddr = kvtop(devp->id_maddr); ss->irq = devp->id_irq; cdevsw_add(&spigot_cdevsw, -1, unit); diff --git a/sys/dev/misc/tw/tw.c b/sys/dev/misc/tw/tw.c index dc5da3431e..d39fcac322 100644 --- a/sys/dev/misc/tw/tw.c +++ b/sys/dev/misc/tw/tw.c @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/tw.c,v 1.38 2000/01/29 16:00:32 peter Exp $ - * $DragonFly: src/sys/dev/misc/tw/tw.c,v 1.13 2005/10/13 00:02:35 dillon Exp $ + * $DragonFly: src/sys/dev/misc/tw/tw.c,v 1.14 2005/10/13 08:50:33 sephe Exp $ * */ @@ -280,7 +280,7 @@ static void twdelayn(int n); static void twsetuptimes(int *a); static int wait_for_zero(struct tw_sc *sc); static int twputpkt(struct tw_sc *sc, u_char *p); -static inthand2_t twintr; +static void twintr(void *); static int twgetbytes(struct tw_sc *sc, u_char *p, int cnt); static timeout_t twabortrcv; static int twsend(struct tw_sc *sc, int h, int k, int cnt); @@ -398,7 +398,7 @@ static int twattach(idp) struct tw_sc *sc; int unit; - idp->id_intr = twintr; + idp->id_intr = (inthand2_t *)twintr; sc = &tw_sc[unit = idp->id_unit]; sc->sc_port = idp->id_iobase; sc->sc_state = 0; diff --git a/sys/dev/netif/cx/if_cx.c b/sys/dev/netif/cx/if_cx.c index db4b86d220..afbbf1176f 100644 --- a/sys/dev/netif/cx/if_cx.c +++ b/sys/dev/netif/cx/if_cx.c @@ -17,7 +17,7 @@ * Version 1.9, Wed Oct 4 18:58:15 MSK 1995 * * $FreeBSD: src/sys/i386/isa/if_cx.c,v 1.32 1999/11/18 08:36:42 peter Exp $ - * $DragonFly: src/sys/dev/netif/cx/if_cx.c,v 1.17 2005/10/13 00:02:36 dillon Exp $ + * $DragonFly: src/sys/dev/netif/cx/if_cx.c,v 1.18 2005/10/13 08:50:33 sephe Exp $ * */ #undef DEBUG @@ -61,7 +61,7 @@ static int cxattach (struct isa_device *id); static void cxput (cx_chan_t *c, char b); static void cxsend (cx_chan_t *c); static void cxrinth (cx_chan_t *c); -static inthand2_t cxintr; +static void cxintr(void *); static int cxtinth (cx_chan_t *c); #ifdef DEBUG @@ -234,7 +234,7 @@ cxattach (struct isa_device *id) int i; struct sppp *sp; - id->id_intr = cxintr; + id->id_intr = (inthand2_t *)cxintr; /* Initialize the board structure. */ cx_init (b, unit, iobase, ffs(irq)-1, drq); diff --git a/sys/dev/netif/el/if_el.c b/sys/dev/netif/el/if_el.c index b4ad94a794..ebd30faac0 100644 --- a/sys/dev/netif/el/if_el.c +++ b/sys/dev/netif/el/if_el.c @@ -7,7 +7,7 @@ * Questions, comments, bug reports and fixes to kimmel@cs.umass.edu. * * $FreeBSD: src/sys/i386/isa/if_el.c,v 1.47.2.2 2000/07/17 21:24:30 archie Exp $ - * $DragonFly: src/sys/dev/netif/el/if_el.c,v 1.17 2005/10/13 00:02:37 dillon Exp $ + * $DragonFly: src/sys/dev/netif/el/if_el.c,v 1.18 2005/10/13 08:50:33 sephe Exp $ */ /* Except of course for the portions of code lifted from other FreeBSD * drivers (mainly elread, elget and el_ioctl) @@ -75,7 +75,7 @@ static void el_watchdog(struct ifnet *); static void el_stop(void *); static int el_xmit(struct el_softc *,int); -static inthand2_t elintr; +static void elintr(void *); static __inline void elread(struct el_softc *,caddr_t,int); static struct mbuf *elget(caddr_t,int,struct ifnet *); static __inline void el_hardreset(void *); @@ -176,7 +176,7 @@ el_attach(struct isa_device *idev) dprintf(("Attaching el%d...\n",idev->id_unit)); /* Get things pointing to the right places. */ - idev->id_intr = elintr; + idev->id_intr = (inthand2_t *)elintr; sc = &el_softc[idev->id_unit]; ifp = &sc->arpcom.ac_if; base = sc->el_base; diff --git a/sys/dev/netif/le/if_le.c b/sys/dev/netif/le/if_le.c index 511dbbb3c7..e881bb776f 100644 --- a/sys/dev/netif/le/if_le.c +++ b/sys/dev/netif/le/if_le.c @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/if_le.c,v 1.56.2.4 2002/06/05 23:24:10 paul Exp $ - * $DragonFly: src/sys/dev/netif/le/if_le.c,v 1.28 2005/10/13 00:02:39 dillon Exp $ + * $DragonFly: src/sys/dev/netif/le/if_le.c,v 1.29 2005/10/13 08:50:33 sephe Exp $ */ /* @@ -214,7 +214,7 @@ struct le_softc { static int le_probe(struct isa_device *dvp); static int le_attach(struct isa_device *dvp); -static inthand2_t le_intr; +static void le_intr(void *); static int le_ioctl(struct ifnet *ifp, u_long command, caddr_t data, struct ucred *cr); static void le_input(struct le_softc *sc, caddr_t seg1, size_t total_len, @@ -286,7 +286,7 @@ le_attach(struct isa_device *dvp) struct le_softc *sc = &le_softc[dvp->id_unit]; struct ifnet *ifp = &sc->le_if; - dvp->id_intr = le_intr; + dvp->id_intr = (inthand2_t *)le_intr; ifp->if_softc = sc; ifp->if_mtu = ETHERMTU; diff --git a/sys/dev/netif/rdp/if_rdp.c b/sys/dev/netif/rdp/if_rdp.c index 6a544cbe78..d0866fa328 100644 --- a/sys/dev/netif/rdp/if_rdp.c +++ b/sys/dev/netif/rdp/if_rdp.c @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/if_rdp.c,v 1.6.2.2 2000/07/17 21:24:32 archie Exp $ - * $DragonFly: src/sys/dev/netif/rdp/if_rdp.c,v 1.17 2005/06/14 11:41:37 joerg Exp $ + * $DragonFly: src/sys/dev/netif/rdp/if_rdp.c,v 1.18 2005/10/13 08:50:33 sephe Exp $ */ /* @@ -183,7 +183,7 @@ static int rdp_ioctl(struct ifnet *, IOCTL_CMD_T, caddr_t, struct ucred *); static void rdp_start(struct ifnet *); static void rdp_reset(struct ifnet *); static void rdp_watchdog(struct ifnet *); -static void rdpintr(int); +static void rdpintr(void *); /* * REDP private functions. @@ -592,7 +592,7 @@ rdp_attach(struct isa_device *isa_dev) struct rdp_softc *sc = &rdp_softc[unit]; struct ifnet *ifp = &sc->arpcom.ac_if; - isa_dev->id_ointr = rdpintr; + isa_dev->id_intr = (inthand2_t *)rdpintr; /* * Reset interface @@ -868,8 +868,9 @@ rdp_ioctl(struct ifnet *ifp, IOCTL_CMD_T command, caddr_t data, * External interrupt service routine. */ void -rdpintr(int unit) +rdpintr(void *arg) { + int unit = (int)arg; struct rdp_softc *sc = rdp_softc + unit; struct ifnet *ifp = (struct ifnet *)sc; u_char isr, tsr, rsr, colls; diff --git a/sys/dev/serial/cy/cy.c b/sys/dev/serial/cy/cy.c index 10e96369f7..efedc51e2a 100644 --- a/sys/dev/serial/cy/cy.c +++ b/sys/dev/serial/cy/cy.c @@ -28,7 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/cy.c,v 1.97.2.2 2001/08/22 13:04:58 bde Exp $ - * $DragonFly: src/sys/dev/serial/cy/cy.c,v 1.18 2005/10/13 00:02:40 dillon Exp $ + * $DragonFly: src/sys/dev/serial/cy/cy.c,v 1.19 2005/10/13 08:50:33 sephe Exp $ */ #include "opt_compat.h" @@ -331,7 +331,7 @@ struct com_s { /* PCI driver entry point. */ int cyattach_common (cy_addr cy_iobase, int cy_align); -inthand2_t siointr; +void siointr(void *); static int cy_units (cy_addr cy_iobase, int cy_align); static int sioattach (struct isa_device *dev); @@ -518,7 +518,7 @@ sioattach(isdp) printf("cy%d: attached as cy%d\n", isdp->id_unit, adapter); isdp->id_unit = adapter; /* XXX */ } - isdp->id_intr = siointr; + isdp->id_intr = (inthand2_t *)siointr; /* isdp->id_ri_flags |= RI_FAST; XXX unimplemented - use newbus! */ return (1); } diff --git a/sys/dev/serial/stl/stallion.c b/sys/dev/serial/stl/stallion.c index 99b8abdbb8..c7d63502f5 100644 --- a/sys/dev/serial/stl/stallion.c +++ b/sys/dev/serial/stl/stallion.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/sys/i386/isa/stallion.c,v 1.39.2.2 2001/08/30 12:29:57 murray Exp $ - * $DragonFly: src/sys/dev/serial/stl/stallion.c,v 1.15 2005/10/13 00:02:43 dillon Exp $ + * $DragonFly: src/sys/dev/serial/stl/stallion.c,v 1.16 2005/10/13 08:50:33 sephe Exp $ */ /*****************************************************************************/ @@ -512,7 +512,7 @@ static int stl_getbrdstats(caddr_t data); static int stl_getportstats(stlport_t *portp, caddr_t data); static int stl_clrportstats(stlport_t *portp, caddr_t data); static stlport_t *stl_getport(int brdnr, int panelnr, int portnr); -static inthand2_t stlintr; +static void stlintr(void *); #if NPCI > 0 static const char *stlpciprobe(pcici_t tag, pcidi_t type); @@ -853,7 +853,7 @@ static int stlattach(struct isa_device *idp) idp->id_unit, idp->id_iobase); #endif -/* idp->id_intr = stlintr; */ +/* idp->id_intr = (inthand2_t *)stlintr; */ brdp = malloc(sizeof(stlbrd_t), M_TTYS, M_WAITOK | M_ZERO); diff --git a/sys/i386/isa/asc.c b/sys/i386/isa/asc.c index d4ebb502f0..6a0f53caff 100644 --- a/sys/i386/isa/asc.c +++ b/sys/i386/isa/asc.c @@ -35,7 +35,7 @@ */ /* * $FreeBSD: src/sys/i386/isa/asc.c,v 1.42.2.2 2001/03/01 03:22:39 jlemon Exp $ - * $DragonFly: src/sys/i386/isa/Attic/asc.c,v 1.10 2005/10/13 00:02:47 dillon Exp $ + * $DragonFly: src/sys/i386/isa/Attic/asc.c,v 1.11 2005/10/13 08:50:33 sephe Exp $ */ #include "use_asc.h" @@ -177,7 +177,7 @@ static int ascprobe (struct isa_device *isdp); static int ascattach(struct isa_device *isdp); struct isa_driver ascdriver = { ascprobe, ascattach, "asc" }; -static inthand2_t ascintr; +static void ascintr(void *); static d_open_t ascopen; static d_close_t ascclose; @@ -453,7 +453,7 @@ ascattach(struct isa_device *isdp) int unit = isdp->id_unit; struct asc_unit *scu = unittab + unit; - isdp->id_intr = ascintr; + isdp->id_intr = (inthand2_t *)ascintr; scu->flags |= FLAG_DEBUG; printf("asc%d: [GI1904/Trust Ami-Scan Grey/Color]\n", unit); @@ -499,9 +499,9 @@ ascattach(struct isa_device *isdp) static void ascintr(void *arg) { + int unit = (int)arg; struct asc_unit *scu = unittab + unit; int chan_bit = 0x01 << scu->dma_num; - int unit = (int)arg; scu->icnt++; /* ignore stray interrupts... */ diff --git a/sys/platform/pc32/isa/asc.c b/sys/platform/pc32/isa/asc.c index 3f85e544c7..ed5ca98d22 100644 --- a/sys/platform/pc32/isa/asc.c +++ b/sys/platform/pc32/isa/asc.c @@ -35,7 +35,7 @@ */ /* * $FreeBSD: src/sys/i386/isa/asc.c,v 1.42.2.2 2001/03/01 03:22:39 jlemon Exp $ - * $DragonFly: src/sys/platform/pc32/isa/asc.c,v 1.10 2005/10/13 00:02:47 dillon Exp $ + * $DragonFly: src/sys/platform/pc32/isa/asc.c,v 1.11 2005/10/13 08:50:33 sephe Exp $ */ #include "use_asc.h" @@ -177,7 +177,7 @@ static int ascprobe (struct isa_device *isdp); static int ascattach(struct isa_device *isdp); struct isa_driver ascdriver = { ascprobe, ascattach, "asc" }; -static inthand2_t ascintr; +static void ascintr(void *); static d_open_t ascopen; static d_close_t ascclose; @@ -453,7 +453,7 @@ ascattach(struct isa_device *isdp) int unit = isdp->id_unit; struct asc_unit *scu = unittab + unit; - isdp->id_intr = ascintr; + isdp->id_intr = (inthand2_t *)ascintr; scu->flags |= FLAG_DEBUG; printf("asc%d: [GI1904/Trust Ami-Scan Grey/Color]\n", unit); @@ -499,9 +499,9 @@ ascattach(struct isa_device *isdp) static void ascintr(void *arg) { + int unit = (int)arg; struct asc_unit *scu = unittab + unit; int chan_bit = 0x01 << scu->dma_num; - int unit = (int)arg; scu->icnt++; /* ignore stray interrupts... */ -- 2.41.0