 @@ -1,14 +1,14 @@
-/* $NetBSD: if_xb.c,v 1.22 2009/03/14 21:04:01 dsl Exp $ */
+/* $NetBSD: if_xb.c,v 1.23 2009/03/17 18:19:15 dsl Exp $ */
 /* [Notice revision 2.2]
  * Copyright (c) 1997, 1998 Avalon Computer Systems, Inc.
  * All rights reserved.
+ *
  * Author: Ross Harvey
+ *
  * 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 and
  *    author notice, this list of conditions, and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -64,27 +64,27 @@
  * will combine two 64-bit stores before they get off-chip.) Also, the rtmon
  * driver wasn't DMA either, so at least the NetBSD driver is as good as any
  * other that exists now.
+ *
  * We'll do DMA and specialized transport ops later. Given the high speed of
  * the PIO mode, no current applications require DMA bandwidth, but everyone
  * benefits from low latency. The PIO mode is actually lower in latency
  * anyway.
  */
 #include "opt_avalon_a12.h"		/* Config options headers */
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: if_xb.c,v 1.22 2009/03/14 21:04:01 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xb.c,v 1.23 2009/03/17 18:19:15 dsl Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/socket.h>
 #include <sys/mbuf.h>
 #include <sys/sockio.h>
 #include <uvm/uvm_extern.h>
 #include <net/if.h>
 @@ -216,27 +216,27 @@ xbmatch(struct device *parent, struct cf
 	return	cputype == ST_AVALON_A12
 		&& !xbfound;
+}
 void
 xbattach(struct device *parent, struct device *self, void *aux)
+{
 	struct xb_config *ccp;
 	strcpy(xbi.if_xname, self->dv_xname);
 	xbfound = 1;
 	ccp = &xb_configuration;
 	xb_init_config(ccp, 1);
-	printf(": driver %s mtu %lu\n", "$Revision: 1.22 $", xbi.if_mtu);
+	printf(": driver %s mtu %lu\n", "$Revision: 1.23 $", xbi.if_mtu);
+}
 static void
 xb_init_config(struct xb_config *ccp, int mallocsafe)
+{
 	/*
 	 * The driver actually only needs about 64 bytes of buffer but with a
 	 * nice contiguous frame we can call m_devget()
 	 */
 	if (mallocsafe && xb_incoming == NULL) {
 		xb_incoming = malloc(xb_incoming_max, M_DEVBUF, M_NOWAIT);
 		if (xb_incoming == NULL)
 			DIE();
 @@ -695,27 +695,27 @@ set_interrupt_on_fifo_empty(void)
 	REGVAL(A12_OMR) |= A12_OMR_OMF_ENABLE;
 	alpha_mb();
 	if(xb_fifo_empty()) {
 		REGVAL(A12_OMR) &= ~A12_OMR_OMF_ENABLE;
 		alpha_mb();
 		return 1;
+	}
 	return 0;
+}
 /*
  * Write an aligned block of switch words to the FIFO
  */
 Static void
-xb_mcrp_write(long *d, n, islast)
+xb_mcrp_write(long *d, int n, int islast)
+{
 	volatile long *xb_fifo = islast ? REGADDR(A12_FIFO_LWE)
 					: REGADDR(A12_FIFO);
 	int i;
 	if (XB_DEBUG && islast && n != 1)
 		DIE();
 	n <<= 1;
 	for (i = 0; i < n; i += 2) {
 		xb_onefree();
 		xb_fifo[0] = d[i];
 		xb_fifo[1] = d[i+1];
 		alpha_wmb();

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ctu.c,v 1.6 2009/03/14 21:04:16 dsl Exp $ */
+/*	$NetBSD: ctu.c,v 1.7 2009/03/17 18:19:15 dsl Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
  * 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.
  * 3. All advertising materials mentioning features or use of this software
 @@ -56,27 +56,27 @@ enum tu_state {
 volatile struct tu_softc {
 	enum	tu_state sc_state;
 	char	sc_rsp[15];	/* Should be struct rsb; but don't work */
 	u_char	*sc_xfptr;	/* Current char to xfer */
 	int	sc_nbytes;	/* Number of bytes to xfer */
 	int	sc_xbytes;	/* Number of xfer'd bytes */
 	int	sc_bbytes;	/* Number of xfer'd bytes this block */
 } tu_sc;
 void	ctutintr(void);
 void	cturintr(void);
 int
-ctuopen(struct open_file *f, adapt, int ctlr, int unit, int part)
+ctuopen(struct open_file *f, int adapt, int ctlr, int unit, int part)
+{
 	tu_sc.sc_state = SC_INIT;
 	mtpr(RSP_TYP_INIT, PR_CSTD);
 	cturintr();
 	tu_sc.sc_state = SC_READY;
 	return 0;
+}
 int
 ctustrategy(void *f, int func, daddr_t dblk, size_t size, void *buf, size_t *rsize)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: mfm.c,v 1.8 2009/03/14 21:04:16 dsl Exp $	*/
+/*	$NetBSD: mfm.c,v 1.9 2009/03/17 18:19:15 dsl Exp $	*/
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Ludd by
  * Bertram Barth.
+ *
  * 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
 @@ -349,27 +349,27 @@ display_xbn(struct mfm_xbn *p)
 	printf("seek-rate: %d, crc/eec: %s, RCT: %d, RCT-copies: %d\n",
 	    p->seek_rate, p->crc_eec ? "EEC" : "CRC", p->rct, p->rct_ncopies);
 	printf("media-ID: 0x%x, interleave: %d, headskew: %d, cylskew: %d\n",
 	    &p->media_id, p->interleave, p->headskew, p->cylskew);
 	printf("gap0: %d, gap1: %d, gap2: %d, gap3: %d, sync-value: %d\n",
 	    p->gap0_size, p->gap1_size, p->gap2_size, p->gap3_size,
 	    p->sync_value);
 	printf("serial: %d, checksum: %d, size: %d, reserved: %32c\n",
 	    p->serial_number, p->checksum, sizeof(*p), p->reserved);
+}
 #endif
 int
-mfmopen(struct open_file *f, adapt, int ctlr, int unit, int part)
+mfmopen(struct open_file *f, int adapt, int ctlr, int unit, int part)
+{
 	char *msg;
 	struct disklabel *lp = &mfmlabel;
 	struct mfm_softc *msc = &mfm_softc;
 	int err;
 	size_t i;
 	bzero(lp, sizeof(struct disklabel));
 	msc->unit = unit;
 	msc->part = part;
 	err = mfmstrategy(msc, F_READ, LABELSECTOR, DEV_BSIZE, io_buf, &i);
 	if (err) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tmscp.c,v 1.7 2009/03/14 21:04:16 dsl Exp $ */
+/*	$NetBSD: tmscp.c,v 1.8 2009/03/17 18:19:15 dsl Exp $ */
 /*
  * Copyright (c) 1995 Ludd, University of Lule}, Sweden.
  * 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.
  * 3. All advertising materials mentioning features or use of this software
 @@ -67,27 +67,27 @@ static volatile struct uda {
 } uda;
 struct  udadevice {
 	short udaip;
 	short udasa;
 };
 static volatile struct uda *ubauda;
 static volatile struct udadevice *udacsr;
 static struct ra_softc ra_softc;
 static int curblock;
-tmscpopen(struct open_file *f, adapt, int ctlr, int unit, int part)
+tmscpopen(struct open_file *f, int adapt, int ctlr, int unit, int part)
+{
 	char *msg;
 	extern u_int tmsaddr;
 	volatile struct ra_softc *ra=&ra_softc;
 	volatile u_int *nisse;
 	unsigned short johan;
 	int i,err;
 	curblock = 0;
 	if(adapt>nuba) return(EADAPT);
 	if(ctlr>nuda) return(ECTLR);
 	ra->udaddr=uioaddr[adapt]+tmsaddr;
 	ra->ubaddr=(int)ubaaddr[adapt];

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_hp.c,v 1.47 2009/03/14 21:04:20 dsl Exp $	*/
+/*	$NetBSD: if_hp.c,v 1.48 2009/03/17 18:19:15 dsl Exp $	*/
 /* XXX THIS DRIVER IS BROKEN.  IT WILL NOT EVEN COMPILE. */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * 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
 @@ -70,27 +70,27 @@
  * insight on the ne2000 gained from Robert Clements PC/FTP driver.
+ *
  * receive bottom end totally rewritten by Curt Mayer, Dec 1992.
  * no longer loses back to back packets.
  * note to driver writers: RTFM!
+ *
  * hooks for packet filter added by Charles Hannum, 29DEC1992.
+ *
  * Mostly rewritten for HP-labelled EISA controllers by Charles Hannum,
  * 18JAN1993.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_hp.c,v 1.47 2009/03/14 21:04:20 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hp.c,v 1.48 2009/03/17 18:19:15 dsl Exp $");
 #include "hp.h"
 #if NHP > 0
 #include "opt_inet.h"
 #include "rnd.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/buf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 @@ -233,27 +233,27 @@ hpprobe(struct isa_device *dvp)
 		splx(s);
 		return (0);
+	}
 #endif
 	outb(hpc + hp_option, 0);
 	splx(s);
 	return (32);
+}
 /*
  * Fetch from onboard ROM/RAM
  */
-hpfetch(struct hp_softc *ns, void *up, ad, len)
+hpfetch(struct hp_softc *ns, void *up, int ad, int len)
+{
 	u_char  cmd;
 	int	hpc = ns->ns_port;
 	int     counter = 100000;
 	outb(hpc + hp_option, inb(hpc + hp_option) | HP_DATA);
 	cmd = inb(hpc + ds_cmd);
 	outb(hpc + ds_cmd, DSCM_NODMA | DSCM_PG0 | DSCM_START);
 	/* Setup remote DMA */
 	outb(hpc + ds0_isr, DSIS_RDC);
 @@ -293,27 +293,27 @@ hpfetch(struct hp_softc *ns, void *up, a
 	printf("hpfetch: done len=%d\n", len);
 #endif
 	/* Wait till done, then shutdown feature */
 	while ((inb(hpc + ds0_isr) & DSIS_RDC) == 0 && counter-- > 0);
 	outb(hpc + ds0_isr, DSIS_RDC);
 	outb(hpc + ds_cmd, cmd);
 	outb(hpc + hp_option, inb(hpc + hp_option) & ~HP_DATA);
+}
 /*
  * Put to onboard RAM
  */
-hpput(struct hp_softc *ns, void *up, ad, len)
+hpput(struct hp_softc *ns, void *up, int ad, int len)
+{
 	u_char  cmd;
 	int	hpc = ns->ns_port;
 	int     counter = 100000;
 	outb(hpc + hp_option, inb(hpc + hp_option) | HP_DATA);
 	cmd = inb(hpc + ds_cmd);
 	outb(hpc + ds_cmd, DSCM_NODMA | DSCM_PG0 | DSCM_START);
 	/* Setup for remote DMA */
 	outb(hpc + ds0_isr, DSIS_RDC);