 @@ -1,14 +1,14 @@
-/*	$NetBSD: midway.c,v 1.86 2009/03/14 15:36:17 dsl Exp $	*/
+/*	$NetBSD: midway.c,v 1.87 2009/03/15 15:52:12 cegger Exp $	*/
 /*	(sync'd to midway.c 1.68)	*/
 /*
+ *
  * Copyright (c) 1996 Charles D. Cranor and Washington University.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -58,27 +58,27 @@
  *	- support pvc sub interface
+ *
  *	  initial work on per-pvc-interface for ipv6 was done
  *	  by Katsushi Kobayashi <ikob@cc.uec.ac.jp> of the WIDE Project.
  * 	  some of the extensions for pvc subinterfaces are merged from
  *	  the CAIRN project written by Suresh Bhogavilli (suresh@isi.edu).
+ *
  *    code cleanup:
  *	- remove WMAYBE related code.  ENI WMAYBE DMA doesn't work.
  *	- remove updating if_lastchange for every packet.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: midway.c,v 1.86 2009/03/14 15:36:17 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: midway.c,v 1.87 2009/03/15 15:52:12 cegger Exp $");
 #include "opt_natm.h"
 #undef	EN_DEBUG
 #undef	EN_DEBUG_RANGE		/* check ranges on en_read/en_write's? */
 #define	EN_MBUF_OPT		/* try and put more stuff in mbuf? */
 #define	EN_DIAG
 #define	EN_STAT
 #ifndef EN_DMA
 #define EN_DMA		1	/* use DMA? */
 #endif
 #define EN_NOTXDMA	0	/* hook to disable tx DMA only */
 #define EN_NORXDMA	0	/* hook to disable rx DMA only */
 @@ -485,141 +485,119 @@ static struct ifnet *en_vci2ifp(struct e
  * [2] autoconfig stuff
  * [3] ioctl stuff
  * [4] reset -> init -> transmit -> intr -> receive functions
+ *
  */
 /***********************************************************************/
 /*
  * en_read: read a word from the card.   this is the only function
  * that reads from the card.
  */
-STATIC INLINE u_int32_t en_read(sc, r)
+STATIC INLINE u_int32_t en_read(struct en_softc *sc, uint32_t r)
 struct en_softc *sc;
 u_int32_t r;
+{
 #ifdef EN_DEBUG_RANGE
   if (r > MID_MAXOFF || (r % 4))
     panic("en_read out of range, r=0x%x", r);
 #endif
   return(bus_space_read_4(sc->en_memt, sc->en_base, r));
+}
 /*
  * en_write: write a word to the card.   this is the only function that
  * writes to the card.
  */
-STATIC INLINE void en_write(sc, r, v)
+STATIC INLINE void en_write(struct en_softc *sc, uint32_t r, uint32_t v)
 struct en_softc *sc;
 u_int32_t r, v;
+{
 #ifdef EN_DEBUG_RANGE
   if (r > MID_MAXOFF || (r % 4))
     panic("en_write out of range, r=0x%x", r);
 #endif
   bus_space_write_4(sc->en_memt, sc->en_base, r, v);
+}
 /*
  * en_k2sz: convert KBytes to a size parameter (a log2)
  */
-STATIC INLINE int en_k2sz(k)
+STATIC INLINE int en_k2sz(int k)
 int k;
+{
   switch(k) {
     case 1:   return(0);
     case 2:   return(1);
     case 4:   return(2);
     case 8:   return(3);
     case 16:  return(4);
     case 32:  return(5);
     case 64:  return(6);
     case 128: return(7);
     default: panic("en_k2sz");
+  }
   return(0);
+}
 #define en_log2(X) en_k2sz(X)
 /*
  * en_b2sz: convert a DMA burst code to its byte size
  */
-STATIC INLINE int en_b2sz(b)
+STATIC INLINE int en_b2sz(int b)
 int b;
+{
   switch (b) {
     case MIDDMA_WORD:   return(1*4);
     case MIDDMA_2WMAYBE:
     case MIDDMA_2WORD:  return(2*4);
     case MIDDMA_4WMAYBE:
     case MIDDMA_4WORD:  return(4*4);
     case MIDDMA_8WMAYBE:
     case MIDDMA_8WORD:  return(8*4);
     case MIDDMA_16WMAYBE:
     case MIDDMA_16WORD: return(16*4);
     default: panic("en_b2sz");
+  }
   return(0);
+}
 /*
  * en_sz2b: convert a burst size (bytes) to DMA burst code
  */
-STATIC INLINE int en_sz2b(sz)
+STATIC INLINE int en_sz2b(int sz)
 int sz;
+{
   switch (sz) {
     case 1*4:  return(MIDDMA_WORD);
     case 2*4:  return(MIDDMA_2WORD);
     case 4*4:  return(MIDDMA_4WORD);
     case 8*4:  return(MIDDMA_8WORD);
     case 16*4: return(MIDDMA_16WORD);
     default: panic("en_sz2b");
+  }
   return(0);
+}
 /*
  * en_dqneed: calculate number of DTQ/DRQ's needed for a buffer
  */
-STATIC INLINE int en_dqneed(sc, data, len, tx)
+STATIC INLINE int en_dqneed(struct en_softc *sc, void *data, u_int len, u_int tx)
 struct en_softc *sc;
 void *data;
 u_int len, tx;
+{
   int result, needalign, sz;
 #if !defined(MIDWAY_ENIONLY)
 #if !defined(MIDWAY_ADPONLY)
     if (sc->is_adaptec)
 #endif /* !MIDWAY_ADPONLY */
       return(1);	/* adaptec can DMA anything in one go */
 #endif
 #if !defined(MIDWAY_ADPONLY)
     result = 0;
     if (len < EN_MINDMA) {
 @@ -660,31 +638,27 @@ u_int len, tx;
+    }
     return(result);
 #endif	/* !MIDWAY_ADPONLY */
+}
 /*
  * en_mget: get an mbuf chain that can hold totlen bytes and return it
  * (for recv)   [based on am7990_get from if_le and ieget from if_ie]
  * after this call the sum of all the m_len's in the chain will be totlen.
  */
-STATIC INLINE struct mbuf *en_mget(sc, totlen, drqneed)
+STATIC INLINE struct mbuf *en_mget(struct en_softc *sc, u_int totlen, u_int *drqneed)
 struct en_softc *sc;
 u_int totlen, *drqneed;
+{
   struct mbuf *m;
   struct mbuf *top, **mp;
   *drqneed = 0;
   MGETHDR(m, M_DONTWAIT, MT_DATA);
   if (m == NULL)
     return(NULL);
   m->m_pkthdr.rcvif = &sc->enif;
   m->m_pkthdr.len = totlen;
   m->m_len = MHLEN;
   top = NULL;
   mp = &top;
 @@ -715,30 +689,27 @@ u_int totlen, *drqneed;
     *drqneed += en_dqneed(sc, m->m_data, m->m_len, 0);
+  }
   return(top);
+}
 /***********************************************************************/
 /*
  * autoconfig stuff
  */
-void en_attach(sc)
+void en_attach(struct en_softc *sc)
 struct en_softc *sc;
+{
   struct ifnet *ifp = &sc->enif;
   int sz;
   u_int32_t reg, lcv, check, ptr, sav, midvloc;
   /*
    * probe card to determine memory size.   the stupid ENI card always
    * reports to PCI that it needs 4MB of space (2MB regs and 2MB RAM).
    * if it has less than 2MB RAM the addresses wrap in the RAM address space.
    * (i.e. on a 512KB card addresses 0x3ffffc, 0x37fffc, and 0x2ffffc
    * are aliases for 0x27fffc  [note that RAM starts at offset 0x200000]).
    */
 @@ -924,30 +895,27 @@ done_probe:
  * en_dmaprobe: helper function for en_attach.
+ *
  * see how the card handles DMA by running a few DMA tests.   we need
  * to figure out the largest number of bytes we can DMA in one burst
  * ("bestburstlen"), and if the starting address for a burst needs to
  * be aligned on any sort of boundary or not ("alburst").
+ *
  * typical findings:
  * sparc1: bestburstlen=4, alburst=0 (ick, broken DMA!)
  * sparc2: bestburstlen=64, alburst=1
  * p166:   bestburstlen=64, alburst=0
  */
-STATIC void en_dmaprobe(sc)
+STATIC void en_dmaprobe(struct en_softc *sc)
 struct en_softc *sc;
+{
   u_int32_t srcbuf[64], dstbuf[64];
   u_int8_t *sp, *dp;
   int bestalgn, bestnotalgn, lcv, try, fail;
   sc->alburst = 0;
   sp = (u_int8_t *) srcbuf;
   while ((((unsigned long) sp) % MIDDMA_MAXBURST) != 0)
     sp += 4;
   dp = (u_int8_t *) dstbuf;
   while ((((unsigned long) dp) % MIDDMA_MAXBURST) != 0)
     dp += 4;
 @@ -999,32 +967,27 @@ struct en_softc *sc;
       aprint_error_dev(&sc->sc_dev, "WARNING: WMAYBE DMA test failed %d time(s)\n",
 	fail);
     en_dmaplan = en_dma_planB;		/* fall back to plan B */
+  }
+}
 /*
  * en_dmaprobe_doit: do actual testing
  */
 int
-en_dmaprobe_doit(sc, sp, dp, wmtry)
+en_dmaprobe_doit(struct en_softc *sc, uint8_t *sp, uint8_t *dp, int wmtry)
 struct en_softc *sc;
 u_int8_t *sp, *dp;
 int wmtry;
+{
   int lcv, retval = 4, cnt, count;
   u_int32_t reg, bcode, midvloc;
   /*
    * set up a 1k buffer at MID_BUFOFF
    */
   if (sc->en_busreset)
     sc->en_busreset(sc);
   EN_WRITE(sc, MID_RESID, 0x0);	/* reset card before touching RAM */
   midvloc = ((MID_BUFOFF - MID_RAMOFF) / sizeof(u_int32_t)) >> MIDV_LOCTOPSHFT;
 @@ -1135,32 +1098,27 @@ int wmtry;
 /***********************************************************************/
 /*
  * en_ioctl: handle ioctl requests
+ *
  * NOTE: if you add an ioctl to set txspeed, you should choose a new
  * TX channel/slot.   Choose the one with the lowest sc->txslot[slot].nref
  * value, subtract one from sc->txslot[0].nref, add one to the
  * sc->txslot[slot].nref, set sc->txvc2slot[vci] = slot, and then set
  * txspeed[vci].
  */
-STATIC int en_ioctl(ifp, cmd, data)
+STATIC int en_ioctl(struct ifnet *ifp, EN_IOCTL_CMDT cmd, void *data)
 struct ifnet *ifp;
 EN_IOCTL_CMDT cmd;
 void *data;
+{
 #ifdef MISSING_IF_SOFTC
     struct en_softc *sc = (struct en_softc *)device_lookup_private(&en_cd, ifp->if_unit);
 #else
     struct en_softc *sc = (struct en_softc *) ifp->if_softc;
 #endif
     struct ifaddr *ifa = (struct ifaddr *) data;
     struct ifreq *ifr = (struct ifreq *) data;
     struct atm_pseudoioctl *api = (struct atm_pseudoioctl *)data;
 #ifdef NATM
     struct atm_rawioctl *ario = (struct atm_rawioctl *)data;
     int slot;
 #endif
 @@ -1337,32 +1295,27 @@ void *data;
 	default:
 	    error = ifioctl_common(ifp, cmd, data);
 	    break;
+    }
     splx(s);
     return error;
+}
 /*
  * en_rxctl: turn on and off VCs for recv.
  */
-STATIC int en_rxctl(sc, pi, on)
+STATIC int en_rxctl(struct en_softc *sc, struct atm_pseudoioctl *pi, int on)
 struct en_softc *sc;
 struct atm_pseudoioctl *pi;
 int on;
+{
   u_int s, vci, flags, slot;
   u_int32_t oldmode, newmode;
   vci = ATM_PH_VCI(&pi->aph);
   flags = ATM_PH_FLAGS(&pi->aph);
 #ifdef EN_DEBUG
   printf("%s: %s vpi=%d, vci=%d, flags=%d\n", device_xname(&sc->sc_dev),
 	(on) ? "enable" : "disable", ATM_PH_VPI(&pi->aph), vci, flags);
 #endif
   if (ATM_PH_VPI(&pi->aph) || vci >= MID_N_VC)
 @@ -1435,30 +1388,27 @@ int on;
   printf("%s: rx%d: VCI %d is now %s\n", device_xname(&sc->sc_dev), slot, vci,
 	(sc->rxslot[slot].oth_flags & ENOTHER_DRAIN) ? "draining" : "free");
 #endif
   return(0);
+}
 /***********************************************************************/
 /*
  * en_reset: reset the board, throw away work in progress.
  * must en_init to recover.
  */
-void en_reset(sc)
+void en_reset(struct en_softc *sc)
 struct en_softc *sc;
+{
   struct mbuf *m;
   int lcv, slot;
 #ifdef EN_DEBUG
   printf("%s: reset\n", device_xname(&sc->sc_dev));
 #endif
   if (sc->en_busreset)
     sc->en_busreset(sc);
   EN_WRITE(sc, MID_RESID, 0x0);	/* reset hardware */
   /*
 @@ -1510,30 +1460,27 @@ struct en_softc *sc;
       m_freem(m);
+    }
     sc->txslot[lcv].mbsize = 0;
+  }
   return;
+}
 /*
  * en_init: init board and sync the card with the data in the softc.
  */
-STATIC void en_init(sc)
+STATIC void en_init(struct en_softc *sc)
 struct en_softc *sc;
+{
   int vc, slot;
   u_int32_t loc;
 #ifdef ATM_PVCEXT
     struct pvcsif *pvcsif;
 #endif
   if ((sc->enif.if_flags & IFF_UP) == 0) {
 #ifdef ATM_PVCEXT
     LIST_FOREACH(pvcsif, &sc->sif_list, sif_links) {
       if (pvcsif->sif_if.if_flags & IFF_UP) {
 	/*
 	 * down the device only when there is no active pvc subinterface.
 @@ -1631,31 +1578,27 @@ struct en_softc *sc;
   EN_WRITE(sc, MID_INTENA, MID_INT_TX|MID_INT_DMA_OVR|MID_INT_IDENT|
 	MID_INT_LERR|MID_INT_DMA_ERR|MID_INT_DMA_RX|MID_INT_DMA_TX|
 	MID_INT_SERVICE| /* >>> MID_INT_SUNI| XXXCDC<<< */ MID_INT_STATS);
   EN_WRITE(sc, MID_MAST_CSR, MID_SETIPL(sc->ipl)|MID_MCSR_ENDMA|
 	MID_MCSR_ENTX|MID_MCSR_ENRX);
+}
 /*
  * en_loadvc: load a vc tab entry from a slot
  */
-STATIC void en_loadvc(sc, vc)
+STATIC void en_loadvc(struct en_softc *sc, int vc)
 struct en_softc *sc;
 int vc;
+{
   int slot;
   u_int32_t reg = EN_READ(sc, MID_VC(vc));
   reg = MIDV_SETMODE(reg, MIDV_TRASH);
   EN_WRITE(sc, MID_VC(vc), reg);
   DELAY(27);
   if ((slot = sc->rxvc2slot[vc]) == RX_NONE)
     return;
   /* no need to set CRC */
   EN_WRITE(sc, MID_DST_RP(vc), 0);	/* read pointer = 0, desc. start = 0 */
 @@ -1664,30 +1607,27 @@ int vc;
   sc->rxslot[slot].cur = sc->rxslot[slot].start;
 #ifdef EN_DEBUG
     printf("%s: rx%d: assigned to VCI %d\n", device_xname(&sc->sc_dev), slot, vc);
 #endif
+}
 /*
  * en_start: start transmitting the next packet that needs to go out
  * if there is one.    note that atm_output() has already splnet()'d us.
  */
-STATIC void en_start(ifp)
+STATIC void en_start(struct ifnet *ifp)
 struct ifnet *ifp;
+{
 #ifdef MISSING_IF_SOFTC
     struct en_softc *sc = (struct en_softc *)device_lookup_private(&en_cd, ifp->if_unit);
 #else
     struct en_softc *sc = (struct en_softc *) ifp->if_softc;
 #endif
     struct mbuf *m, *lastm, *prev;
     struct atm_pseudohdr *ap, *new_ap;
     int txchan, mlen, got, need, toadd, cellcnt, first;
     u_int32_t atm_vpi, atm_vci, atm_flags, *dat, aal;
     u_int8_t *cp;
     if ((ifp->if_flags & IFF_RUNNING) == 0)
 @@ -1858,31 +1798,27 @@ struct ifnet *ifp;
       en_txdma(sc, txchan);
+  }
   /*NOTREACHED*/
+}
 /*
  * en_mfix: fix a stupid mbuf
  */
 #ifndef __FreeBSD__
-STATIC int en_mfix(sc, mm, prev)
+STATIC int en_mfix(struct en_softc *sc, struct mbuf **mm, struct mbuf *prev)
 struct en_softc *sc;
 struct mbuf **mm, *prev;
+{
   struct mbuf *m, *new;
   u_char *d, *cp;
   int off;
   struct mbuf *nxt;
   m = *mm;
   EN_COUNT(sc->mfix);			/* count # of calls */
 #ifdef EN_DEBUG
   printf("%s: mfix mbuf m_data=%p, m_len=%d\n", device_xname(&sc->sc_dev),
 	m->m_data, m->m_len);
 #endif
 @@ -2066,31 +2002,27 @@ struct mbuf **mm, *prev;
     nxt->m_data = (void *)cp;
+  }
   if (nxt != NULL && nxt->m_len == 0)
       m->m_next = m_free(nxt);
   return(1);
+}
 #endif /* __FreeBSD__ */
 /*
  * en_txdma: start transmit DMA, if possible
  */
-STATIC void en_txdma(sc, chan)
+STATIC void en_txdma(struct en_softc *sc, int chan)
 struct en_softc *sc;
 int chan;
+{
   struct mbuf *tmp;
   struct atm_pseudohdr *ap;
   struct en_launch launch;
   int datalen = 0, dtqneed, len, ncells;
   u_int8_t *cp;
   struct ifnet *ifp;
   memset(&launch, 0, sizeof launch);	/* XXX gcc */
 #ifdef EN_DEBUG
   printf("%s: tx%d: starting...\n", device_xname(&sc->sc_dev), chan);
 #endif
 @@ -2297,32 +2229,27 @@ dequeue_drop:
   IF_DEQUEUE(&sc->txslot[chan].q, tmp);
   if (launch.t != tmp)
     panic("en dequeue drop");
   m_freem(launch.t);
   sc->txslot[chan].mbsize -= launch.mlen;
   goto again;
+}
 /*
  * en_txlaunch: launch an mbuf into the DMA pool!
  */
-STATIC void en_txlaunch(sc, chan, l)
+STATIC void en_txlaunch(struct en_softc *sc, int chan, struct en_launch *l)
 struct en_softc *sc;
 int chan;
 struct en_launch *l;
+{
   struct mbuf *tmp;
   u_int32_t cur = sc->txslot[chan].cur,
 	    start = sc->txslot[chan].start,
 	    stop = sc->txslot[chan].stop,
 	    dma, *data, *datastop, count, bcode;
   int pad, addtail, need, len, needalign, cnt, end, mx;
  /*
   * vars:
   *   need = # bytes card still needs (decr. to zero)
   *   len = # of bytes left in current mbuf
 @@ -2654,30 +2581,27 @@ done:
 #ifdef EN_DEBUG
       printf("%s: tx%d: DONE!   cur now = 0x%x\n",
 		device_xname(&sc->sc_dev), chan, cur);
 #endif
   return;
+}
 /*
  * interrupt handler
  */
-EN_INTR_TYPE en_intr(arg)
+EN_INTR_TYPE en_intr(void *arg)
 void *arg;
+{
   struct en_softc *sc = (struct en_softc *) arg;
   struct mbuf *m;
   struct atm_pseudohdr ah;
   struct ifnet *ifp;
   u_int32_t reg, kick, val, mask, chip, vci, slot, dtq, drq;
   int lcv, idx, need_softserv = 0;
   reg = EN_READ(sc, MID_INTACK);
   if ((reg & MID_INT_ANY) == 0)
     EN_INTR_RET(0); /* not us */
 @@ -2960,30 +2884,27 @@ void *arg;
  * A: if we remove a VCI from the hardware list and we find that we are
  *    out of DRQs we must defer processing until some DRQs become free.
  *    so we must remember to look at this RX VCI/slot later, but we can't
  *    put it back on the hardware service list (since that isn't allowed).
  *    so we instead save it on the software service list.   it would be nice
  *    if we could peek at the VCI on top of the hwservice list without removing
  *    it, however this leads to a race condition: if we peek at it and
  *    decide we are done with it new data could come in before we have a
  *    chance to remove it from the hwslist.   by the time we get it out of
  *    the list the interrupt for the new data will be lost.   oops!
+ *
  */
-STATIC void en_service(sc)
+STATIC void en_service(struct en_softc *sc)
 struct en_softc *sc;
+{
   struct mbuf *m, *tmp;
   u_int32_t cur, dstart, rbd, pdu, *sav, dma, bcode, count, *data, *datastop;
   u_int32_t start, stop, cnt, needalign;
   int slot, raw, aal5, vci, fill, mlen, tlen, drqneed, need, needfill, end;
   aal5 = 0;		/* Silence gcc */
 next_vci:
   if (sc->swsl_size == 0) {
 #ifdef EN_DEBUG
     printf("%s: en_service done\n", device_xname(&sc->sc_dev));
 #endif
     return;		/* >>> exit here if swsl now empty <<< */
 @@ -3393,30 +3314,27 @@ done:
  * en_dump: dump the state
  */
 #define END_SWSL	0x00000040		/* swsl state */
 #define END_DRQ		0x00000020		/* drq state */
 #define END_DTQ		0x00000010		/* dtq state */
 #define END_RX		0x00000008		/* rx state */
 #define END_TX		0x00000004		/* tx state */
 #define END_MREGS	0x00000002		/* registers */
 #define END_STATS	0x00000001		/* dump stats */
 #define END_BITS "\20\7SWSL\6DRQ\5DTQ\4RX\3TX\2MREGS\1STATS"
-int en_dump(unit, level)
+int en_dump(int unit, int level)
 int unit, level;
+{
   struct en_softc *sc;
   int lcv, cnt, slot;
   u_int32_t ptr, reg;
   for (lcv = 0 ; lcv < en_cd.cd_ndevs ; lcv++) {
     char sbuf[256];
     sc = device_lookup_private(&en_cd, lcv);
     if (sc == NULL) continue;
     if (unit != -1 && unit != lcv)
       continue;
 @@ -3563,30 +3481,27 @@ int unit, level;
       for (cnt = sc->swsl_head ; cnt != sc->swsl_tail ;
 			cnt = (cnt + 1) % MID_SL_N)
         printf("0x%x ", sc->swslist[cnt]);
       printf("\n");
+    }
+  }
   return(0);
+}
 /*
  * en_dumpmem: dump the memory
  */
-int en_dumpmem(unit, addr, len)
+int en_dumpmem(int unit, int addr, int len)
 int unit, addr, len;
+{
   struct en_softc *sc;
   u_int32_t reg;
   sc = device_lookup_private(&en_cd, unit);
   if (sc == NULL) {
     printf("invalid unit number: %d\n", unit);
     return(0);
+  }
   addr = addr & ~3;
   if (addr < MID_RAMOFF || addr + len*4 > MID_MAXOFF || len <= 0) {
     printf("invalid addr/len number: %d, %d\n", addr, len);
     return(0);
 @@ -3602,29 +3517,27 @@ int unit, addr, len;
 #endif
 #ifdef ATM_PVCEXT
 /*
  * ATM PVC extension: shaper control and pvc subinterfaces
  */
 /*
  * the list of the interfaces sharing the physical device.
  * in order to avoid starvation, the interfaces are scheduled in
  * a round-robin fashion when en_start is called from tx complete
  * interrupts.
  */
-static void rrp_add(sc, ifp)
+static void rrp_add(struct en_softc *sc, struct ifnet *ifp)
 	struct en_softc *sc;
 	struct ifnet *ifp;
+{
 	struct rrp *head, *p, *new;
 	head = sc->txrrp;
 	if ((p = head) != NULL) {
 		while (1) {
 			if (p->ifp == ifp) {
 				/* an entry for this ifp already exits */
 				p->nref++;
 				return;
+			}
 			if (p->next == head)
 				break;
 @@ -3645,29 +3558,27 @@ static void rrp_add(sc, ifp)
 	if (p == NULL) {
 		/* this is the only one in the list */
 		new->next = new;
 		sc->txrrp = new;
+	}
 	else {
 		/* add the new entry at the tail of the list */
 		new->next = p->next;
 		p->next = new;
+	}
+}
 #if 0 /* not used */
-static void rrp_delete(sc, ifp)
+static void rrp_delete(struct en_softc *sc, struct ifnet *ifp)
 	struct en_softc *sc;
 	struct ifnet *ifp;
+{
 	struct rrp *head, *p, *prev;
 	head = sc->txrrp;
 	prev = head;
 	if (prev == NULL) {
 		printf("rrp_delete: no list!\n");
 		return;
+	}
 	p = prev->next;
 	while (1) {
 @@ -3737,28 +3648,27 @@ en_pvcattach(struct ifnet *ifp)
 #ifdef ATM_PVCEXT
 	rrp_add(sc, pvc_ifp);
 #endif
 	splx(s);
 	return (pvc_ifp);
+}
 /* txspeed conversion derived from linux drivers/atm/eni.c
    by Werner Almesberger, EPFL LRC */
 static const int pre_div[] = { 4,16,128,2048 };
-static int en_pcr2txspeed(pcr)
+static int en_pcr2txspeed(int pcr)
 	int pcr;
+{
 	int pre, res, div;
 	if (pcr == 0 || pcr > 347222)
 		pre = res = 0;	/* max rate */
 	else {
 		for (pre = 0; pre < 3; pre++)
 			if (25000000/pre_div[pre]/64 <= pcr)
 				break;
 		div = pre_div[pre]*(pcr);
 #if 1
 		/*
 		 * the shaper value should be rounded down,
 @@ -3767,48 +3677,43 @@ static int en_pcr2txspeed(pcr)
 		 */
 		res = (25000000 + div -1)/div - 1;
 #else
 		res = 25000000/div-1;
 #endif
 		if (res < 0)
 			res = 0;
 		if (res > 63)
 			res = 63;
+	}
 	return ((pre << 6) + res);
+}
-static int en_txspeed2pcr(txspeed)
+static int en_txspeed2pcr(int txspeed)
 	int txspeed;
+{
 	int pre, res, pcr;
 	pre = (txspeed >> 6) & 0x3;
 	res = txspeed & 0x3f;
 	pcr = 25000000 / pre_div[pre] / (res+1);
 	return (pcr);
+}
 /*
  * en_txctl selects a hardware transmit channel and sets the shaper value.
  * en_txctl should be called after enabling the vc by en_rxctl
  * since it assumes a transmit channel is already assigned by en_rxctl
  * to the vc.
  */
-static int en_txctl(sc, vci, joint_vci, pcr)
+static int en_txctl(struct en_softc *sc, int vci, int joint_vci, int pcr)
 	struct en_softc *sc;
 	int vci;
 	int joint_vci;
 	int pcr;
+{
 	int txspeed, txchan, s;
 	if (pcr)
 		txspeed = en_pcr2txspeed(pcr);
 	else
 		txspeed = 0;
 	s = splnet();
 	txchan = sc->txvc2slot[vci];
 	sc->txslot[txchan].nref--;
 	/* select a slot */
 @@ -3846,29 +3751,27 @@ static int en_txctl(sc, vci, joint_vci,
 	/* set the shaper parameter */
 	sc->txspeed[vci] = (u_int8_t)txspeed;
 	splx(s);
 #ifdef EN_DEBUG
 	printf("VCI:%d PCR set to %d, tx channel %d\n", vci, pcr, txchan);
 	if (joint_vci != 0)
 		printf("  slot shared with VCI:%d\n", joint_vci);
 #endif
 	return (0);
+}
-static int en_pvctx(sc, pvcreq)
+static int en_pvctx(struct en_softc *sc, struct pvctxreq *pvcreq)
 	struct en_softc *sc;
 	struct pvctxreq *pvcreq;
+{
 	struct ifnet *ifp;
 	struct atm_pseudoioctl api;
 	struct atm_pseudohdr *pvc_aph, *pvc_joint;
 	int vci, joint_vci, pcr;
 	int error = 0;
 	/* check vpi:vci values */
 	pvc_aph = &pvcreq->pvc_aph;
 	pvc_joint = &pvcreq->pvc_joint;
 	vci = ATM_PH_VCI(pvc_aph);
 	joint_vci = ATM_PH_VCI(pvc_joint);
 @@ -3953,29 +3856,27 @@ static int en_pvctx(sc, pvcreq)
 	error = en_txctl(sc, vci, joint_vci, pcr);
 	if (error == 0) {
 		if (sc->txspeed[vci] != 0)
 			pvcreq->pvc_pcr = en_txspeed2pcr(sc->txspeed[vci]);
 		else
 			pvcreq->pvc_pcr = 0;
+	}
 	return error;
+}
-static int en_pvctxget(sc, pvcreq)
+static int en_pvctxget(struct en_softc *sc, struct pvctxreq *pvcreq)
 	struct en_softc *sc;
 	struct pvctxreq *pvcreq;
+{
 	struct pvcsif *pvcsif;
 	struct ifnet *ifp;
 	int vci, slot;
 	if ((ifp = ifunit(pvcreq->pvc_ifname)) == NULL)
 		return (ENXIO);
 	if (ifp == &sc->enif) {
 		/* physical interface: assume vci is specified */
 		struct atm_pseudohdr *pvc_aph;
 		pvc_aph = &pvcreq->pvc_aph;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: aic79xx_inline.h,v 1.16 2008/03/21 08:17:30 dyoung Exp $	*/
+/*	$NetBSD: aic79xx_inline.h,v 1.17 2009/03/15 15:52:12 cegger Exp $	*/
 /*
  * Inline routines shareable across OS platforms.
+ *
  * Copyright (c) 1994-2001 Justin T. Gibbs.
  * Copyright (c) 2000-2003 Adaptec Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions, and the following disclaimer,
 @@ -959,28 +959,27 @@ ahd_intr(void *arg)
 	} else {
 		if ((intstat & SEQINT) != 0)
 			ahd_handle_seqint(ahd, intstat);
 		if ((intstat & SCSIINT) != 0)
 			ahd_handle_scsiint(ahd, intstat);
+	}
 	return (1);
+}
 static __inline void
-ahd_minphys(bp)
+ahd_minphys(struct buf *bp)
         struct buf *bp;
+{
 /*
  * Even though the card can transfer up to 16megs per command
  * we are limited by the number of segments in the DMA segment
  * list that we can hold.  The worst case is that all pages are
  * discontinuous physically, hence the "page per segment" limit
  * enforced here.
  */
         if (bp->b_bcount > AHD_MAXTRANSFER_SIZE) {
                 bp->b_bcount = AHD_MAXTRANSFER_SIZE;
+        }
         minphys(bp);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: esiopvar.h,v 1.16 2007/12/25 18:33:38 perry Exp $	*/
+/*	$NetBSD: esiopvar.h,v 1.17 2009/03/15 15:52:12 cegger Exp $	*/
 /*
  * Copyright (c) 2002 Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -113,29 +113,27 @@ struct esiop_lun {
 /*
  * per target struct; siop_common_cmd->target and siop_common_softc->targets[]
  * will point to this
  */
 struct esiop_target {
 	struct siop_common_target target_c;
 	struct esiop_lun *esiop_lun[8]; /* per-lun state */
 	u_int32_t lun_table_offset; /* pointer to our DSA table */
 };
 static __inline void esiop_table_sync(struct esiop_cmd *, int);
 static __inline void
-esiop_table_sync(esiop_cmd, ops)
+esiop_table_sync(struct esiop_cmd *esiop_cmd, int ops)
 	struct esiop_cmd *esiop_cmd;
 	int ops;
+{
 	struct siop_common_softc *sc  = esiop_cmd->cmd_c.siop_sc;
 	bus_addr_t offset;
 	offset = esiop_cmd->cmd_c.dsa -
 	    esiop_cmd->esiop_cbdp->xferdma->dm_segs[0].ds_addr;
 	bus_dmamap_sync(sc->sc_dmat, esiop_cmd->esiop_cbdp->xferdma, offset,
 	    sizeof(struct esiop_xfer), ops);
+}
 /* Driver internal state */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: aic7xxx_inline.h,v 1.13 2008/02/11 21:43:46 dyoung Exp $	*/
+/*	$NetBSD: aic7xxx_inline.h,v 1.14 2009/03/15 15:52:12 cegger Exp $	*/
 /*
  * Inline routines shareable across OS platforms.
+ *
  * Copyright (c) 1994-2001 Justin T. Gibbs.
  * Copyright (c) 2000-2001 Adaptec Inc.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions, and the following disclaimer,
 @@ -496,28 +496,27 @@ ahc_get_sense_bufaddr(struct ahc_softc *
 	offset = scb - ahc->scb_data->scbarray;
 	return (ahc->scb_data->sense_busaddr
 	      + (offset * sizeof(struct scsi_sense_data)));
+}
 /************************** Interrupt Processing ******************************/
 static __inline void	ahc_sync_qoutfifo(struct ahc_softc *ahc, int op);
 static __inline void	ahc_sync_tqinfifo(struct ahc_softc *ahc, int op);
 static __inline u_int	ahc_check_cmdcmpltqueues(struct ahc_softc *ahc);
 static __inline int	ahc_intr(void *arg);
 static __inline void	ahc_minphys(struct buf *bp);
 static __inline void
-ahc_minphys(bp)
+ahc_minphys(struct buf *bp)
 	struct buf *bp;
+{
 /*
  * Even though the card can transfer up to 16megs per command
  * we are limited by the number of segments in the DMA segment
  * list that we can hold.  The worst case is that all pages are
  * discontinuous physically, hence the "page per segment" limit
  * enforced here.
  */
 	if (bp->b_bcount > AHC_MAXTRANSFER_SIZE) {
 		bp->b_bcount = AHC_MAXTRANSFER_SIZE;
+	}
 	minphys(bp);
+}

	@@ -1,14 +1,14 @@		@@ -1,14 +1,14 @@
1	/* $NetBSD: aic7xxx_osm.h,v 1.20 2008/04/08 12:07:25 cegger Exp $ */	1	/* $NetBSD: aic7xxx_osm.h,v 1.21 2009/03/15 15:52:12 cegger Exp $ */
2		2
3	/*	3	/*
4	* NetBSD platform specific driver option settings, data structures,	4	* NetBSD platform specific driver option settings, data structures,
5	* function declarations and includes.	5	* function declarations and includes.
6	*	6	*
7	* Copyright (c) 1994-2001 Justin T. Gibbs.	7	* Copyright (c) 1994-2001 Justin T. Gibbs.
8	* All rights reserved.	8	* All rights reserved.
9	*	9	*
10	* Redistribution and use in source and binary forms, with or without	10	* Redistribution and use in source and binary forms, with or without
11	* modification, are permitted provided that the following conditions	11	* modification, are permitted provided that the following conditions
12	* are met:	12	* are met:
13	* 1. Redistributions of source code must retain the above copyright	13	* 1. Redistributions of source code must retain the above copyright
14	* notice, this list of conditions, and the following disclaimer,	14	* notice, this list of conditions, and the following disclaimer,
	@@ -287,27 +287,27 @@ ahc_done_lockinit(struct ahc_softc *ahc)		@@ -287,27 +287,27 @@ ahc_done_lockinit(struct ahc_softc *ahc)
287		287
288	static __inline void	288	static __inline void
289	ahc_done_lock(struct ahc_softc ahc, unsigned long flags)	289	ahc_done_lock(struct ahc_softc ahc, unsigned long flags)
290	{	290	{
291	}	291	}
292		292
293	static __inline void	293	static __inline void
294	ahc_done_unlock(struct ahc_softc ahc, unsigned long flags)	294	ahc_done_unlock(struct ahc_softc ahc, unsigned long flags)
295	{	295	{
296	}	296	}
297		297
298	/* Lock held during ahc_list manipulation and ahc softc frees */	298	/* Lock held during ahc_list manipulation and ahc softc frees */
299	static __inline void	299	static __inline void
300	ahc_list_lockinit()	300	ahc_list_lockinit(void)
301	{	301	{
302	}	302	}
303		303
304	static __inline void	304	static __inline void
305	ahc_list_lock(unsigned long *flags)	305	ahc_list_lock(unsigned long *flags)
306	{	306	{
307	}	307	}
308		308
309	static __inline void	309	static __inline void
310	ahc_list_unlock(unsigned long *flags)	310	ahc_list_unlock(unsigned long *flags)
311	{	311	{
312	}	312	}
313	/**************************** OS Primitives *******************************/	313	/**************************** OS Primitives *******************************/

 @@ -1,14 +1,14 @@
-/*	$NetBSD: esiop.c,v 1.44 2009/03/14 21:04:19 dsl Exp $	*/
+/*	$NetBSD: esiop.c,v 1.45 2009/03/15 15:52:12 cegger Exp $	*/
 /*
  * Copyright (c) 2002 Manuel Bouyer.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
 @@ -23,27 +23,27 @@
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 /* SYM53c7/8xx PCI-SCSI I/O Processors driver */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esiop.c,v 1.44 2009/03/14 21:04:19 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esiop.c,v 1.45 2009/03/15 15:52:12 cegger Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/kernel.h>
 #include <uvm/uvm_extern.h>
 #include <machine/endian.h>
 #include <sys/bus.h>
 @@ -2145,24 +2145,24 @@ esiop_target_register(struct esiop_softc
 		if (esiop_lun == NULL)
 			continue;
 		if (esiop_lun->lun_tagtbl)
 			esiop_script_write(sc, esiop_target->lun_table_offset +
 			   lun * 2 + A_target_luntbl_tag / sizeof(u_int32_t),
 			    esiop_lun->lun_tagtbl->tbl_dsa);
+	}
 	esiop_script_sync(sc,
 	    BUS_DMASYNC_PREREAD |  BUS_DMASYNC_PREWRITE);
+}
 #ifdef SIOP_STATS
 void
-esiop_printstats()
+esiop_printstats(void)
+{
 	printf("esiop_stat_intr %d\n", esiop_stat_intr);
 	printf("esiop_stat_intr_shortxfer %d\n", esiop_stat_intr_shortxfer);
 	printf("esiop_stat_intr_xferdisc %d\n", esiop_stat_intr_xferdisc);
 	printf("esiop_stat_intr_sdp %d\n", esiop_stat_intr_sdp);
 	printf("esiop_stat_intr_done %d\n", esiop_stat_intr_done);
 	printf("esiop_stat_intr_lunresel %d\n", esiop_stat_intr_lunresel);
 	printf("esiop_stat_intr_qfull %d\n", esiop_stat_intr_qfull);
+}
 #endif

 @@ -1,14 +1,14 @@
-/* $NetBSD: pcdisplayvar.h,v 1.18 2006/05/14 21:42:27 elad Exp $ */
+/* $NetBSD: pcdisplayvar.h,v 1.19 2009/03/15 15:52:12 cegger Exp $ */
 /*
  * Copyright (c) 1998
  *	Matthias Drochner.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -45,38 +45,34 @@ struct pcdisplayscreen {
 	int dispoffset; 	/* offset of displayed area in video mem */
 	int visibleoffset;
 };
 struct pcdisplay_handle {
 	bus_space_tag_t	ph_iot, ph_memt;
 	bus_space_handle_t ph_ioh_6845, ph_memh;
 };
 static __inline u_int8_t _pcdisplay_6845_read(struct pcdisplay_handle *, int);
 static __inline void _pcdisplay_6845_write(struct pcdisplay_handle *, int,
 					 u_int8_t);
-static __inline u_int8_t _pcdisplay_6845_read(ph, reg)
+static __inline u_int8_t _pcdisplay_6845_read(struct pcdisplay_handle *ph, int reg)
 	struct pcdisplay_handle *ph;
 	int reg;
+{
 	bus_space_write_1(ph->ph_iot, ph->ph_ioh_6845, MC6845_INDEX, reg);
 	return (bus_space_read_1(ph->ph_iot, ph->ph_ioh_6845, MC6845_DATA));
+}
-static __inline void _pcdisplay_6845_write(ph, reg, val)
+static __inline void _pcdisplay_6845_write(struct pcdisplay_handle *ph,
-	struct pcdisplay_handle *ph;
+					int reg, uint8_t val)
 	int reg;
 	u_int8_t val;
+{
 	bus_space_write_1(ph->ph_iot, ph->ph_ioh_6845, MC6845_INDEX, reg);
 	bus_space_write_1(ph->ph_iot, ph->ph_ioh_6845, MC6845_DATA, val);
+}
 #define pcdisplay_6845_read(ph, reg) \
 	_pcdisplay_6845_read(ph, offsetof(struct reg_mc6845, reg))
 #define pcdisplay_6845_write(ph, reg, val) \
 	_pcdisplay_6845_write(ph, offsetof(struct reg_mc6845, reg), val)
 void	pcdisplay_cursor_init(struct pcdisplayscreen *, int);
 void	pcdisplay_cursor(void *, int, int, int);
 #if 0