summaryrefslogtreecommitdiff
path: root/sys/dev/dec
diff options
context:
space:
mode:
authortsutsui <tsutsui@NetBSD.org>2008-04-04 12:25:06 +0000
committertsutsui <tsutsui@NetBSD.org>2008-04-04 12:25:06 +0000
commitd9941582bf2ed3c32007f8d190c32330e9a8eadc (patch)
tree1ceb0a5b06e7dd35e49e0b72d86e03db43264454 /sys/dev/dec
parent960221ac26ae963a388e823d7219f115452067ad (diff)
Split device_t/softc for le(4) and variants and misc cosmetic changes.
Diffstat (limited to 'sys/dev/dec')
-rw-r--r--sys/dev/dec/if_le_dec.c32
1 files changed, 12 insertions, 20 deletions
diff --git a/sys/dev/dec/if_le_dec.c b/sys/dev/dec/if_le_dec.c
index 449843efbfd..6215460d240 100644
--- a/sys/dev/dec/if_le_dec.c
+++ b/sys/dev/dec/if_le_dec.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le_dec.c,v 1.18 2007/10/19 11:59:40 ad Exp $ */
+/* $NetBSD: if_le_dec.c,v 1.19 2008/04/04 12:25:07 tsutsui Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -73,7 +73,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_le_dec.c,v 1.18 2007/10/19 11:59:40 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_le_dec.c,v 1.19 2008/04/04 12:25:07 tsutsui Exp $");
#include "opt_inet.h"
#include "bpfilter.h"
@@ -105,7 +105,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_le_dec.c,v 1.18 2007/10/19 11:59:40 ad Exp $");
#include <sys/bus.h>
/* access LANCE registers */
-void le_dec_writereg(volatile u_short *regptr, u_short val);
+void le_dec_writereg(volatile uint16_t *regptr, uint16_t val);
#define LERDWR(cntl, src, dst) { (dst) = (src); tc_mb(); }
#define LEWREG(src, dst) le_dec_writereg(&(dst), (src))
@@ -121,13 +121,11 @@ void le_dec_writereg(volatile u_short *regptr, u_short val);
#define hide static
#endif
-hide void le_dec_wrcsr(struct lance_softc *, u_int16_t, u_int16_t);
-hide u_int16_t le_dec_rdcsr(struct lance_softc *, u_int16_t);
+hide void le_dec_wrcsr(struct lance_softc *, uint16_t, uint16_t);
+hide uint16_t le_dec_rdcsr(struct lance_softc *, uint16_t);
void
-dec_le_common_attach(sc, eap)
- struct am7990_softc *sc;
- u_char *eap;
+dec_le_common_attach(struct am7990_softc *sc, uint8_t *eap)
{
int i;
@@ -151,9 +149,7 @@ dec_le_common_attach(sc, eap)
}
hide void
-le_dec_wrcsr(sc, port, val)
- struct lance_softc *sc;
- u_int16_t port, val;
+le_dec_wrcsr(struct lance_softc *sc, uint16_t port, uint16_t val)
{
struct lereg1 *ler1 = ((struct le_softc *)sc)->sc_r1;
@@ -161,13 +157,11 @@ le_dec_wrcsr(sc, port, val)
LERDWR(port, val, ler1->ler1_rdp);
}
-hide u_int16_t
-le_dec_rdcsr(sc, port)
- struct lance_softc *sc;
- u_int16_t port;
+hide uint16_t
+le_dec_rdcsr(struct lance_softc *sc, uint16_t port)
{
struct lereg1 *ler1 = ((struct le_softc *)sc)->sc_r1;
- u_int16_t val;
+ uint16_t val;
LEWREG(port, ler1->ler1_rap);
LERDWR(0, ler1->ler1_rdp, val);
@@ -180,11 +174,9 @@ le_dec_rdcsr(sc, port)
* pokey sometimes.
*/
void
-le_dec_writereg(regptr, val)
- register volatile u_short *regptr;
- register u_short val;
+le_dec_writereg(volatile uint16_t *regptr, uint16_t val)
{
- register int i = 0;
+ int i = 0;
while (*regptr != val) {
*regptr = val;