Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove register declarations.

Browse Source
This commit is contained in:
augustss 2000-03-30 12:41:09 +00:00
parent 641df97d12
commit 169ac5b3c1
99 changed files with 1206 additions and 1206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
sys/dev/ccd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ccd.c,v 1.67 2000/03/16 03:54:01 enami Exp $ */
/* $NetBSD: ccd.c,v 1.68 2000/03/30 12:45:27 augustss Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999 The NetBSD Foundation, Inc.
@ -217,9 +217,9 @@ ccdinit(cs, cpaths, vpp, p)
struct vnode **vpp;
struct proc *p;
{
register struct ccdcinfo *ci = NULL;
register size_t size;
register int ix;
struct ccdcinfo *ci = NULL;
size_t size;
int ix;
struct vattr va;
size_t minsize;
int maxsecsize;
@ -376,12 +376,12 @@ ccdinit(cs, cpaths, vpp, p)
static void
ccdinterleave(cs)
register struct ccd_softc *cs;
struct ccd_softc *cs;
{
register struct ccdcinfo *ci, *smallci;
register struct ccdiinfo *ii;
register daddr_t bn, lbn;
register int ix;
struct ccdcinfo *ci, *smallci;
struct ccdiinfo *ii;
daddr_t bn, lbn;
int ix;
u_long size;
#ifdef DEBUG
@ -585,11 +585,11 @@ ccdclose(dev, flags, fmt, p)
void
ccdstrategy(bp)
register struct buf *bp;
struct buf *bp;
{
register int unit = ccdunit(bp->b_dev);
register struct ccd_softc *cs = &ccd_softc[unit];
register int s;
int unit = ccdunit(bp->b_dev);
struct ccd_softc *cs = &ccd_softc[unit];
int s;
int wlabel;
struct disklabel *lp;
@ -637,10 +637,10 @@ done:
static void
ccdstart(cs, bp)
register struct ccd_softc *cs;
register struct buf *bp;
struct ccd_softc *cs;
struct buf *bp;
{
register long bcount, rcount;
long bcount, rcount;
struct ccdbuf *cbp;
caddr_t addr;
daddr_t bn;
@ -705,16 +705,16 @@ ccdstart(cs, bp)
*/
static struct ccdbuf *
ccdbuffer(cs, bp, bn, addr, bcount)
register struct ccd_softc *cs;
struct ccd_softc *cs;
struct buf *bp;
daddr_t bn;
caddr_t addr;
long bcount;
{
register struct ccdcinfo *ci;
register struct ccdbuf *cbp;
register daddr_t cbn, cboff;
register u_int64_t cbc;
struct ccdcinfo *ci;
struct ccdbuf *cbp;
daddr_t cbn, cboff;
u_int64_t cbc;
int ccdisk;
#ifdef DEBUG
@ -732,7 +732,7 @@ ccdbuffer(cs, bp, bn, addr, bcount)
* Serially concatenated
*/
if (cs->sc_ileave == 0) {
register daddr_t sblk;
daddr_t sblk;
sblk = 0;
for (ccdisk = 0, ci = &cs->sc_cinfo[ccdisk];
@ -745,7 +745,7 @@ ccdbuffer(cs, bp, bn, addr, bcount)
* Interleaved
*/
else {
register struct ccdiinfo *ii;
struct ccdiinfo *ii;
int off;
cboff = cbn % cs->sc_ileave;
@ -806,8 +806,8 @@ ccdbuffer(cs, bp, bn, addr, bcount)
static void
ccdintr(cs, bp)
register struct ccd_softc *cs;
register struct buf *bp;
struct ccd_softc *cs;
struct buf *bp;
{
#ifdef DEBUG
@ -1390,7 +1390,7 @@ static void
printiinfo(ii)
struct ccdiinfo *ii;
{
register int ix, i;
int ix, i;
for (ix = 0; ii->ii_ndisk; ix++, ii++) {
printf(" itab[%d]: #dk %d sblk %d soff %d",

4
sys/dev/cons.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cons.c,v 1.34 2000/03/06 21:36:12 thorpej Exp $ */
/* $NetBSD: cons.c,v 1.35 2000/03/30 12:45:27 augustss Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -239,7 +239,7 @@ cngetc()
void
cnputc(c)
register int c;
int c;
{
if (cn_tab == NULL)

4
sys/dev/eisa/eisa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: eisa.c,v 1.21 1998/06/08 07:04:46 thorpej Exp $ */
/* $NetBSD: eisa.c,v 1.22 2000/03/30 12:45:28 augustss Exp $ */
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@ -82,7 +82,7 @@ eisaprint(aux, pnp)
void *aux;
const char *pnp;
{
register struct eisa_attach_args *ea = aux;
struct eisa_attach_args *ea = aux;
char devinfo[256];
if (pnp) {

6
sys/dev/eisa/if_fea.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_fea.c,v 1.19 1998/07/05 00:51:18 jonathan Exp $ */
/* $NetBSD: if_fea.c,v 1.20 2000/03/30 12:45:28 augustss Exp $ */
/*-
* Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
@ -396,8 +396,8 @@ pdq_eisa_attach(
void *aux)
{
pdq_softc_t *sc = (pdq_softc_t *) self;
register struct isa_attach_args *ia = (struct isa_attach_args *) aux;
register struct ifnet *ifp = &sc->sc_if;
struct isa_attach_args *ia = (struct isa_attach_args *) aux;
struct ifnet *ifp = &sc->sc_if;
sc->sc_if.if_unit = sc->sc_dev.dv_unit;
sc->sc_if.if_name = "fea";

4
sys/dev/ic/aha.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: aha.c,v 1.27 2000/03/23 17:51:51 thorpej Exp $ */
/* $NetBSD: aha.c,v 1.28 2000/03/30 12:45:28 augustss Exp $ */
#include "opt_ddb.h"
@ -148,7 +148,7 @@ aha_cmd(iot, ioh, sc, icnt, ibuf, ocnt, obuf)
u_char *ibuf, *obuf;
{
const char *name;
register int i;
int i;
int wait;
u_char sts;
u_char opcode = ibuf[0];

26
sys/dev/ic/aic6360.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: aic6360.c,v 1.68 2000/03/30 02:02:53 simonb Exp $ */
/* $NetBSD: aic6360.c,v 1.69 2000/03/30 12:45:29 augustss Exp $ */
#include "opt_ddb.h"
#ifdef DDB
@ -803,7 +803,7 @@ abort:
*/
void
aic_sched(sc)
register struct aic_softc *sc;
struct aic_softc *sc;
{
struct aic_acb *acb;
struct scsipi_link *sc_link;
@ -971,7 +971,7 @@ aic_dequeue(sc, acb)
*/
void
aic_msgin(sc)
register struct aic_softc *sc;
struct aic_softc *sc;
{
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh = sc->sc_ioh;
@ -1248,7 +1248,7 @@ out:
*/
void
aic_msgout(sc)
register struct aic_softc *sc;
struct aic_softc *sc;
{
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh = sc->sc_ioh;
@ -1442,13 +1442,13 @@ out:
*/
int
aic_dataout_pio(sc, p, n)
register struct aic_softc *sc;
struct aic_softc *sc;
u_char *p;
int n;
{
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh = sc->sc_ioh;
register u_char dmastat = 0;
u_char dmastat = 0;
int out = 0;
#define DOUTAMOUNT 128 /* Full FIFO */
@ -1493,7 +1493,7 @@ aic_dataout_pio(sc, p, n)
p += DOUTAMOUNT;
} else {
register int xfer;
int xfer;
xfer = n;
AIC_MISC(("%d> ", xfer));
@ -1588,13 +1588,13 @@ phasechange:
*/
int
aic_datain_pio(sc, p, n)
register struct aic_softc *sc;
struct aic_softc *sc;
u_char *p;
int n;
{
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh = sc->sc_ioh;
register u_char dmastat;
u_char dmastat;
int in = 0;
#define DINAMOUNT 128 /* Full FIFO */
@ -1637,7 +1637,7 @@ aic_datain_pio(sc, p, n)
p += DINAMOUNT;
} else {
register int xfer;
int xfer;
xfer = min(bus_space_read_1(iot, ioh, FIFOSTAT), n);
AIC_MISC((">%d ", xfer));
@ -1714,12 +1714,12 @@ int
aicintr(arg)
void *arg;
{
register struct aic_softc *sc = arg;
struct aic_softc *sc = arg;
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh = sc->sc_ioh;
u_char sstat0, sstat1;
register struct aic_acb *acb;
register struct scsipi_link *sc_link;
struct aic_acb *acb;
struct scsipi_link *sc_link;
struct aic_tinfo *ti;
int n;

30
sys/dev/ic/am7930.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: am7930.c,v 1.41 1999/03/14 22:29:01 jonathan Exp $ */
/* $NetBSD: am7930.c,v 1.42 2000/03/30 12:45:29 augustss Exp $ */
/*
* Copyright (c) 1995 Rolf Grossmann
@ -175,8 +175,8 @@ am7930_init(sc)
static void
init_amd(bt, bh)
register bus_space_tag_t bt;
register bus_space_handle_t bh;
bus_space_tag_t bt;
bus_space_handle_t bh;
{
/* disable interrupts */
AM7930_WRITE_REG(bt, bh, cr, AMDR_INIT);
@ -222,7 +222,7 @@ void
am7930_close(addr)
void *addr;
{
register struct am7930_softc *sc = addr;
struct am7930_softc *sc = addr;
DPRINTF(("sa_close: sc=%p\n", sc));
/*
@ -282,11 +282,11 @@ int
am7930_commit_settings(addr)
void *addr;
{
register struct am7930_softc *sc = addr;
register struct mapreg *map;
register bus_space_tag_t bt = sc->sc_bustag;
register bus_space_handle_t bh = sc->sc_bh;
register int s, level;
struct am7930_softc *sc = addr;
struct mapreg *map;
bus_space_tag_t bt = sc->sc_bustag;
bus_space_handle_t bh = sc->sc_bh;
int s, level;
DPRINTF(("sa_commit.\n"));
@ -336,9 +336,9 @@ int
am7930_halt_output(addr)
void *addr;
{
register struct am7930_softc *sc = addr;
register bus_space_tag_t bt = sc->sc_bustag;
register bus_space_handle_t bh = sc->sc_bh;
struct am7930_softc *sc = addr;
bus_space_tag_t bt = sc->sc_bustag;
bus_space_handle_t bh = sc->sc_bh;
/* XXX only halt, if input is also halted ?? */
AM7930_WRITE_REG(bt, bh, cr, AMDR_INIT);
@ -353,9 +353,9 @@ int
am7930_halt_input(addr)
void *addr;
{
register struct am7930_softc *sc = addr;
register bus_space_tag_t bt = sc->sc_bustag;
register bus_space_handle_t bh = sc->sc_bh;
struct am7930_softc *sc = addr;
bus_space_tag_t bt = sc->sc_bustag;
bus_space_handle_t bh = sc->sc_bh;
/* XXX only halt, if output is also halted ?? */
AM7930_WRITE_REG(bt, bh, cr, AMDR_INIT);

24
sys/dev/ic/am7990.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: am7990.c,v 1.56 1999/12/01 00:40:53 thorpej Exp $ */
/* $NetBSD: am7990.c,v 1.57 2000/03/30 12:45:29 augustss Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -164,7 +164,7 @@ am7990_config(sc)
*/
void
am7990_meminit(sc)
register struct lance_softc *sc;
struct lance_softc *sc;
{
u_long a;
int bix;
@ -240,7 +240,7 @@ integrate void
am7990_rint(sc)
struct lance_softc *sc;
{
register int bix;
int bix;
int rp;
struct lermd rmd;
@ -313,9 +313,9 @@ am7990_rint(sc)
integrate void
am7990_tint(sc)
register struct lance_softc *sc;
struct lance_softc *sc;
{
register int bix;
int bix;
struct letmd tmd;
bix = sc->sc_first_td;
@ -398,10 +398,10 @@ am7990_tint(sc)
*/
int
am7990_intr(arg)
register void *arg;
void *arg;
{
register struct lance_softc *sc = arg;
register u_int16_t isr;
struct lance_softc *sc = arg;
u_int16_t isr;
isr = (*sc->sc_rdcsr)(sc, LE_CSR0) | sc->sc_saved_csr0;
sc->sc_saved_csr0 = 0;
@ -493,11 +493,11 @@ am7990_intr(arg)
*/
void
am7990_start(ifp)
register struct ifnet *ifp;
struct ifnet *ifp;
{
register struct lance_softc *sc = ifp->if_softc;
register int bix;
register struct mbuf *m;
struct lance_softc *sc = ifp->if_softc;
int bix;
struct mbuf *m;
struct letmd tmd;
int rp;
int len;

24
sys/dev/ic/am79900.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: am79900.c,v 1.4 1999/12/01 00:40:53 thorpej Exp $ */
/* $NetBSD: am79900.c,v 1.5 2000/03/30 12:45:29 augustss Exp $ */
/*-
* Copyright (c) 1998
@ -130,7 +130,7 @@ am79900_config(sc)
*/
void
am79900_meminit(sc)
register struct lance_softc *sc;
struct lance_softc *sc;
{
u_long a;
int bix;
@ -205,7 +205,7 @@ integrate void
am79900_rint(sc)
struct lance_softc *sc;
{
register int bix;
int bix;
int rp;
struct lermd rmd;
@ -276,9 +276,9 @@ am79900_rint(sc)
integrate void
am79900_tint(sc)
register struct lance_softc *sc;
struct lance_softc *sc;
{
register int bix;
int bix;
struct letmd tmd;
bix = sc->sc_first_td;
@ -358,10 +358,10 @@ am79900_tint(sc)
*/
int
am79900_intr(arg)
register void *arg;
void *arg;
{
register struct lance_softc *sc = arg;
register u_int16_t isr;
struct lance_softc *sc = arg;
u_int16_t isr;
isr = (*sc->sc_rdcsr)(sc, LE_CSR0) | sc->sc_saved_csr0;
sc->sc_saved_csr0 = 0;
@ -443,11 +443,11 @@ am79900_intr(arg)
*/
void
am79900_start(ifp)
register struct ifnet *ifp;
struct ifnet *ifp;
{
register struct lance_softc *sc = ifp->if_softc;
register int bix;
register struct mbuf *m;
struct lance_softc *sc = ifp->if_softc;
int bix;
struct mbuf *m;
struct letmd tmd;
int rp;
int len;

4
sys/dev/ic/bha.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bha.c,v 1.35 2000/03/23 07:01:29 thorpej Exp $ */
/* $NetBSD: bha.c,v 1.36 2000/03/30 12:45:30 augustss Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@ -697,7 +697,7 @@ bha_cmd(iot, ioh, sc, icnt, ibuf, ocnt, obuf)
u_char *ibuf, *obuf;
{
const char *name;
register int i;
int i;
int wait;
u_char sts;
u_char opcode = ibuf[0];

8
sys/dev/ic/cs4231.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cs4231.c,v 1.2 2000/01/28 15:49:44 pk Exp $ */
/* $NetBSD: cs4231.c,v 1.3 2000/03/30 12:45:30 augustss Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@ -193,7 +193,7 @@ cs4231_regdump(label, sc)
void
cs4231_init(sc)
register struct cs4231_softc *sc;
struct cs4231_softc *sc;
{
char *buf;
#if 0
@ -328,7 +328,7 @@ void
cs4231_close(addr)
void *addr;
{
register struct cs4231_softc *sc = addr;
struct cs4231_softc *sc = addr;
DPRINTF(("sa_close: sc=%p\n", sc));
/*
@ -422,7 +422,7 @@ cs4231_get_props(addr)
int
cs4231_query_devinfo(addr, dip)
void *addr;
register mixer_devinfo_t *dip;
mixer_devinfo_t *dip;
{
switch(dip->index) {

40
sys/dev/ic/elink3.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: elink3.c,v 1.78 2000/03/23 07:01:30 thorpej Exp $ */
/* $NetBSD: elink3.c,v 1.79 2000/03/30 12:45:30 augustss Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -311,8 +311,8 @@ ep_reset_cmd(sc, cmd, arg)
struct ep_softc *sc;
u_int cmd, arg;
{
register bus_space_tag_t iot = sc->sc_iot;
register bus_space_handle_t ioh = sc->sc_ioh;
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh = sc->sc_ioh;
bus_space_write_2(iot, ioh, cmd, arg);
ep_finish_reset(iot, ioh);
@ -321,8 +321,8 @@ ep_reset_cmd(sc, cmd, arg)
static inline void
ep_discard_rxtop(iot, ioh)
register bus_space_tag_t iot;
register bus_space_handle_t ioh;
bus_space_tag_t iot;
bus_space_handle_t ioh;
{
int i;
@ -751,9 +751,9 @@ ep_tick(arg)
*/
void
epinit(sc)
register struct ep_softc *sc;
struct ep_softc *sc;
{
register struct ifnet *ifp = &sc->sc_ethercom.ec_if;
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh = sc->sc_ioh;
int i;
@ -872,9 +872,9 @@ epinit(sc)
*/
void
epsetfilter(sc)
register struct ep_softc *sc;
struct ep_softc *sc;
{
register struct ifnet *ifp = &sc->sc_ethercom.ec_if;
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
GO_WINDOW(1); /* Window 1 is operating window */
bus_space_write_2(sc->sc_iot, sc->sc_ioh, ELINK_COMMAND,
@ -887,7 +887,7 @@ int
ep_media_change(ifp)
struct ifnet *ifp;
{
register struct ep_softc *sc = ifp->if_softc;
struct ep_softc *sc = ifp->if_softc;
if (sc->enabled && (ifp->if_flags & IFF_UP) != 0)
epreset(sc);
@ -1073,7 +1073,7 @@ ep_media_status(ifp, req)
struct ifnet *ifp;
struct ifmediareq *req;
{
register struct ep_softc *sc = ifp->if_softc;
struct ep_softc *sc = ifp->if_softc;
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh = sc->sc_ioh;
@ -1124,7 +1124,7 @@ void
epstart(ifp)
struct ifnet *ifp;
{
register struct ep_softc *sc = ifp->if_softc;
struct ep_softc *sc = ifp->if_softc;
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh = sc->sc_ioh;
struct mbuf *m, *m0;
@ -1303,7 +1303,7 @@ readcheck:
*/
static int
epstatus(sc)
register struct ep_softc *sc;
struct ep_softc *sc;
{
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh = sc->sc_ioh;
@ -1348,7 +1348,7 @@ epstatus(sc)
static void
eptxstat(sc)
register struct ep_softc *sc;
struct ep_softc *sc;
{
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh = sc->sc_ioh;
@ -1393,7 +1393,7 @@ int
epintr(arg)
void *arg;
{
register struct ep_softc *sc = arg;
struct ep_softc *sc = arg;
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh = sc->sc_ioh;
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
@ -1486,7 +1486,7 @@ epintr(arg)
void
epread(sc)
register struct ep_softc *sc;
struct ep_softc *sc;
{
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh = sc->sc_ioh;
@ -1756,7 +1756,7 @@ epget(sc, totlen)
int
epioctl(ifp, cmd, data)
register struct ifnet *ifp;
struct ifnet *ifp;
u_long cmd;
caddr_t data;
{
@ -1784,7 +1784,7 @@ epioctl(ifp, cmd, data)
#ifdef NS
case AF_NS:
{
register struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
if (ns_nullhost(*ina))
ina->x_host = *(union ns_host *)
@ -1892,7 +1892,7 @@ epwatchdog(ifp)
void
epstop(sc)
register struct ep_softc *sc;
struct ep_softc *sc;
{
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh = sc->sc_ioh;
@ -1940,7 +1940,7 @@ static void
epshutdown(arg)
void *arg;
{
register struct ep_softc *sc = arg;
struct ep_softc *sc = arg;
int s = splnet();
if (sc->enabled) {

10
sys/dev/ic/elinkxl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: elinkxl.c,v 1.30 2000/03/23 07:01:30 thorpej Exp $ */
/* $NetBSD: elinkxl.c,v 1.31 2000/03/30 12:45:30 augustss Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -704,7 +704,7 @@ ex_mchash(addr)
*/
void
ex_set_mc(sc)
register struct ex_softc *sc;
struct ex_softc *sc;
{
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
struct ethercom *ec = &sc->sc_ethercom;
@ -1285,7 +1285,7 @@ ex_intr(arg)
int
ex_ioctl(ifp, cmd, data)
register struct ifnet *ifp;
struct ifnet *ifp;
u_long cmd;
caddr_t data;
{
@ -1310,7 +1310,7 @@ ex_ioctl(ifp, cmd, data)
#ifdef NS
case AF_NS:
{
register struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
if (ns_nullhost(*ina))
ina->x_host = *(union ns_host *)
@ -1645,7 +1645,7 @@ static void
ex_shutdown(arg)
void *arg;
{
register struct ex_softc *sc = arg;
struct ex_softc *sc = arg;
ex_stop(sc);
}

4
sys/dev/ic/i82586.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: i82586.c,v 1.25 1999/08/23 12:12:42 pk Exp $ */
/* $NetBSD: i82586.c,v 1.26 2000/03/30 12:45:31 augustss Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -1969,7 +1969,7 @@ iestop(sc)
int
i82586_ioctl(ifp, cmd, data)
register struct ifnet *ifp;
struct ifnet *ifp;
u_long cmd;
caddr_t data;
{

64
sys/dev/ic/lance.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lance.c,v 1.10 1999/11/17 03:42:24 simonb Exp $ */
/* $NetBSD: lance.c,v 1.11 2000/03/30 12:45:31 augustss Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -172,9 +172,9 @@ static inline u_int16_t
ether_cmp(one, two)
void *one, *two;
{
register u_int16_t *a = (u_short *) one;
register u_int16_t *b = (u_short *) two;
register u_int16_t diff;
u_int16_t *a = (u_short *) one;
u_int16_t *b = (u_short *) two;
u_int16_t diff;
#ifdef m68k
/*
@ -319,9 +319,9 @@ lance_stop(sc)
*/
void
lance_init(sc)
register struct lance_softc *sc;
struct lance_softc *sc;
{
register int timo;
int timo;
u_long a;
(*sc->sc_wrcsr)(sc, LE_CSR0, LE_C0_STOP);
@ -374,10 +374,10 @@ int
lance_put(sc, boff, m)
struct lance_softc *sc;
int boff;
register struct mbuf *m;
struct mbuf *m;
{
register struct mbuf *n;
register int len, tlen = 0;
struct mbuf *n;
int len, tlen = 0;
for (; m; m = n) {
len = m->m_len;
@ -461,7 +461,7 @@ bad:
*/
void
lance_read(sc, boff, len)
register struct lance_softc *sc;
struct lance_softc *sc;
int boff, len;
{
struct mbuf *m;
@ -580,11 +580,11 @@ lance_mediastatus(ifp, ifmr)
*/
int
lance_ioctl(ifp, cmd, data)
register struct ifnet *ifp;
struct ifnet *ifp;
u_long cmd;
caddr_t data;
{
register struct lance_softc *sc = ifp->if_softc;
struct lance_softc *sc = ifp->if_softc;
struct ifaddr *ifa = (struct ifaddr *)data;
struct ifreq *ifr = (struct ifreq *)data;
int s, error = 0;
@ -606,7 +606,7 @@ lance_ioctl(ifp, cmd, data)
#ifdef NS
case AF_NS:
{
register struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
if (ns_nullhost(*ina))
ina->x_host =
@ -717,15 +717,15 @@ lance_setladrf(ac, af)
{
struct ifnet *ifp = &ac->ec_if;
struct ether_multi *enm;
register u_char *cp;
register u_int32_t crc;
u_char *cp;
u_int32_t crc;
static const u_int32_t crctab[] = {
0x00000000, 0x1db71064, 0x3b6e20c8, 0x26d930ac,
0x76dc4190, 0x6b6b51f4, 0x4db26158, 0x5005713c,
0xedb88320, 0xf00f9344, 0xd6d6a3e8, 0xcb61b38c,
0x9b64c2b0, 0x86d3d2d4, 0xa00ae278, 0xbdbdf21c
};
register int len;
int len;
struct ether_multistep step;
/*
@ -852,11 +852,11 @@ lance_copytobuf_gap2(sc, fromv, boff, len)
struct lance_softc *sc;
void *fromv;
int boff;
register int len;
int len;
{
volatile caddr_t buf = sc->sc_mem;
register caddr_t from = fromv;
register volatile u_int16_t *bptr;
caddr_t from = fromv;
volatile u_int16_t *bptr;
if (boff & 0x1) {
/* handle unaligned first byte */
@ -883,9 +883,9 @@ lance_copyfrombuf_gap2(sc, tov, boff, len)
int boff, len;
{
volatile caddr_t buf = sc->sc_mem;
register caddr_t to = tov;
register volatile u_int16_t *bptr;
register u_int16_t tmp;
caddr_t to = tov;
volatile u_int16_t *bptr;
u_int16_t tmp;
if (boff & 0x1) {
/* handle unaligned first byte */
@ -912,7 +912,7 @@ lance_zerobuf_gap2(sc, boff, len)
int boff, len;
{
volatile caddr_t buf = sc->sc_mem;
register volatile u_int16_t *bptr;
volatile u_int16_t *bptr;
if ((unsigned)boff & 0x1) {
bptr = ((volatile u_int16_t *)buf) + (boff - 1);
@ -939,12 +939,12 @@ lance_copytobuf_gap16(sc, fromv, boff, len)
struct lance_softc *sc;
void *fromv;
int boff;
register int len;
int len;
{
volatile caddr_t buf = sc->sc_mem;
register caddr_t from = fromv;
register caddr_t bptr;
register int xfer;
caddr_t from = fromv;
caddr_t bptr;
int xfer;
bptr = buf + ((boff << 1) & ~0x1f);
boff &= 0xf;
@ -966,9 +966,9 @@ lance_copyfrombuf_gap16(sc, tov, boff, len)
int boff, len;
{
volatile caddr_t buf = sc->sc_mem;
register caddr_t to = tov;
register caddr_t bptr;
register int xfer;
caddr_t to = tov;
caddr_t bptr;
int xfer;
bptr = buf + ((boff << 1) & ~0x1f);
boff &= 0xf;
@ -989,8 +989,8 @@ lance_zerobuf_gap16(sc, boff, len)
int boff, len;
{
volatile caddr_t buf = sc->sc_mem;
register caddr_t bptr;
register int xfer;
caddr_t bptr;
int xfer;
bptr = buf + ((boff << 1) & ~0x1f);
boff &= 0xf;

8
sys/dev/ic/mb86960.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mb86960.c,v 1.37 2000/02/02 10:45:12 enami Exp $ */
/* $NetBSD: mb86960.c,v 1.38 2000/03/30 12:45:31 augustss Exp $ */
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@ -1566,15 +1566,15 @@ mb86960_getmcaf(ec, af)
{
struct ifnet *ifp = &ec->ec_if;
struct ether_multi *enm;
register u_char *cp;
register u_int32_t crc;
u_char *cp;
u_int32_t crc;
static const u_int32_t crctab[] = {
0x00000000, 0x1db71064, 0x3b6e20c8, 0x26d930ac,
0x76dc4190, 0x6b6b51f4, 0x4db26158, 0x5005713c,
0xedb88320, 0xf00f9344, 0xd6d6a3e8, 0xcb61b38c,
0x9b64c2b0, 0x86d3d2d4, 0xa00ae278, 0xbdbdf21c
};
register int len;
int len;
struct ether_multistep step;
/*

22
sys/dev/ic/rrunner.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rrunner.c,v 1.14 2000/01/21 23:39:58 thorpej Exp $ */
/* $NetBSD: rrunner.c,v 1.15 2000/03/30 12:45:31 augustss Exp $ */
/*
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@ -461,9 +461,9 @@ bad_dmamem_map:
void
eshinit(sc)
register struct esh_softc *sc;
struct esh_softc *sc;
{
register struct ifnet *ifp = &sc->sc_if;
struct ifnet *ifp = &sc->sc_if;
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh = sc->sc_ioh;
struct rr_ring_ctl *ring;
@ -1487,7 +1487,7 @@ int
eshintr(arg)
void *arg;
{
register struct esh_softc *sc = arg;
struct esh_softc *sc = arg;
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh = sc->sc_ioh;
struct ifnet *ifp = &sc->sc_if;
@ -1991,7 +1991,7 @@ void
eshstart(ifp)
struct ifnet *ifp;
{
register struct esh_softc *sc = ifp->if_softc;
struct esh_softc *sc = ifp->if_softc;
struct esh_send_ring_ctl *send = &sc->sc_send;
struct mbuf *m = NULL;
int error;
@ -2227,7 +2227,7 @@ esh_send(sc)
static void
eshstart_cleanup(sc, consumer, error)
register struct esh_softc *sc;
struct esh_softc *sc;
u_int16_t consumer;
int error;
{
@ -2410,7 +2410,7 @@ bogosity:
static void
esh_read_snap_ring(sc, consumer, error)
register struct esh_softc *sc;
struct esh_softc *sc;
u_int16_t consumer;
int error;
{
@ -2702,7 +2702,7 @@ esh_init_fp_rings(sc)
static void
esh_read_fp_ring(sc, consumer, error, ulp)
register struct esh_softc *sc;
struct esh_softc *sc;
u_int16_t consumer;
int error;
int ulp;
@ -3014,7 +3014,7 @@ esh_flush_fp_ring(sc, recv, di)
int
eshioctl(ifp, cmd, data)
register struct ifnet *ifp;
struct ifnet *ifp;
u_long cmd;
caddr_t data;
{
@ -3067,7 +3067,7 @@ eshioctl(ifp, cmd, data)
#ifdef NS
case AF_NS:
{
register struct ns_addr *ina =
struct ns_addr *ina =
&IA_SNS(ifa)->sns_addr;
if (ns_nullhost(*ina))
@ -3388,7 +3388,7 @@ eshwatchdog(ifp)
void
eshstop(sc)
register struct esh_softc *sc;
struct esh_softc *sc;
{
struct ifnet *ifp = &sc->sc_if;
bus_space_tag_t iot = sc->sc_iot;

4
sys/dev/ic/sgec.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sgec.c,v 1.1 1999/08/08 11:41:29 ragge Exp $ */
/* $NetBSD: sgec.c,v 1.2 2000/03/30 12:45:32 augustss Exp $ */
/*
* Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
*
@ -481,7 +481,7 @@ sgec_intr(sc)
*/
int
zeioctl(ifp, cmd, data)
register struct ifnet *ifp;
struct ifnet *ifp;
u_long cmd;
caddr_t data;
{

6
sys/dev/ic/smc90cx6.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: smc90cx6.c,v 1.34 2000/03/23 07:01:32 thorpej Exp $ */
/* $NetBSD: smc90cx6.c,v 1.35 2000/03/30 12:45:32 augustss Exp $ */
/*-
* Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
@ -907,12 +907,12 @@ bah_reconwatch(arg)
*/
int
bah_ioctl(ifp, command, data)
register struct ifnet *ifp;
struct ifnet *ifp;
u_long command;
caddr_t data;
{
struct bah_softc *sc;
register struct ifaddr *ifa;
struct ifaddr *ifa;
struct ifreq *ifr;
int s, error;

12
sys/dev/ic/z8530sc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: z8530sc.c,v 1.11 1999/02/03 20:22:28 mycroft Exp $ */
/* $NetBSD: z8530sc.c,v 1.12 2000/03/30 12:45:32 augustss Exp $ */
/*
* Copyright (c) 1994 Gordon W. Ross
@ -231,8 +231,8 @@ zsc_intr_hard(arg)
void *arg;
{
struct zsc_softc *zsc = arg;
register struct zs_chanstate *cs;
register u_char rr3;
struct zs_chanstate *cs;
u_char rr3;
/* First look at channel A. */
cs = zsc->zsc_cs[0];
@ -281,9 +281,9 @@ int
zsc_intr_soft(arg)
void *arg;
{
register struct zsc_softc *zsc = arg;
register struct zs_chanstate *cs;
register int rval, chan;
struct zsc_softc *zsc = arg;
struct zs_chanstate *cs;
int rval, chan;
rval = 0;
for (chan = 0; chan < 2; chan++) {

8
sys/dev/isa/elink.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: elink.c,v 1.12 1998/08/15 03:51:31 mycroft Exp $ */
/* $NetBSD: elink.c,v 1.13 2000/03/30 12:45:32 augustss Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -117,10 +117,10 @@ void
elink_idseq(iot, ioh, p)
bus_space_tag_t iot;
bus_space_handle_t ioh;
register u_char p;
u_char p;
{
register int i;
register u_char c;
int i;
u_char c;
c = 0xff;
for (i = 255; i; i--) {

8
sys/dev/isa/ics2101.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ics2101.c,v 1.7 1998/06/17 08:17:25 augustss Exp $ */
/* $NetBSD: ics2101.c,v 1.8 2000/03/30 12:45:33 augustss Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -81,9 +81,9 @@ ics2101_mix_doit(sc, chan, side, value, flags)
bus_space_tag_t iot = sc->sc_iot;
unsigned char flip_left[6] = {0x01, 0x01, 0x01, 0x02, 0x01, 0x02};
unsigned char flip_right[6] = {0x02, 0x02, 0x02, 0x01, 0x02, 0x01};
register unsigned char ctrl_addr;
register unsigned char attn_addr;
register unsigned char normal;
unsigned char ctrl_addr;
unsigned char attn_addr;
unsigned char normal;
int s;
if (chan < ICSMIX_CHAN_0 || chan > ICSMIX_CHAN_5)

16
sys/dev/isa/if_eg.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_eg.c,v 1.48 1999/08/25 22:46:16 thorpej Exp $ */
/* $NetBSD: if_eg.c,v 1.49 2000/03/30 12:45:33 augustss Exp $ */
/*
* Copyright (c) 1993 Dean Huxley <dean@fsa.ca>
@ -500,9 +500,9 @@ egattach(parent, self, aux)
void
eginit(sc)
register struct eg_softc *sc;
struct eg_softc *sc;
{
register struct ifnet *ifp = &sc->sc_ethercom.ec_if;
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh = sc->sc_ioh;
@ -588,7 +588,7 @@ void
egstart(ifp)
struct ifnet *ifp;
{
register struct eg_softc *sc = ifp->if_softc;
struct eg_softc *sc = ifp->if_softc;
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh = sc->sc_ioh;
struct mbuf *m0, *m;
@ -660,7 +660,7 @@ int
egintr(arg)
void *arg;
{
register struct eg_softc *sc = arg;
struct eg_softc *sc = arg;
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh = sc->sc_ioh;
int i, len, serviced;
@ -853,7 +853,7 @@ bad:
int
egioctl(ifp, cmd, data)
register struct ifnet *ifp;
struct ifnet *ifp;
u_long cmd;
caddr_t data;
{
@ -878,7 +878,7 @@ egioctl(ifp, cmd, data)
#ifdef NS
case AF_NS:
{
register struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
if (ns_nullhost(*ina))
ina->x_host =
@ -962,7 +962,7 @@ egwatchdog(ifp)
void
egstop(sc)
register struct eg_softc *sc;
struct eg_softc *sc;
{
bus_space_write_1(sc->sc_iot, sc->sc_ioh, EG_CONTROL, 0);

10
sys/dev/isa/if_el.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_el.c,v 1.59 1999/08/25 22:46:16 thorpej Exp $ */
/* $NetBSD: if_el.c,v 1.60 2000/03/30 12:45:33 augustss Exp $ */
/*
* Copyright (c) 1994, Matthew E. Kimmel. Permission is hereby granted
@ -505,7 +505,7 @@ int
elintr(arg)
void *arg;
{
register struct el_softc *sc = arg;
struct el_softc *sc = arg;
bus_space_tag_t iot = sc->sc_iot;
bus_space_handle_t ioh = sc->sc_ioh;
u_int8_t rxstat;
@ -573,7 +573,7 @@ elintr(arg)
*/
void
elread(sc, len)
register struct el_softc *sc;
struct el_softc *sc;
int len;
{
struct ifnet *ifp = &sc->sc_ethercom.ec_if;
@ -689,7 +689,7 @@ bad:
*/
int
elioctl(ifp, cmd, data)
register struct ifnet *ifp;
struct ifnet *ifp;
u_long cmd;
caddr_t data;
{
@ -715,7 +715,7 @@ elioctl(ifp, cmd, data)
/* XXX - This code is probably wrong. */
case AF_NS:
{
register struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
if (ns_nullhost(*ina))
ina->x_host =

44
sys/dev/isa/if_hp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_hp.c,v 1.29 1999/03/25 23:21:38 thorpej Exp $ */
/* $NetBSD: if_hp.c,v 1.30 2000/03/30 12:45:33 augustss Exp $ */
/* XXX THIS DRIVER IS BROKEN. IT WILL NOT EVEN COMPILE. */
@ -161,8 +161,8 @@ hpprobe(dvp)
struct isa_device *dvp;
{
int val, i, s, sum, pat;
register struct hp_softc *ns = &hp_softc[0];
register hpc;
struct hp_softc *ns = &hp_softc[0];
int hpc;
#ifdef lint
hpintr(0);
@ -224,7 +224,7 @@ hpfetch(ns, up, ad, len)
caddr_t up;
{
u_char cmd;
register hpc = ns->ns_port;
int hpc = ns->ns_port;
int counter = 100000;
outb(hpc + hp_option, inb(hpc + hp_option) | HP_DATA);
@ -286,7 +286,7 @@ hpput(ns, up, ad, len)
caddr_t up;
{
u_char cmd;
register hpc = ns->ns_port;
int hpc = ns->ns_port;
int counter = 100000;
outb(hpc + hp_option, inb(hpc + hp_option) | HP_DATA);
@ -358,8 +358,8 @@ hpput(ns, up, ad, len)
hpreset(unit, uban)
int unit, uban;
{
register struct hp_softc *ns = &hp_softc[unit];
register hpc = ns->ns_port;
struct hp_softc *ns = &hp_softc[unit];
int hpc = ns->ns_port;
if (unit >= NHP)
return;
printf("hp%d: reset\n", unit);
@ -407,8 +407,8 @@ hpattach(dvp)
struct isa_device *dvp;
{
int unit = dvp->id_unit;
register struct hp_softc *ns = &hp_softc[unit];
register struct ifnet *ifp = &ns->ns_if;
struct hp_softc *ns = &hp_softc[unit];
struct ifnet *ifp = &ns->ns_if;
ifp->if_unit = unit;
ifp->if_name = hpdriver.name;
@ -442,12 +442,12 @@ hpattach(dvp)
hpinit(unit)
int unit;
{
register struct hp_softc *ns = &hp_softc[unit];
struct hp_softc *ns = &hp_softc[unit];
struct ifnet *ifp = &ns->ns_if;
int s;
int i;
char *cp;
register hpc = ns->ns_port;
int hpc = ns->ns_port;
if (ifp->if_addrlist == (struct ifaddr *) 0)
return;
@ -523,11 +523,11 @@ hpinit(unit)
hpstart(ifp)
struct ifnet *ifp;
{
register struct hp_softc *ns = &hp_softc[ifp->if_unit];
struct hp_softc *ns = &hp_softc[ifp->if_unit];
struct mbuf *m0, *m;
int buffer;
int len, i, total;
register hpc = ns->ns_port;
int hpc = ns->ns_port;
/*
* The DS8390 has only one transmit buffer, if it is busy we
@ -604,9 +604,9 @@ hpstart(ifp)
*/
hpintr(unit)
{
register struct hp_softc *ns = &hp_softc[unit];
struct hp_softc *ns = &hp_softc[unit];
u_char cmd, isr;
register hpc = ns->ns_port;
int hpc = ns->ns_port;
u_char err;
/* Save cmd, clear interrupt */
@ -796,14 +796,14 @@ loop:
* We deal with the trailer protocol here.
*/
hpread(ns, buf, len)
register struct hp_softc *ns;
struct hp_softc *ns;
char *buf;
int len;
{
register struct ether_header *eh;
struct ether_header *eh;
struct mbuf *m;
int off, resid;
register struct ifqueue *inq;
struct ifqueue *inq;
u_short etype;
/*
@ -875,7 +875,7 @@ hpget(buf, totlen, off0, ifp)
{
struct mbuf *top, **mp, *m, *p;
int off = off0, len;
register caddr_t cp = buf;
caddr_t cp = buf;
char *epkt;
buf += sizeof(struct ether_header);
@ -937,11 +937,11 @@ hpget(buf, totlen, off0, ifp)
* Process an ioctl request.
*/
hpioctl(ifp, cmd, data)
register struct ifnet *ifp;
struct ifnet *ifp;
u_long cmd;
caddr_t data;
{
register struct ifaddr *ifa = (struct ifaddr *) data;
struct ifaddr *ifa = (struct ifaddr *) data;
struct hp_softc *ns = &hp_softc[ifp->if_unit];
struct ifreq *ifr = (struct ifreq *) data;
int s = splnet(), error = 0;
@ -964,7 +964,7 @@ hpioctl(ifp, cmd, data)
#ifdef NS
case AF_NS:
{
register struct ns_addr *ina = &(IA_SNS(ifa)->sns_addr);
struct ns_addr *ina = &(IA_SNS(ifa)->sns_addr);
if (ns_nullhost(*ina))
ina->x_host = *(union ns_host *) (ns->ns_addrp);

6
sys/dev/isa/if_iy.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_iy.c,v 1.35 1999/08/25 22:46:16 thorpej Exp $ */
/* $NetBSD: if_iy.c,v 1.36 2000/03/30 12:45:33 augustss Exp $ */
/* #define IYDEBUG */
/* #define IYMEMDEBUG */
@ -862,7 +862,7 @@ iyintr(arg)
bus_space_tag_t iot;
bus_space_handle_t ioh;
register u_short status;
u_short status;
iot = sc->sc_iot;
ioh = sc->sc_ioh;
@ -1071,7 +1071,7 @@ struct iy_softc *sc;
int
iyioctl(ifp, cmd, data)
register struct ifnet *ifp;
struct ifnet *ifp;
u_long cmd;
caddr_t data;
{

8
sys/dev/isa/seagate.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: seagate.c,v 1.35 2000/03/23 07:01:35 thorpej Exp $ */
/* $NetBSD: seagate.c,v 1.36 2000/03/30 12:45:33 augustss Exp $ */
/*
* ST01/02, Future Domain TMC-885, TMC-950 SCSI driver
@ -951,9 +951,9 @@ sea_transfer_pio(sea, phase, count, data)
int *count;
u_char **data;
{
register u_char p = *phase, tmp;
register int c = *count;
register u_char *d = *data;
u_char p = *phase, tmp;
int c = *count;
u_char *d = *data;
int timeout;
do {

8
sys/dev/isa/spkr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: spkr.c,v 1.2 2000/03/06 21:40:08 thorpej Exp $ */
/* $NetBSD: spkr.c,v 1.3 2000/03/30 12:45:33 augustss Exp $ */
/*
* spkr.c -- device driver for console speaker on 80386
@ -151,7 +151,7 @@ playtone(pitch, value, sustain)
/* play tone of proper duration for current rhythm signature */
int pitch, value, sustain;
{
register int sound, silence, snum = 1, sdenom = 1;
int sound, silence, snum = 1, sdenom = 1;
/* this weirdness avoids floating-point arithmetic */
for (; sustain; sustain--)
@ -192,7 +192,7 @@ playstring(cp, slen)
for (; slen--; cp++)
{
int sustain, timeval, tempo;
register char c = toupper(*cp);
char c = toupper(*cp);
#ifdef SPKRDEBUG
printf("playstring: %c (%x)\n", c, c);
@ -413,7 +413,7 @@ spkrwrite(dev, uio, flags)
struct uio *uio;
int flags;
{
register int n;
int n;
int error;
#ifdef SPKRDEBUG
printf("spkrwrite: entering with dev = %x, count = %d\n",

10
sys/dev/mscp/mscp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mscp.c,v 1.11 1999/06/06 19:16:18 ragge Exp $ */
/* $NetBSD: mscp.c,v 1.12 2000/03/30 12:45:34 augustss Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@ -65,12 +65,12 @@
*/
struct mscp *
mscp_getcp(mi, canwait)
register struct mscp_softc *mi;
struct mscp_softc *mi;
int canwait;
{
#define mri (&mi->mi_cmd)
register struct mscp *mp;
register int i;
struct mscp *mp;
int i;
int s = splimp();
again:
@ -129,7 +129,7 @@ int mscp_aeb_xor = 0x8000bb80;
*/
void
mscp_dorsp(mi)
register struct mscp_softc *mi;
struct mscp_softc *mi;
{
struct device *drive;
struct mscp_device *me = mi->mi_me;

44
sys/dev/mscp/mscp_disk.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mscp_disk.c,v 1.22 2000/01/21 23:39:59 thorpej Exp $ */
/* $NetBSD: mscp_disk.c,v 1.23 2000/03/30 12:45:34 augustss Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* Copyright (c) 1988 Regents of the University of California.
@ -205,7 +205,7 @@ raopen(dev, flag, fmt, p)
int flag, fmt;
struct proc *p;
{
register struct ra_softc *ra;
struct ra_softc *ra;
int part, unit, mask;
/*
* Make sure this is a reasonable open request.
@ -266,8 +266,8 @@ raclose(dev, flags, fmt, p)
int flags, fmt;
struct proc *p;
{
register int unit = DISKUNIT(dev);
register struct ra_softc *ra = ra_cd.cd_devs[unit];
int unit = DISKUNIT(dev);
struct ra_softc *ra = ra_cd.cd_devs[unit];
int mask = (1 << DISKPART(dev));
switch (fmt) {
@ -303,10 +303,10 @@ raclose(dev, flags, fmt, p)
*/
void
rastrategy(bp)
register struct buf *bp;
struct buf *bp;
{
register int unit;
register struct ra_softc *ra;
int unit;
struct ra_softc *ra;
/*
* Make sure this is a reasonable drive to use.
*/
@ -379,9 +379,9 @@ raioctl(dev, cmd, data, flag, p)
int flag;
struct proc *p;
{
register int unit = DISKUNIT(dev);
register struct disklabel *lp, *tp;
register struct ra_softc *ra = ra_cd.cd_devs[unit];
int unit = DISKUNIT(dev);
struct disklabel *lp, *tp;
struct ra_softc *ra = ra_cd.cd_devs[unit];
int error = 0;
lp = ra->ra_disk.dk_label;
@ -458,7 +458,7 @@ int
rasize(dev)
dev_t dev;
{
register int unit = DISKUNIT(dev);
int unit = DISKUNIT(dev);
struct ra_softc *ra;
if (unit >= ra_cd.cd_ndevs || ra_cd.cd_devs[unit] == 0)
@ -603,7 +603,7 @@ rxopen(dev, flag, fmt, p)
int flag, fmt;
struct proc *p;
{
register struct rx_softc *rx;
struct rx_softc *rx;
int unit;
/*
@ -646,10 +646,10 @@ rxclose(dev, flags, fmt, p)
*/
void
rxstrategy(bp)
register struct buf *bp;
struct buf *bp;
{
register int unit;
register struct rx_softc *rx;
int unit;
struct rx_softc *rx;
/*
* Make sure this is a reasonable drive to use.
@ -717,9 +717,9 @@ rxioctl(dev, cmd, data, flag, p)
int flag;
struct proc *p;
{
register int unit = DISKUNIT(dev);
register struct disklabel *lp;
register struct rx_softc *rx = rx_cd.cd_devs[unit];
int unit = DISKUNIT(dev);
struct disklabel *lp;
struct rx_softc *rx = rx_cd.cd_devs[unit];
int error = 0;
lp = rx->ra_disk.dk_label;
@ -902,8 +902,8 @@ rrmakelabel(dl, type)
*/
int
rrgotstatus(usc, mp)
register struct device *usc;
register struct mscp *mp;
struct device *usc;
struct mscp *mp;
{
if ((mp->mscp_status & M_ST_MASK) != M_ST_SUCCESS) {
printf("%s: attempt to get status failed: ", usc->dv_xname);
@ -937,8 +937,8 @@ rrreplace(usc, mp)
/*ARGSUSED*/
int
rrioerror(usc, mp, bp)
register struct device *usc;
register struct mscp *mp;
struct device *usc;
struct mscp *mp;
struct buf *bp;
{
struct ra_softc *ra = (void *)usc;

14
sys/dev/mscp/mscp_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mscp_subr.c,v 1.14 2000/03/26 11:37:55 ragge Exp $ */
/* $NetBSD: mscp_subr.c,v 1.15 2000/03/30 12:45:34 augustss Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* Copyright (c) 1988 Regents of the University of California.
@ -560,10 +560,10 @@ mscp_dgo(mi, mxi)
*/
void
mscp_hexdump(mp)
register struct mscp *mp;
struct mscp *mp;
{
register long *p = (long *) mp;
register int i = mp->mscp_msglen;
long *p = (long *) mp;
int i = mp->mscp_msglen;
if (i > 256) /* sanity */
i = 256;
@ -755,8 +755,8 @@ void
mscp_printevent(mp)
struct mscp *mp;
{
register int event = mp->mscp_event;
register struct code_decode *cdc;
int event = mp->mscp_event;
struct code_decode *cdc;
int c, sc;
char *cm, *scm;
@ -796,7 +796,7 @@ static char *codemsg[16] = {
int
mscp_decodeerror(name, mp, mi)
char *name;
register struct mscp *mp;
struct mscp *mp;
struct mscp_softc *mi;
{
int issoft;

24
sys/dev/mscp/mscp_tape.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mscp_tape.c,v 1.14 1999/06/06 19:16:18 ragge Exp $ */
/* $NetBSD: mscp_tape.c,v 1.15 2000/03/30 12:45:34 augustss Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@ -197,7 +197,7 @@ mtopen(dev, flag, fmt, p)
int flag, fmt;
struct proc *p;
{
register struct mt_softc *mt;
struct mt_softc *mt;
int unit;
/*
@ -251,10 +251,10 @@ mtclose(dev, flags, fmt, p)
void
mtstrategy(bp)
register struct buf *bp;
struct buf *bp;
{
register int unit;
register struct mt_softc *mt;
int unit;
struct mt_softc *mt;
/*
* Make sure this is a reasonable drive to use.
@ -344,7 +344,7 @@ mtonline(usc, mp)
struct device *usc;
struct mscp *mp;
{
register struct mt_softc *mt = (void *)usc;
struct mt_softc *mt = (void *)usc;
wakeup((caddr_t)&mt->mt_state);
if ((mp->mscp_status & M_ST_MASK) == M_ST_SUCCESS)
@ -358,8 +358,8 @@ mtonline(usc, mp)
*/
int
mtgotstatus(usc, mp)
register struct device *usc;
register struct mscp *mp;
struct device *usc;
struct mscp *mp;
{
return (MSCP_DONE);
}
@ -390,8 +390,8 @@ static char *mt_ioerrs[] = {
/*ARGSUSED*/
int
mtioerror(usc, mp, bp)
register struct device *usc;
register struct mscp *mp;
struct device *usc;
struct mscp *mp;
struct buf *bp;
{
struct mt_softc *mt = (void *)usc;
@ -425,8 +425,8 @@ mtioctl(dev, cmd, data, flag, p)
int flag;
struct proc *p;
{
register int unit = mtunit(dev);
register struct mt_softc *mt = mt_cd.cd_devs[unit];
int unit = mtunit(dev);
struct mt_softc *mt = mt_cd.cd_devs[unit];
struct mtop *mtop;
struct mtget *mtget;
int error = 0, count;

6
sys/dev/pci/if_fpa.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_fpa.c,v 1.29 1999/06/01 19:18:00 thorpej Exp $ */
/* $NetBSD: if_fpa.c,v 1.30 2000/03/30 12:45:34 augustss Exp $ */
/*-
* Copyright (c) 1995, 1996 Matt Thomas <matt@3am-software.com>
@ -354,8 +354,8 @@ pdq_pci_attach(
void *aux)
{
pdq_softc_t *sc = (pdq_softc_t *) self;
register struct isa_attach_args *ia = (struct isa_attach_args *) aux;
register struct ifnet *ifp = &sc->sc_if;
struct isa_attach_args *ia = (struct isa_attach_args *) aux;
struct ifnet *ifp = &sc->sc_if;
int i;
sc->sc_if.if_unit = sc->sc_dev.dv_unit;

14
sys/dev/pci/if_rl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_rl.c,v 1.9 2000/03/23 22:23:03 mycroft Exp $ */
/* $NetBSD: if_rl.c,v 1.10 2000/03/30 12:45:34 augustss Exp $ */
/*
* Copyright (c) 1997, 1998
@ -221,7 +221,7 @@ static void rl_eeprom_putbyte(sc, addr)
struct rl_softc *sc;
int addr;
{
register int d, i;
int d, i;
d = addr | RL_EECMD_READ;
@ -252,7 +252,7 @@ static void rl_eeprom_getword(sc, addr, dest)
int addr;
u_int16_t *dest;
{
register int i;
int i;
u_int16_t word = 0;
/* Enter EEPROM access mode. */
@ -331,7 +331,7 @@ static void rl_read_eeprom(sc, dest, off, cnt, swap)
static void rl_mii_sync(sc)
struct rl_softc *sc;
{
register int i;
int i;
MII_SET(RL_MII_DIR|RL_MII_DATAOUT);
@ -697,7 +697,7 @@ static void rl_setmulti(sc)
static void rl_reset(sc)
struct rl_softc *sc;
{
register int i;
int i;
CSR_WRITE_1(sc, RL_COMMAND, RL_CMD_RESET);
@ -1550,7 +1550,7 @@ rl_ether_ioctl(ifp, cmd, data)
#ifdef NS
case AF_NS:
{
register struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
if (ns_nullhost(*ina))
ina->x_host = *(union ns_host *)
@ -1644,7 +1644,7 @@ static void rl_watchdog(ifp)
static void rl_stop(sc)
struct rl_softc *sc;
{
register int i;
int i;
struct ifnet *ifp;
ifp = &sc->ethercom.ec_if;

26
sys/dev/pci/if_ti.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ti.c,v 1.7 2000/03/17 09:25:22 bouyer Exp $ */
/* $NetBSD: if_ti.c,v 1.8 2000/03/30 12:45:35 augustss Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@ -215,7 +215,7 @@ static u_int32_t ti_eeprom_putbyte(sc, byte)
struct ti_softc *sc;
int byte;
{
register int i, ack = 0;
int i, ack = 0;
/*
* Make sure we're in TX mode.
@ -262,7 +262,7 @@ static u_int8_t ti_eeprom_getbyte(sc, addr, dest)
int addr;
u_int8_t *dest;
{
register int i;
int i;
u_int8_t byte = 0;
EEPROM_START;
@ -478,7 +478,7 @@ static void ti_cmd_ext(sc, cmd, arg, len)
int len;
{
u_int32_t index;
register int i;
int i;
index = sc->ti_cmd_saved_prodidx;
CSR_WRITE_4(sc, TI_GCR_CMDRING + (index * 4), *(u_int32_t *)(cmd));
@ -581,7 +581,7 @@ static int ti_alloc_jumbo_mem(sc)
struct ti_softc *sc;
{
caddr_t ptr;
register int i;
int i;
struct ti_jpool_entry *entry;
bus_dma_segment_t dmaseg;
int error, dmanseg;
@ -944,7 +944,7 @@ static int ti_newbuf_jumbo(sc, i, m)
static int ti_init_rx_ring_std(sc)
struct ti_softc *sc;
{
register int i;
int i;
struct ti_cmd_desc cmd;
for (i = 0; i < TI_SSLOTS; i++) {
@ -961,7 +961,7 @@ static int ti_init_rx_ring_std(sc)
static void ti_free_rx_ring_std(sc)
struct ti_softc *sc;
{
register int i;
int i;
for (i = 0; i < TI_STD_RX_RING_CNT; i++) {
if (sc->ti_cdata.ti_rx_std_chain[i] != NULL) {
@ -982,7 +982,7 @@ static void ti_free_rx_ring_std(sc)
static int ti_init_rx_ring_jumbo(sc)
struct ti_softc *sc;
{
register int i;
int i;
struct ti_cmd_desc cmd;
for (i = 0; i < (TI_JSLOTS - 20); i++) {
@ -999,7 +999,7 @@ static int ti_init_rx_ring_jumbo(sc)
static void ti_free_rx_ring_jumbo(sc)
struct ti_softc *sc;
{
register int i;
int i;
for (i = 0; i < TI_JUMBO_RX_RING_CNT; i++) {
if (sc->ti_cdata.ti_rx_jumbo_chain[i] != NULL) {
@ -1016,7 +1016,7 @@ static void ti_free_rx_ring_jumbo(sc)
static int ti_init_rx_ring_mini(sc)
struct ti_softc *sc;
{
register int i;
int i;
for (i = 0; i < TI_MSLOTS; i++) {
if (ti_newbuf_mini(sc, i, NULL, 0) == ENOBUFS)
@ -1032,7 +1032,7 @@ static int ti_init_rx_ring_mini(sc)
static void ti_free_rx_ring_mini(sc)
struct ti_softc *sc;
{
register int i;
int i;
for (i = 0; i < TI_MINI_RX_RING_CNT; i++) {
if (sc->ti_cdata.ti_rx_mini_chain[i] != NULL) {
@ -1053,7 +1053,7 @@ static void ti_free_rx_ring_mini(sc)
static void ti_free_tx_ring(sc)
struct ti_softc *sc;
{
register int i;
int i;
struct txdmamap_pool_entry *dma;
if (sc->ti_rdata->ti_tx_ring == NULL)
@ -2485,7 +2485,7 @@ ti_ether_ioctl(ifp, cmd, data)
#ifdef NS
case AF_NS:
{
register struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
struct ns_addr *ina = &IA_SNS(ifa)->sns_addr;
if (ns_nullhost(*ina))
ina->x_host = *(union ns_host *)

4
sys/dev/pci/pci.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pci.c,v 1.45 2000/03/22 00:47:26 cgd Exp $ */
/* $NetBSD: pci.c,v 1.46 2000/03/30 12:45:35 augustss Exp $ */
/*
* Copyright (c) 1995, 1996, 1997, 1998
@ -295,7 +295,7 @@ pciprint(aux, pnp)
void *aux;
const char *pnp;
{
register struct pci_attach_args *pa = aux;
struct pci_attach_args *pa = aux;
char devinfo[256];
const struct pci_quirkdata *qd;

4
sys/dev/pcmcia/if_cnw.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_cnw.c,v 1.9 2000/03/06 21:02:39 thorpej Exp $ */
/* $NetBSD: if_cnw.c,v 1.10 2000/03/30 12:45:35 augustss Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -990,7 +990,7 @@ cnw_intr(arg)
*/
int
cnw_ioctl(ifp, cmd, data)
register struct ifnet *ifp;
struct ifnet *ifp;
u_long cmd;
caddr_t data;
{

4
sys/dev/pcmcia/if_xe.c
View File

@ -1,5 +1,5 @@
/* $OpenBSD: if_xe.c,v 1.9 1999/09/16 11:28:42 niklas Exp $ */
/* $NetBSD: if_xe.c,v 1.5 2000/03/06 21:02:03 thorpej Exp $ */
/* $NetBSD: if_xe.c,v 1.6 2000/03/30 12:45:36 augustss Exp $ */
/*
* Copyright (c) 1999 Niklas Hallqvist, C Stone, Job de Haas
@ -1110,7 +1110,7 @@ xe_watchdog(ifp)
void
xe_stop(sc)
register struct xe_softc *sc;
struct xe_softc *sc;
{
/* Disable interrupts. */
PAGE(sc, 0);

78
sys/dev/qbus/dhu.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dhu.c,v 1.17 2000/01/24 02:40:28 matt Exp $ */
/* $NetBSD: dhu.c,v 1.18 2000/03/30 12:45:36 augustss Exp $ */
/*
* Copyright (c) 1996 Ken C. Wellsch. All rights reserved.
* Copyright (c) 1992, 1993
@ -164,7 +164,7 @@ dhu_match(parent, cf, aux)
void *aux;
{
struct uba_attach_args *ua = aux;
register int n;
int n;
/* Reset controller to initialize, enable TX/RX interrupts */
/* to catch floating vector info elsewhere when completed */
@ -201,10 +201,10 @@ dhu_attach(parent, self, aux)
struct device *parent, *self;
void *aux;
{
register struct dhu_softc *sc = (void *)self;
register struct uba_attach_args *ua = aux;
register unsigned c;
register int n, i;
struct dhu_softc *sc = (void *)self;
struct uba_attach_args *ua = aux;
unsigned c;
int n, i;
sc->sc_iot = ua->ua_iot;
sc->sc_ioh = ua->ua_ioh;
@ -256,9 +256,9 @@ dhurint(arg)
void *arg;
{
struct dhu_softc *sc = arg;
register struct tty *tp;
register int cc, line;
register unsigned c, delta;
struct tty *tp;
int cc, line;
unsigned c, delta;
int overrun = 0;
while ((c = DHU_READ_WORD(DHU_UBA_RBUF)) & DHU_RBUF_DATA_VALID) {
@ -328,9 +328,9 @@ static void
dhuxint(arg)
void *arg;
{
register struct dhu_softc *sc = arg;
register struct tty *tp;
register int line;
struct dhu_softc *sc = arg;
struct tty *tp;
int line;
line = DHU_LINE(DHU_READ_BYTE(DHU_UBA_CSR_HI));
@ -361,8 +361,8 @@ dhuopen(dev, flag, mode, p)
int flag, mode;
struct proc *p;
{
register struct tty *tp;
register int unit, line;
struct tty *tp;
int unit, line;
struct dhu_softc *sc;
int s, error = 0;
@ -427,8 +427,8 @@ dhuclose(dev, flag, mode, p)
int flag, mode;
struct proc *p;
{
register struct tty *tp;
register int unit, line;
struct tty *tp;
int unit, line;
struct dhu_softc *sc;
unit = DHU_M2U(minor(dev));
@ -458,8 +458,8 @@ dhuread(dev, uio, flag)
dev_t dev;
struct uio *uio;
{
register struct dhu_softc *sc;
register struct tty *tp;
struct dhu_softc *sc;
struct tty *tp;
sc = dhu_cd.cd_devs[DHU_M2U(minor(dev))];
@ -472,8 +472,8 @@ dhuwrite(dev, uio, flag)
dev_t dev;
struct uio *uio;
{
register struct dhu_softc *sc;
register struct tty *tp;
struct dhu_softc *sc;
struct tty *tp;
sc = dhu_cd.cd_devs[DHU_M2U(minor(dev))];
@ -490,9 +490,9 @@ dhuioctl(dev, cmd, data, flag, p)
int flag;
struct proc *p;
{
register struct dhu_softc *sc;
register struct tty *tp;
register int unit, line;
struct dhu_softc *sc;
struct tty *tp;
int unit, line;
int error;
unit = DHU_M2U(minor(dev));
@ -559,10 +559,10 @@ dhutty(dev)
/*ARGSUSED*/
void
dhustop(tp, flag)
register struct tty *tp;
struct tty *tp;
{
register struct dhu_softc *sc;
register int line;
struct dhu_softc *sc;
int line;
int s;
s = spltty();
@ -590,11 +590,11 @@ dhustop(tp, flag)
static void
dhustart(tp)
register struct tty *tp;
struct tty *tp;
{
register struct dhu_softc *sc;
register int line, cc;
register int addr;
struct dhu_softc *sc;
int line, cc;
int addr;
int s;
s = spltty();
@ -653,14 +653,14 @@ out:
static int
dhuparam(tp, t)
register struct tty *tp;
register struct termios *t;
struct tty *tp;
struct termios *t;
{
struct dhu_softc *sc;
register int cflag = t->c_cflag;
int cflag = t->c_cflag;
int ispeed = ttspeedtab(t->c_ispeed, dhuspeedtab);
int ospeed = ttspeedtab(t->c_ospeed, dhuspeedtab);
register unsigned lpr, lnctrl;
unsigned lpr, lnctrl;
int unit, line;
int s;
@ -747,8 +747,8 @@ dhuiflow(tp, flag)
struct tty *tp;
int flag;
{
register struct dhu_softc *sc;
register int line = DHU_LINE(minor(tp->t_dev));
struct dhu_softc *sc;
int line = DHU_LINE(minor(tp->t_dev));
if (tp->t_cflag & CRTSCTS) {
sc = dhu_cd.cd_devs[DHU_M2U(minor(tp->t_dev))];
@ -763,9 +763,9 @@ dhumctl(sc, line, bits, how)
struct dhu_softc *sc;
int line, bits, how;
{
register unsigned status;
register unsigned lnctrl;
register unsigned mbits;
unsigned status;
unsigned lnctrl;
unsigned mbits;
int s;
s = spltty();

50
sys/dev/qbus/dl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dl.c,v 1.11 2000/01/24 02:40:29 matt Exp $ */
/* $NetBSD: dl.c,v 1.12 2000/03/30 12:45:37 augustss Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@ -204,7 +204,7 @@ dl_attach (parent, self, aux)
void *aux;
{
struct dl_softc *sc = (void *)self;
register struct uba_attach_args *ua = aux;
struct uba_attach_args *ua = aux;
sc->sc_iot = ua->ua_iot;
sc->sc_ioh = ua->ua_ioh;
@ -233,9 +233,9 @@ dlrint(arg)
void *arg;
{
struct dl_softc *sc = arg;
register struct tty *tp;
register int cc;
register unsigned c;
struct tty *tp;
int cc;
unsigned c;
if (DL_READ_WORD(DL_UBA_RCSR) & DL_RCSR_RX_DONE) {
c = DL_READ_WORD(DL_UBA_RBUF);
@ -273,7 +273,7 @@ dlxint(arg)
void *arg;
{
struct dl_softc *sc = arg;
register struct tty *tp;
struct tty *tp;
tp = sc->sc_tty;
tp->t_state &= ~(TS_BUSY | TS_FLUSH);
@ -291,8 +291,8 @@ dlopen(dev, flag, mode, p)
int flag, mode;
struct proc *p;
{
register struct tty *tp;
register int unit;
struct tty *tp;
int unit;
struct dl_softc *sc;
unit = minor(dev);
@ -334,8 +334,8 @@ dlclose(dev, flag, mode, p)
struct proc *p;
{
struct dl_softc *sc;
register struct tty *tp;
register int unit;
struct tty *tp;
int unit;
unit = minor(dev);
sc = dl_cd.cd_devs[unit];
@ -355,9 +355,9 @@ dlread(dev, uio, flag)
struct uio *uio;
int flag;
{
register struct tty *tp;
struct tty *tp;
struct dl_softc *sc;
register int unit;
int unit;
unit = minor(dev);
sc = dl_cd.cd_devs[unit];
@ -371,9 +371,9 @@ dlwrite(dev, uio, flag)
struct uio *uio;
int flag;
{
register struct tty *tp;
struct tty *tp;
struct dl_softc *sc;
register int unit;
int unit;
unit = minor(dev);
sc = dl_cd.cd_devs[unit];
@ -390,8 +390,8 @@ dlioctl(dev, cmd, data, flag, p)
struct proc *p;
{
struct dl_softc *sc;
register struct tty *tp;
register int unit;
struct tty *tp;
int unit;
int error;
unit = minor(dev);
@ -430,7 +430,7 @@ struct tty *
dltty(dev)
dev_t dev;
{
register struct dl_softc* sc;
struct dl_softc* sc;
sc = dl_cd.cd_devs[minor(dev)];
return sc->sc_tty;
@ -438,10 +438,10 @@ dltty(dev)
void
dlstop(tp, flag)
register struct tty *tp;
struct tty *tp;
int flag;
{
register struct dl_softc *sc;
struct dl_softc *sc;
int unit, s;
unit = minor(tp->t_dev);
@ -457,10 +457,10 @@ dlstop(tp, flag)
static void
dlstart(tp)
register struct tty *tp;
struct tty *tp;
{
register struct dl_softc *sc;
register int unit;
struct dl_softc *sc;
int unit;
int s;
unit = minor(tp->t_dev);
@ -492,8 +492,8 @@ out:
/*ARGSUSED*/
static int
dlparam(tp, t)
register struct tty *tp;
register struct termios *t;
struct tty *tp;
struct termios *t;
{
/*
* All this kind of stuff (speed, character format, whatever)
@ -505,7 +505,7 @@ dlparam(tp, t)
static void
dlbrk(sc, state)
register struct dl_softc *sc;
struct dl_softc *sc;
int state;
{
int s = spltty();

66
sys/dev/qbus/dz.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dz.c,v 1.20 2000/03/23 07:01:42 thorpej Exp $ */
/* $NetBSD: dz.c,v 1.21 2000/03/30 12:45:37 augustss Exp $ */
/*
* Copyright (c) 1996 Ken C. Wellsch. All rights reserved.
* Copyright (c) 1992, 1993
@ -133,7 +133,7 @@ void
dzattach(sc)
struct dz_softc *sc;
{
register int n;
int n;
sc->sc_rxint = sc->sc_brk = 0;
@ -165,9 +165,9 @@ dzrint(arg)
void *arg;
{
struct dz_softc *sc = arg;
register struct tty *tp;
register int cc, line;
register unsigned c;
struct tty *tp;
int cc, line;
unsigned c;
int overrun = 0;
sc->sc_rxint++;
@ -219,10 +219,10 @@ void
dzxint(arg)
void *arg;
{
register struct dz_softc *sc = arg;
register struct tty *tp;
register struct clist *cl;
register int line, ch, csr;
struct dz_softc *sc = arg;
struct tty *tp;
struct clist *cl;
int line, ch, csr;
u_char tcr;
/*
@ -284,8 +284,8 @@ dzopen(dev, flag, mode, p)
int flag, mode;
struct proc *p;
{
register struct tty *tp;
register int unit, line;
struct tty *tp;
int unit, line;
struct dz_softc *sc;
int s, error = 0;
@ -345,8 +345,8 @@ dzclose(dev, flag, mode, p)
struct proc *p;
{
struct dz_softc *sc;
register struct tty *tp;
register int unit, line;
struct tty *tp;
int unit, line;
unit = DZ_I2C(minor(dev));
@ -372,7 +372,7 @@ dzread (dev, uio, flag)
dev_t dev;
struct uio *uio;
{
register struct tty *tp;
struct tty *tp;
struct dz_softc *sc;
sc = dz_cd.cd_devs[DZ_I2C(minor(dev))];
@ -386,7 +386,7 @@ dzwrite (dev, uio, flag)
dev_t dev;
struct uio *uio;
{
register struct tty *tp;
struct tty *tp;
struct dz_softc *sc;
sc = dz_cd.cd_devs[DZ_I2C(minor(dev))];
@ -405,8 +405,8 @@ dzioctl (dev, cmd, data, flag, p)
struct proc *p;
{
struct dz_softc *sc;
register struct tty *tp;
register int unit, line;
struct tty *tp;
int unit, line;
int error;
unit = DZ_I2C(minor(dev));
@ -474,7 +474,7 @@ dztty (dev)
/*ARGSUSED*/
void
dzstop(tp, flag)
register struct tty *tp;
struct tty *tp;
{
if (tp->t_state & TS_BUSY)
if (!(tp->t_state & TS_TTSTOP))
@ -483,11 +483,11 @@ dzstop(tp, flag)
void
dzstart(tp)
register struct tty *tp;
struct tty *tp;
{
register struct dz_softc *sc;
register struct clist *cl;
register int unit, line, s;
struct dz_softc *sc;
struct clist *cl;
int unit, line, s;
char state;
unit = DZ_I2C(minor(tp->t_dev));
@ -520,15 +520,15 @@ dzstart(tp)
static int
dzparam(tp, t)
register struct tty *tp;
register struct termios *t;
struct tty *tp;
struct termios *t;
{
struct dz_softc *sc;
register int cflag = t->c_cflag;
int cflag = t->c_cflag;
int unit, line;
int ispeed = ttspeedtab(t->c_ispeed, dzspeedtab);
int ospeed = ttspeedtab(t->c_ospeed, dzspeedtab);
register unsigned lpr;
unsigned lpr;
int s;
unit = DZ_I2C(minor(tp->t_dev));
@ -582,12 +582,12 @@ dzparam(tp, t)
static unsigned
dzmctl(sc, line, bits, how)
register struct dz_softc *sc;
struct dz_softc *sc;
int line, bits, how;
{
register unsigned status;
register unsigned mbits;
register unsigned bit;
unsigned status;
unsigned mbits;
unsigned bit;
int s;
s = spltty();
@ -663,9 +663,9 @@ static void
dzscan(arg)
void *arg;
{
register struct dz_softc *sc;
register struct tty *tp;
register int n, bit, port;
struct dz_softc *sc;
struct tty *tp;
int n, bit, port;
unsigned csr;
int s;

6
sys/dev/qbus/dz_uba.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dz_uba.c,v 1.8 2000/01/24 02:40:29 matt Exp $ */
/* $NetBSD: dz_uba.c,v 1.9 2000/03/30 12:45:37 augustss Exp $ */
/*
* Copyright (c) 1998 Ludd, University of Lule}, Sweden. All rights reserved.
* Copyright (c) 1996 Ken C. Wellsch. All rights reserved.
@ -75,7 +75,7 @@ dz_uba_match(parent, cf, aux)
struct uba_attach_args *ua = aux;
bus_space_tag_t iot = ua->ua_iot;
bus_space_handle_t ioh = ua->ua_ioh;
register int n;
int n;
iot = iot; /* Silly GCC */
/* Reset controller to initialize, enable TX interrupts */
@ -114,7 +114,7 @@ dz_uba_attach(parent, self, aux)
void *aux;
{
struct dz_softc *sc = (void *)self;
register struct uba_attach_args *ua = aux;
struct uba_attach_args *ua = aux;
sc->sc_iot = ua->ua_iot;
sc->sc_ioh = ua->ua_ioh;

4
sys/dev/qbus/if_qe.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_qe.c,v 1.39 2000/01/24 02:40:29 matt Exp $ */
/* $NetBSD: if_qe.c,v 1.40 2000/03/30 12:45:37 augustss Exp $ */
/*
* Copyright (c) 1999 Ludd, University of Lule}, Sweden. All rights reserved.
*
@ -669,7 +669,7 @@ qeintr(arg)
*/
int
qeioctl(ifp, cmd, data)
register struct ifnet *ifp;
struct ifnet *ifp;
u_long cmd;
caddr_t data;
{

44
sys/dev/qbus/if_uba.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_uba.c,v 1.16 1999/06/06 20:45:21 ragge Exp $ */
/* $NetBSD: if_uba.c,v 1.17 2000/03/30 12:45:37 augustss Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@ -76,13 +76,13 @@ static void restor_xmtbuf __P((struct ifxmt *));
*/
int
if_ubaminit(ifu, uh, hlen, nmr, ifr, nr, ifw, nw)
register struct ifubinfo *ifu;
struct ifubinfo *ifu;
struct uba_softc *uh;
int hlen, nmr, nr, nw;
register struct ifrw *ifr;
register struct ifxmt *ifw;
struct ifrw *ifr;
struct ifxmt *ifw;
{
register caddr_t p;
caddr_t p;
caddr_t cp;
int i, nclbytes, off;
@ -152,10 +152,10 @@ bad:
static int
if_ubaalloc(ifu, ifrw, nmr)
struct ifubinfo *ifu;
register struct ifrw *ifrw;
struct ifrw *ifrw;
int nmr;
{
register int info;
int info;
info =
uballoc(ifu->iff_softc, ifrw->ifrw_addr, nmr*VAX_NBPG + ifu->iff_hlen,
@ -185,14 +185,14 @@ if_ubaalloc(ifu, ifrw, nmr)
struct mbuf *
if_ubaget(ifu, ifr, totlen, ifp)
struct ifubinfo *ifu;
register struct ifrw *ifr;
register int totlen;
struct ifrw *ifr;
int totlen;
struct ifnet *ifp;
{
struct mbuf *top, **mp;
register struct mbuf *m;
register caddr_t cp = ifr->ifrw_addr + ifu->iff_hlen, pp;
register int len;
struct mbuf *m;
caddr_t cp = ifr->ifrw_addr + ifu->iff_hlen, pp;
int len;
top = 0;
mp = &top;
MGETHDR(m, M_DONTWAIT, MT_DATA);
@ -285,11 +285,11 @@ out:
*/
static void
rcv_xmtbuf(ifw)
register struct ifxmt *ifw;
struct ifxmt *ifw;
{
register struct mbuf *m;
struct mbuf *m;
struct mbuf **mprev;
register int i;
int i;
char *cp;
while ((i = ffs((long)ifw->ifw_xswapd)) != 0) {
@ -316,9 +316,9 @@ rcv_xmtbuf(ifw)
*/
static void
restor_xmtbuf(ifw)
register struct ifxmt *ifw;
struct ifxmt *ifw;
{
register int i;
int i;
for (i = 0; i < ifw->ifw_nmr; i++)
ifw->ifw_wmap[i] = ifw->ifw_mr[i];
@ -334,12 +334,12 @@ restor_xmtbuf(ifw)
int
if_ubaput(ifu, ifw, m)
struct ifubinfo *ifu;
register struct ifxmt *ifw;
register struct mbuf *m;
struct ifxmt *ifw;
struct mbuf *m;
{
register struct mbuf *mp;
register caddr_t cp, dp;
register int i;
struct mbuf *mp;
caddr_t cp, dp;
int i;
int xswapd = 0;
int x, cc, t;

124
sys/dev/qbus/qd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: qd.c,v 1.17 2000/01/24 02:40:29 matt Exp $ */
/* $NetBSD: qd.c,v 1.18 2000/03/30 12:45:37 augustss Exp $ */
/*-
* Copyright (c) 1988 Regents of the University of California.
@ -558,7 +558,7 @@ qd_match(parent, match, aux)
struct qd_softc *sc = &ssc;
struct uba_attach_args *ua = aux;
struct uba_softc *uh = (void *)parent;
register int unit;
int unit;
volatile struct dga *dga; /* pointer to gate array structure */
int vector;
#ifdef notdef
@ -732,8 +732,8 @@ void qd_attach(parent, self, aux)
struct device *parent, *self;
void *aux;
{
register struct uba_attach_args *ua = aux;
register int unit; /* QDSS module # for this call */
struct uba_attach_args *ua = aux;
int unit; /* QDSS module # for this call */
printf("\n");
@ -797,8 +797,8 @@ qdopen(dev, flag, mode, p)
int flag, mode;
struct proc *p;
{
volatile register struct dga *dga; /* ptr to gate array struct */
register struct tty *tp;
volatile struct dga *dga; /* ptr to gate array struct */
struct tty *tp;
volatile struct duart *duart;
int unit;
int minor_dev;
@ -883,9 +883,9 @@ qdclose(dev, flag, mode, p)
int flag, mode;
struct proc *p;
{
register struct tty *tp;
register struct qdmap *qd;
volatile register int *ptep;
struct tty *tp;
struct qdmap *qd;
volatile int *ptep;
volatile struct dga *dga; /* gate array register map pointer */
volatile struct duart *duart;
volatile struct adder *adder;
@ -1083,11 +1083,11 @@ qdioctl(dev, cmd, datap, flags, p)
int flags;
struct proc *p;
{
volatile register int *ptep; /* page table entry pointer */
register int mapix; /* QVmap[] page table index */
register struct _vs_event *event;
register struct tty *tp;
register int i;
volatile int *ptep; /* page table entry pointer */
int mapix; /* QVmap[] page table index */
struct _vs_event *event;
struct tty *tp;
int i;
struct qdmap *qd; /* pointer to device map struct */
volatile struct dga *dga; /* Gate Array reg structure pntr */
volatile struct duart *duart; /* DUART reg structure pointer */
@ -1515,9 +1515,9 @@ qdpoll(dev, events, p)
int events;
struct proc *p;
{
register int s;
register int unit;
register struct tty *tp;
int s;
int unit;
struct tty *tp;
u_int minor_dev = minor(dev);
int revents = 0;
@ -1597,9 +1597,9 @@ qdwrite(dev, uio, flag)
dev_t dev;
struct uio *uio;
{
register struct tty *tp;
register int minor_dev;
register int unit;
struct tty *tp;
int minor_dev;
int unit;
minor_dev = minor(dev);
unit = (minor_dev >> 2) & 0x07;
@ -1626,9 +1626,9 @@ qdread(dev, uio, flag)
dev_t dev;
struct uio *uio;
{
register struct tty *tp;
register int minor_dev;
register int unit;
struct tty *tp;
int minor_dev;
int unit;
minor_dev = minor(dev);
unit = (minor_dev >> 2) & 0x07;
@ -1657,11 +1657,11 @@ qdread(dev, uio, flag)
void
qd_strategy(bp)
register struct buf *bp;
struct buf *bp;
{
volatile register struct dga *dga;
volatile register struct adder *adder;
register int unit;
volatile struct dga *dga;
volatile struct adder *adder;
int unit;
int QBAreg;
int s;
int cookie;
@ -1731,7 +1731,7 @@ panic("qd_strategy");
void qdstart(tp)
struct tty *tp;
{
register int which_unit, unit, c;
int which_unit, unit, c;
int s;
unit = minor(tp->t_dev);
@ -1783,7 +1783,7 @@ qdstop(tp, flag)
struct tty *tp;
int flag;
{
register int s;
int s;
s = spl5(); /* block intrpts during state modification */
if (tp->t_state & TS_BUSY) {
@ -1803,9 +1803,9 @@ blitc(unit, chr)
int unit;
u_char chr;
{
volatile register struct adder *adder;
volatile register struct dga *dga;
register int i;
volatile struct adder *adder;
volatile struct dga *dga;
int i;
int nograph = !(qdflags[unit].inuse&GRAPHIC_DEV);
static short inescape[NQD];
@ -2012,9 +2012,9 @@ qddint(arg)
void *arg;
{
struct device *dv = arg;
register struct DMAreq_header *header;
register struct DMAreq *request;
volatile register struct dga *dga;
struct DMAreq_header *header;
struct DMAreq *request;
volatile struct dga *dga;
volatile struct adder *adder;
int cookie; /* DMA adrs for QDSS */
@ -2201,13 +2201,13 @@ qdaint(arg)
void *arg;
{
struct device *dv = arg;
volatile register struct adder *adder;
volatile struct adder *adder;
struct color_buf *cbuf;
int i;
register struct rgb *rgbp;
volatile register short *red;
volatile register short *green;
volatile register short *blue;
struct rgb *rgbp;
volatile short *red;
volatile short *green;
volatile short *blue;
(void)spl4(); /* allow interval timer in */
@ -2287,8 +2287,8 @@ qdiint(arg)
void *arg;
{
struct device *dv = arg;
register struct _vs_event *event;
register struct qdinput *eqh;
struct _vs_event *event;
struct qdinput *eqh;
volatile struct dga *dga;
volatile struct duart *duart;
struct mouse_report *new_rep;
@ -2881,7 +2881,7 @@ void
clear_qd_screen(unit)
int unit;
{
volatile register struct adder *adder;
volatile struct adder *adder;
adder = (struct adder *) qdmap[unit].adder;
adder->x_limit = 1024;
@ -2936,9 +2936,9 @@ ldcursor(unit, bitmap)
int unit;
short *bitmap;
{
volatile register struct dga *dga;
volatile register short *temp;
register int i;
volatile struct dga *dga;
volatile short *temp;
int i;
int curs;
dga = (struct dga *) qdmap[unit].dga;
@ -2970,10 +2970,10 @@ void
ldfont(unit)
int unit;
{
volatile register struct adder *adder;
volatile struct adder *adder;
register int i, j, k, max_chars_line;
register short packed;
int i, j, k, max_chars_line;
short packed;
adder = (struct adder *) qdmap[unit].adder;
@ -3113,9 +3113,9 @@ int
qdcngetc(dev)
dev_t dev;
{
register short key;
register char chr;
volatile register struct duart *duart;
short key;
char chr;
volatile struct duart *duart;
duart = (struct duart *) qdmap[0].duart;
@ -3211,8 +3211,8 @@ void
led_control(unit, cmd, led_mask)
int unit, cmd, led_mask;
{
register int i;
volatile register struct duart *duart;
int i;
volatile struct duart *duart;
duart = (struct duart *)qdmap[unit].duart;
@ -3302,7 +3302,7 @@ void
init_shared(unit)
int unit;
{
volatile register struct dga *dga;
volatile struct dga *dga;
dga = (struct dga *) qdmap[unit].dga;
@ -3366,10 +3366,10 @@ setup_dragon(unit)
int unit;
{
volatile register struct adder *adder;
volatile register struct dga *dga;
volatile struct adder *adder;
volatile struct dga *dga;
volatile short *memcsr;
register int i;
int i;
short top; /* clipping/scrolling boundaries */
short bottom;
short right;
@ -3620,8 +3620,8 @@ void
setup_input(unit)
int unit;
{
volatile register struct duart *duart; /* DUART register structure pointer */
register int i, bits;
volatile struct duart *duart; /* DUART register structure pointer */
int i, bits;
char id_byte;
duart = (struct duart *) qdmap[unit].duart;
@ -3788,7 +3788,7 @@ wait_status(adder, mask)
volatile struct adder *adder;
int mask;
{
register int i;
int i;
for (i = 10000, adder->status = 0 ; i > 0 &&
!(adder->status&mask) ; --i)
@ -3812,7 +3812,7 @@ write_ID(adder, adrs, data)
short adrs;
short data;
{
register int i;
int i;
for (i = 100000, adder->status = 0 ;
i > 0 && !(adder->status&ADDRESS_COMPLETE) ; --i)

4
sys/dev/qbus/uba.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uba.c,v 1.49 2000/01/24 02:40:30 matt Exp $ */
/* $NetBSD: uba.c,v 1.50 2000/03/30 12:45:39 augustss Exp $ */
/*
* Copyright (c) 1996 Jonathan Stone.
* Copyright (c) 1994, 1996 Ludd, University of Lule}, Sweden.
@ -115,7 +115,7 @@ void
ubareset(uban)
int uban;
{
register struct uba_softc *uh = uba_cd.cd_devs[uban];
struct uba_softc *uh = uba_cd.cd_devs[uban];
int s, i;
s = splimp();

6
sys/dev/qbus/uda.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uda.c,v 1.32 2000/01/24 02:40:30 matt Exp $ */
/* $NetBSD: uda.c,v 1.33 2000/03/30 12:45:39 augustss Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* Copyright (c) 1988 Regents of the University of California.
@ -392,8 +392,8 @@ udasaerror(usc, doreset)
int doreset;
{
struct uda_softc *sc = (void *)usc;
register int code = bus_space_read_2(sc->sc_iot, sc->sc_sah, 0);
register struct saerr *e;
int code = bus_space_read_2(sc->sc_iot, sc->sc_sah, 0);
struct saerr *e;
if ((code & MP_ERR) == 0)
return;

30
sys/dev/raidframe/rf_dagfuncs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rf_dagfuncs.c,v 1.5 1999/08/26 02:40:28 oster Exp $ */
/* $NetBSD: rf_dagfuncs.c,v 1.6 2000/03/30 12:45:40 augustss Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@ -636,14 +636,14 @@ rf_bxor(src, dest, len, bp)
*/
int
rf_longword_bxor(src, dest, len, bp)
register unsigned long *src;
register unsigned long *dest;
unsigned long *src;
unsigned long *dest;
int len; /* longwords */
void *bp;
{
register unsigned long *end = src + len;
register unsigned long d0, d1, d2, d3, s0, s1, s2, s3; /* temps */
register unsigned long *pg_src, *pg_dest; /* per-page source/dest
unsigned long *end = src + len;
unsigned long d0, d1, d2, d3, s0, s1, s2, s3; /* temps */
unsigned long *pg_src, *pg_dest; /* per-page source/dest
* pointers */
int longs_this_time;/* # longwords to xor in the current iteration */
@ -713,15 +713,15 @@ rf_longword_bxor(src, dest, len, bp)
*/
int
rf_longword_bxor3(dst, a, b, c, len, bp)
register unsigned long *dst;
register unsigned long *a;
register unsigned long *b;
register unsigned long *c;
unsigned long *dst;
unsigned long *a;
unsigned long *b;
unsigned long *c;
int len; /* length in longwords */
void *bp;
{
unsigned long a0, a1, a2, a3, b0, b1, b2, b3;
register unsigned long *pg_a, *pg_b, *pg_c, *pg_dst; /* per-page source/dest
unsigned long *pg_a, *pg_b, *pg_c, *pg_dst; /* per-page source/dest
* pointers */
int longs_this_time;/* # longs to xor in the current iteration */
char dst_is_a = 0;
@ -878,10 +878,10 @@ rf_longword_bxor3(dst, a, b, c, len, bp)
int
rf_bxor3(dst, a, b, c, len, bp)
register unsigned char *dst;
register unsigned char *a;
register unsigned char *b;
register unsigned char *c;
unsigned char *dst;
unsigned char *a;
unsigned char *b;
unsigned char *c;
unsigned long len;
void *bp;
{

10
sys/dev/raidframe/rf_evenodd_dagfuncs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rf_evenodd_dagfuncs.c,v 1.5 2000/03/13 23:52:36 soren Exp $ */
/* $NetBSD: rf_evenodd_dagfuncs.c,v 1.6 2000/03/30 12:45:40 augustss Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@ -313,11 +313,11 @@ rf_e_EncOneSect(
#if RF_EO_MATRIX_DIM > 17
int shortsPerEU = bytesPerEU / sizeof(short);
short *destShortBuf, *srcShortBuf1, *srcShortBuf2;
register short temp1;
short temp1;
#elif RF_EO_MATRIX_DIM == 17
int longsPerEU = bytesPerEU / sizeof(long);
long *destLongBuf, *srcLongBuf1, *srcLongBuf2;
register long temp1;
long temp1;
#endif
#if RF_EO_MATRIX_DIM > 17
@ -472,7 +472,7 @@ rf_doubleEOdecode(
int shortsPerEU = bytesPerEU / sizeof(short);
short *rrdbuf_current, *pbuf_current, *ebuf_current;
short *dest_smaller, *dest_smaller_current, *dest_larger, *dest_larger_current;
register short *temp;
short *temp;
short *P;
RF_ASSERT(bytesPerEU % sizeof(short) == 0);
@ -482,7 +482,7 @@ rf_doubleEOdecode(
int longsPerEU = bytesPerEU / sizeof(long);
long *rrdbuf_current, *pbuf_current, *ebuf_current;
long *dest_smaller, *dest_smaller_current, *dest_larger, *dest_larger_current;
register long *temp;
long *temp;
long *P;
RF_ASSERT(bytesPerEU % sizeof(long) == 0);

8
sys/dev/raidframe/rf_netbsdkintf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rf_netbsdkintf.c,v 1.73 2000/03/26 22:38:28 oster Exp $ */
/* $NetBSD: rf_netbsdkintf.c,v 1.74 2000/03/30 12:45:40 augustss Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@ -644,9 +644,9 @@ raidclose(dev, flags, fmt, p)
void
raidstrategy(bp)
register struct buf *bp;
struct buf *bp;
{
register int s;
int s;
unsigned int raidID = raidunit(bp->b_dev);
RF_Raid_t *raidPtr;
@ -1756,7 +1756,7 @@ KernelWakeupFunc(vbp)
struct buf *bp;
struct raid_softc *rs;
int unit;
register int s;
int s;
s = splbio();
db1_printf(("recovering the request queue:\n"));

116
sys/dev/raidframe/rf_nwayxor.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rf_nwayxor.c,v 1.3 1999/02/05 00:06:13 oster Exp $ */
/* $NetBSD: rf_nwayxor.c,v 1.4 2000/03/30 12:45:41 augustss Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@ -73,10 +73,10 @@ rf_nWayXor1(src_rbs, dest_rb, len)
RF_ReconBuffer_t *dest_rb;
int len;
{
register unsigned long *src = (unsigned long *) src_rbs[0]->buffer;
register unsigned long *dest = (unsigned long *) dest_rb->buffer;
register unsigned long *end = src + len;
register unsigned long d0, d1, d2, d3, s0, s1, s2, s3;
unsigned long *src = (unsigned long *) src_rbs[0]->buffer;
unsigned long *dest = (unsigned long *) dest_rb->buffer;
unsigned long *end = src + len;
unsigned long d0, d1, d2, d3, s0, s1, s2, s3;
callcount[1]++;
while (len >= 4) {
@ -107,10 +107,10 @@ rf_nWayXor2(src_rbs, dest_rb, len)
RF_ReconBuffer_t *dest_rb;
int len;
{
register unsigned long *dst = (unsigned long *) dest_rb->buffer;
register unsigned long *a = dst;
register unsigned long *b = (unsigned long *) src_rbs[0]->buffer;
register unsigned long *c = (unsigned long *) src_rbs[1]->buffer;
unsigned long *dst = (unsigned long *) dest_rb->buffer;
unsigned long *a = dst;
unsigned long *b = (unsigned long *) src_rbs[0]->buffer;
unsigned long *c = (unsigned long *) src_rbs[1]->buffer;
unsigned long a0, a1, a2, a3, b0, b1, b2, b3;
callcount[2]++;
@ -200,10 +200,10 @@ rf_nWayXor3(src_rbs, dest_rb, len)
RF_ReconBuffer_t *dest_rb;
int len;
{
register unsigned long *dst = (unsigned long *) dest_rb->buffer;
register unsigned long *b = (unsigned long *) src_rbs[0]->buffer;
register unsigned long *c = (unsigned long *) src_rbs[1]->buffer;
register unsigned long *d = (unsigned long *) src_rbs[2]->buffer;
unsigned long *dst = (unsigned long *) dest_rb->buffer;
unsigned long *b = (unsigned long *) src_rbs[0]->buffer;
unsigned long *c = (unsigned long *) src_rbs[1]->buffer;
unsigned long *d = (unsigned long *) src_rbs[2]->buffer;
unsigned long a0, a1, a2, a3, b0, b1, b2, b3;
callcount[3]++;
@ -230,11 +230,11 @@ rf_nWayXor4(src_rbs, dest_rb, len)
RF_ReconBuffer_t *dest_rb;
int len;
{
register unsigned long *dst = (unsigned long *) dest_rb->buffer;
register unsigned long *b = (unsigned long *) src_rbs[0]->buffer;
register unsigned long *c = (unsigned long *) src_rbs[1]->buffer;
register unsigned long *d = (unsigned long *) src_rbs[2]->buffer;
register unsigned long *e = (unsigned long *) src_rbs[3]->buffer;
unsigned long *dst = (unsigned long *) dest_rb->buffer;
unsigned long *b = (unsigned long *) src_rbs[0]->buffer;
unsigned long *c = (unsigned long *) src_rbs[1]->buffer;
unsigned long *d = (unsigned long *) src_rbs[2]->buffer;
unsigned long *e = (unsigned long *) src_rbs[3]->buffer;
unsigned long a0, a1, a2, a3, b0, b1, b2, b3;
callcount[4]++;
@ -262,12 +262,12 @@ rf_nWayXor5(src_rbs, dest_rb, len)
RF_ReconBuffer_t *dest_rb;
int len;
{
register unsigned long *dst = (unsigned long *) dest_rb->buffer;
register unsigned long *b = (unsigned long *) src_rbs[0]->buffer;
register unsigned long *c = (unsigned long *) src_rbs[1]->buffer;
register unsigned long *d = (unsigned long *) src_rbs[2]->buffer;
register unsigned long *e = (unsigned long *) src_rbs[3]->buffer;
register unsigned long *f = (unsigned long *) src_rbs[4]->buffer;
unsigned long *dst = (unsigned long *) dest_rb->buffer;
unsigned long *b = (unsigned long *) src_rbs[0]->buffer;
unsigned long *c = (unsigned long *) src_rbs[1]->buffer;
unsigned long *d = (unsigned long *) src_rbs[2]->buffer;
unsigned long *e = (unsigned long *) src_rbs[3]->buffer;
unsigned long *f = (unsigned long *) src_rbs[4]->buffer;
unsigned long a0, a1, a2, a3, b0, b1, b2, b3;
callcount[5]++;
@ -296,13 +296,13 @@ rf_nWayXor6(src_rbs, dest_rb, len)
RF_ReconBuffer_t *dest_rb;
int len;
{
register unsigned long *dst = (unsigned long *) dest_rb->buffer;
register unsigned long *b = (unsigned long *) src_rbs[0]->buffer;
register unsigned long *c = (unsigned long *) src_rbs[1]->buffer;
register unsigned long *d = (unsigned long *) src_rbs[2]->buffer;
register unsigned long *e = (unsigned long *) src_rbs[3]->buffer;
register unsigned long *f = (unsigned long *) src_rbs[4]->buffer;
register unsigned long *g = (unsigned long *) src_rbs[5]->buffer;
unsigned long *dst = (unsigned long *) dest_rb->buffer;
unsigned long *b = (unsigned long *) src_rbs[0]->buffer;
unsigned long *c = (unsigned long *) src_rbs[1]->buffer;
unsigned long *d = (unsigned long *) src_rbs[2]->buffer;
unsigned long *e = (unsigned long *) src_rbs[3]->buffer;
unsigned long *f = (unsigned long *) src_rbs[4]->buffer;
unsigned long *g = (unsigned long *) src_rbs[5]->buffer;
unsigned long a0, a1, a2, a3, b0, b1, b2, b3;
callcount[6]++;
@ -332,14 +332,14 @@ rf_nWayXor7(src_rbs, dest_rb, len)
RF_ReconBuffer_t *dest_rb;
int len;
{
register unsigned long *dst = (unsigned long *) dest_rb->buffer;
register unsigned long *b = (unsigned long *) src_rbs[0]->buffer;
register unsigned long *c = (unsigned long *) src_rbs[1]->buffer;
register unsigned long *d = (unsigned long *) src_rbs[2]->buffer;
register unsigned long *e = (unsigned long *) src_rbs[3]->buffer;
register unsigned long *f = (unsigned long *) src_rbs[4]->buffer;
register unsigned long *g = (unsigned long *) src_rbs[5]->buffer;
register unsigned long *h = (unsigned long *) src_rbs[6]->buffer;
unsigned long *dst = (unsigned long *) dest_rb->buffer;
unsigned long *b = (unsigned long *) src_rbs[0]->buffer;
unsigned long *c = (unsigned long *) src_rbs[1]->buffer;
unsigned long *d = (unsigned long *) src_rbs[2]->buffer;
unsigned long *e = (unsigned long *) src_rbs[3]->buffer;
unsigned long *f = (unsigned long *) src_rbs[4]->buffer;
unsigned long *g = (unsigned long *) src_rbs[5]->buffer;
unsigned long *h = (unsigned long *) src_rbs[6]->buffer;
unsigned long a0, a1, a2, a3, b0, b1, b2, b3;
callcount[7]++;
@ -370,15 +370,15 @@ rf_nWayXor8(src_rbs, dest_rb, len)
RF_ReconBuffer_t *dest_rb;
int len;
{
register unsigned long *dst = (unsigned long *) dest_rb->buffer;
register unsigned long *b = (unsigned long *) src_rbs[0]->buffer;
register unsigned long *c = (unsigned long *) src_rbs[1]->buffer;
register unsigned long *d = (unsigned long *) src_rbs[2]->buffer;
register unsigned long *e = (unsigned long *) src_rbs[3]->buffer;
register unsigned long *f = (unsigned long *) src_rbs[4]->buffer;
register unsigned long *g = (unsigned long *) src_rbs[5]->buffer;
register unsigned long *h = (unsigned long *) src_rbs[6]->buffer;
register unsigned long *i = (unsigned long *) src_rbs[7]->buffer;
unsigned long *dst = (unsigned long *) dest_rb->buffer;
unsigned long *b = (unsigned long *) src_rbs[0]->buffer;
unsigned long *c = (unsigned long *) src_rbs[1]->buffer;
unsigned long *d = (unsigned long *) src_rbs[2]->buffer;
unsigned long *e = (unsigned long *) src_rbs[3]->buffer;
unsigned long *f = (unsigned long *) src_rbs[4]->buffer;
unsigned long *g = (unsigned long *) src_rbs[5]->buffer;
unsigned long *h = (unsigned long *) src_rbs[6]->buffer;
unsigned long *i = (unsigned long *) src_rbs[7]->buffer;
unsigned long a0, a1, a2, a3, b0, b1, b2, b3;
callcount[8]++;
@ -411,16 +411,16 @@ rf_nWayXor9(src_rbs, dest_rb, len)
RF_ReconBuffer_t *dest_rb;
int len;
{
register unsigned long *dst = (unsigned long *) dest_rb->buffer;
register unsigned long *b = (unsigned long *) src_rbs[0]->buffer;
register unsigned long *c = (unsigned long *) src_rbs[1]->buffer;
register unsigned long *d = (unsigned long *) src_rbs[2]->buffer;
register unsigned long *e = (unsigned long *) src_rbs[3]->buffer;
register unsigned long *f = (unsigned long *) src_rbs[4]->buffer;
register unsigned long *g = (unsigned long *) src_rbs[5]->buffer;
register unsigned long *h = (unsigned long *) src_rbs[6]->buffer;
register unsigned long *i = (unsigned long *) src_rbs[7]->buffer;
register unsigned long *j = (unsigned long *) src_rbs[8]->buffer;
unsigned long *dst = (unsigned long *) dest_rb->buffer;
unsigned long *b = (unsigned long *) src_rbs[0]->buffer;
unsigned long *c = (unsigned long *) src_rbs[1]->buffer;
unsigned long *d = (unsigned long *) src_rbs[2]->buffer;
unsigned long *e = (unsigned long *) src_rbs[3]->buffer;
unsigned long *f = (unsigned long *) src_rbs[4]->buffer;
unsigned long *g = (unsigned long *) src_rbs[5]->buffer;
unsigned long *h = (unsigned long *) src_rbs[6]->buffer;
unsigned long *i = (unsigned long *) src_rbs[7]->buffer;
unsigned long *j = (unsigned long *) src_rbs[8]->buffer;
unsigned long a0, a1, a2, a3, b0, b1, b2, b3;
callcount[9]++;

74
sys/dev/rcons/raster_op.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: raster_op.c,v 1.8 1999/11/23 01:52:52 scottr Exp $ */
/* $NetBSD: raster_op.c,v 1.9 2000/03/30 12:45:41 augustss Exp $ */
/*-
* Copyright (c) 1991, 1993
@ -698,10 +698,10 @@ raster_op_noclip( dst, dx, dy, w, h, rop, src, sx, sy )
u_int32_t* srclin2;
u_int32_t* srclin;
u_int32_t* dstlin;
register u_int32_t* srclong;
register u_int32_t* dstlong;
register u_int32_t color, dl;
register int srcbit, dstbyte, i;
u_int32_t* srclong;
u_int32_t* dstlong;
u_int32_t color, dl;
int srcbit, dstbyte, i;
color = RAS_GETCOLOR( rop );
if ( color == 0 )
@ -771,10 +771,10 @@ raster_op_noclip( dst, dx, dy, w, h, rop, src, sx, sy )
u_int32_t* srclin2;
u_int32_t* srclin;
u_int32_t* dstlin;
register u_int32_t* srclong;
register u_int32_t* dstlong;
register u_int32_t color, dl;
register int srcbit, dstbyte, i;
u_int32_t* srclong;
u_int32_t* dstlong;
u_int32_t color, dl;
int srcbit, dstbyte, i;
color = RAS_GETCOLOR( rop );
if ( color == 0 )
@ -846,10 +846,10 @@ raster_op_noclip( dst, dx, dy, w, h, rop, src, sx, sy )
u_int32_t* srclin2;
u_int32_t* srclin;
u_int32_t* dstlin;
register u_int32_t* srclong;
register u_int32_t* dstlong;
register u_int32_t color, dl;
register int srcbit, dstbyte, i;
u_int32_t* srclong;
u_int32_t* dstlong;
u_int32_t color, dl;
int srcbit, dstbyte, i;
color = RAS_GETCOLOR( rop );
if ( color == 0 )
@ -917,10 +917,10 @@ raster_op_noclip( dst, dx, dy, w, h, rop, src, sx, sy )
u_int32_t* srclin2;
u_int32_t* srclin;
u_int32_t* dstlin;
register u_int32_t* srclong;
register u_int32_t* dstlong;
register u_int32_t color, dl;
register int srcbit, dstbyte, i;
u_int32_t* srclong;
u_int32_t* dstlong;
u_int32_t color, dl;
int srcbit, dstbyte, i;
color = RAS_GETCOLOR( rop );
if ( color == 0 )
@ -1109,8 +1109,8 @@ raster_op_nosrc_noclip( dst, dx, dy, w, h, rop )
u_int32_t* dstlin;
int dstleftignore, dstrightignore, dstlongs;
u_int32_t dl, lm, nlm, rm, nrm;
register u_int32_t* dstlong2;
register u_int32_t* dstlong;
u_int32_t* dstlong2;
u_int32_t* dstlong;
dstlin1 = RAS_ADDR( dst, dx, dy );
@ -1199,14 +1199,14 @@ raster_op_nosrc_noclip( dst, dx, dy, w, h, rop )
else if ( dst->depth == 2 )
{
/* Two-bit no-src blit. */
register u_int32_t color;
u_int32_t color;
u_int32_t* dstlin1;
u_int32_t* dstlin2;
u_int32_t* dstlin;
int dstleftignore, dstrightignore, dstlongs;
u_int32_t dl, lm, nlm, rm, nrm;
register u_int32_t* dstlong2;
register u_int32_t* dstlong;
u_int32_t* dstlong2;
u_int32_t* dstlong;
dstlin1 = RAS_ADDR( dst, dx, dy );
@ -1306,14 +1306,14 @@ raster_op_nosrc_noclip( dst, dx, dy, w, h, rop )
else if ( dst->depth == 4 )
{
/* Two-bit no-src blit. */
register u_int32_t color;
u_int32_t color;
u_int32_t* dstlin1;
u_int32_t* dstlin2;
u_int32_t* dstlin;
int dstleftignore, dstrightignore, dstlongs;
u_int32_t dl, lm, nlm, rm, nrm;
register u_int32_t* dstlong2;
register u_int32_t* dstlong;
u_int32_t* dstlong2;
u_int32_t* dstlong;
dstlin1 = RAS_ADDR( dst, dx, dy );
@ -1411,14 +1411,14 @@ raster_op_nosrc_noclip( dst, dx, dy, w, h, rop )
else if ( dst->depth == 8)
{
/* Eight-bit no-src blit. */
register u_int32_t color;
u_int32_t color;
u_int32_t* dstlin1;
u_int32_t* dstlin2;
u_int32_t* dstlin;
int dstleftignore, dstrightignore, dstlongs;
u_int32_t dl, lm, nlm, rm, nrm;
register u_int32_t* dstlong2;
register u_int32_t* dstlong;
u_int32_t* dstlong2;
u_int32_t* dstlong;
dstlin1 = RAS_ADDR( dst, dx, dy );
@ -1516,14 +1516,14 @@ raster_op_nosrc_noclip( dst, dx, dy, w, h, rop )
else
{
/* Sixteen-bit no-src blit. */
register u_int32_t color;
u_int32_t color;
u_int32_t* dstlin1;
u_int32_t* dstlin2;
u_int32_t* dstlin;
int dstleftignore, dstrightignore, dstlongs;
u_int32_t dl, lm, nlm, rm, nrm;
register u_int32_t* dstlong2;
register u_int32_t* dstlong;
u_int32_t* dstlong2;
u_int32_t* dstlong;
dstlin1 = RAS_ADDR( dst, dx, dy );
@ -1640,12 +1640,12 @@ raster_blit( src, srclin1, srcleftignore, srcrightignore, srclongs, dst, dstlin1
int srclininc, dstlininc;
u_int32_t* srclin;
u_int32_t* dstlin;
register int prevleftshift, currrightshift;
int prevleftshift, currrightshift;
int longinc;
register u_int32_t* srclong;
register u_int32_t* dstlong;
register u_int32_t* dstlong2;
register u_int32_t dl, lm, nlm, rm, nrm;
u_int32_t* srclong;
u_int32_t* dstlong;
u_int32_t* dstlong2;
u_int32_t dl, lm, nlm, rm, nrm;
prevleftshift = ( srcleftignore - dstleftignore ) & 31;
@ -1818,7 +1818,7 @@ raster_blit( src, srclin1, srcleftignore, srcrightignore, srclongs, dst, dstlin1
else
{
/* General case, with shifting and everything. */
register u_int32_t sl, prevsl;
u_int32_t sl, prevsl;
currrightshift = 32 - prevleftshift;
if ( srclongs == 1 && dstlongs == 1 )

8
sys/dev/rcons/raster_text.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: raster_text.c,v 1.3 1995/11/24 23:50:56 cgd Exp $ */
/* $NetBSD: raster_text.c,v 1.4 2000/03/30 12:45:41 augustss Exp $ */
/*-
* Copyright (c) 1991, 1993
@ -64,7 +64,7 @@
/* Draws text. Returns 0 on success, -1 on failure. */
int
raster_text( r, x, y, rop, rf, text )
register struct raster* r;
struct raster* r;
int x, y;
int rop;
struct raster_font* rf;
@ -76,7 +76,7 @@ raster_text( r, x, y, rop, rf, text )
/* Draws n characters of text. Returns 0 on success, -1 on failure. */
int
raster_textn( r, x, y, rop, rf, text, n )
register struct raster* r;
struct raster* r;
int x, y;
int rop;
struct raster_font* rf;
@ -88,7 +88,7 @@ raster_textn( r, x, y, rop, rf, text, n )
struct raster_char* c;
struct raster* charrast;
int i;
register unsigned char ch;
unsigned char ch;
int thisx, thisy;
int phase;

10
sys/dev/sun/event.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: event.c,v 1.3 1996/09/12 01:35:34 mrg Exp $ */
/* $NetBSD: event.c,v 1.4 2000/03/30 12:45:42 augustss Exp $ */
/*
* Copyright (c) 1992, 1993
@ -65,7 +65,7 @@
*/
void
ev_init(ev)
register struct evvar *ev;
struct evvar *ev;
{
ev->ev_get = ev->ev_put = 0;
@ -79,7 +79,7 @@ ev_init(ev)
*/
void
ev_fini(ev)
register struct evvar *ev;
struct evvar *ev;
{
free(ev->ev_q, M_DEVBUF);
@ -91,7 +91,7 @@ ev_fini(ev)
*/
int
ev_read(ev, uio, flags)
register struct evvar *ev;
struct evvar *ev;
struct uio *uio;
int flags;
{
@ -148,7 +148,7 @@ ev_read(ev, uio, flags)
int
ev_poll(ev, events, p)
register struct evvar *ev;
struct evvar *ev;
int events;
struct proc *p;
{

26
sys/dev/sun/kbd_zs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kbd_zs.c,v 1.4 2000/03/23 07:01:44 thorpej Exp $ */
/* $NetBSD: kbd_zs.c,v 1.5 2000/03/30 12:45:42 augustss Exp $ */
/*
* Copyright (c) 1992, 1993
@ -210,11 +210,11 @@ kbd_zs_write_data(k, c)
static void
kbd_zs_rxint(cs)
register struct zs_chanstate *cs;
struct zs_chanstate *cs;
{
register struct kbd_softc *k;
register int put, put_next;
register u_char c, rr1;
struct kbd_softc *k;
int put, put_next;
u_char c, rr1;
k = cs->cs_private;
put = k->k_rbput;
@ -274,9 +274,9 @@ kbd_zs_rxint(cs)
static void
kbd_zs_txint(cs)
register struct zs_chanstate *cs;
struct zs_chanstate *cs;
{
register struct kbd_softc *k;
struct kbd_softc *k;
k = cs->cs_private;
zs_write_csr(cs, ZSWR0_RESET_TXINT);
@ -288,11 +288,11 @@ kbd_zs_txint(cs)
static void
kbd_zs_stint(cs, force)
register struct zs_chanstate *cs;
struct zs_chanstate *cs;
int force;
{
register struct kbd_softc *k;
register int rr0;
struct kbd_softc *k;
int rr0;
k = cs->cs_private;
@ -330,10 +330,10 @@ static void
kbd_zs_softint(cs)
struct zs_chanstate *cs;
{
register struct kbd_softc *k;
register int get, c, s;
struct kbd_softc *k;
int get, c, s;
int intr_flags;
register u_short ring_data;
u_short ring_data;
k = cs->cs_private;

12
sys/dev/sun/ms.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ms.c,v 1.17 1999/08/02 01:50:27 matt Exp $ */
/* $NetBSD: ms.c,v 1.18 2000/03/30 12:45:42 augustss Exp $ */
/*
* Copyright (c) 1992, 1993
@ -156,7 +156,7 @@ int
msioctl(dev, cmd, data, flag, p)
dev_t dev;
u_long cmd;
register caddr_t data;
caddr_t data;
int flag;
struct proc *p;
{
@ -213,11 +213,11 @@ mspoll(dev, events, p)
*/
void
ms_input(ms, c)
register struct ms_softc *ms;
register int c;
struct ms_softc *ms;
int c;
{
register struct firm_event *fe;
register int mb, ub, d, get, put, any;
struct firm_event *fe;
int mb, ub, d, get, put, any;
static const char to_one[] = { 1, 2, 2, 4, 4, 4, 4 };
static const int to_id[] = { MS_RIGHT, MS_MIDDLE, 0, MS_LEFT };

26
sys/dev/sun/ms_zs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ms_zs.c,v 1.2 1999/08/02 01:44:22 matt Exp $ */
/* $NetBSD: ms_zs.c,v 1.3 2000/03/30 12:45:42 augustss Exp $ */
/*
* Copyright (c) 1992, 1993
@ -164,11 +164,11 @@ ms_zs_attach(parent, self, aux)
static void
ms_zs_rxint(cs)
register struct zs_chanstate *cs;
struct zs_chanstate *cs;
{
register struct ms_softc *ms;
register int put, put_next;
register u_char c, rr1;
struct ms_softc *ms;
int put, put_next;
u_char c, rr1;
ms = cs->cs_private;
put = ms->ms_rbput;
@ -205,9 +205,9 @@ ms_zs_rxint(cs)
static void
ms_zs_txint(cs)
register struct zs_chanstate *cs;
struct zs_chanstate *cs;
{
register struct ms_softc *ms;
struct ms_softc *ms;
ms = cs->cs_private;
zs_write_csr(cs, ZSWR0_RESET_TXINT);
@ -218,11 +218,11 @@ ms_zs_txint(cs)
static void
ms_zs_stint(cs, force)
register struct zs_chanstate *cs;
struct zs_chanstate *cs;
int force;
{
register struct ms_softc *ms;
register int rr0;
struct ms_softc *ms;
int rr0;
ms = cs->cs_private;
@ -248,10 +248,10 @@ static void
ms_zs_softint(cs)
struct zs_chanstate *cs;
{
register struct ms_softc *ms;
register int get, c, s;
struct ms_softc *ms;
int get, c, s;
int intr_flags;
register u_short ring_data;
u_short ring_data;
ms = cs->cs_private;

184
sys/dev/tc/asc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: asc.c,v 1.59 2000/03/23 07:01:45 thorpej Exp $ */
/* $NetBSD: asc.c,v 1.60 2000/03/30 12:45:43 augustss Exp $ */
/*-
* Copyright (c) 1992, 1993
@ -147,7 +147,7 @@
/*#define readback(a) { register int foo; wbflush(); foo = (a); }*/
#define readback(a) { register int foo; foo = (a); }
#define readback(a) { int foo; foo = (a); }
/*
* In 4ns ticks.
@ -235,8 +235,8 @@ typedef struct script {
int condition; /* expected state at interrupt time */
int (*action) /* extra operations */
__P((register struct asc_softc *asc, register int status,
register int ss, register int ir));
__P((struct asc_softc *asc, int status,
int ss, int ir));
int command; /* command to the chip */
struct script *next; /* index into asc_scripts for next state */
} script_t;
@ -253,8 +253,8 @@ typedef struct script {
* A typedef for a script function, to use in forward declarations.
*/
typedef int
script_fn_t __P((register struct asc_softc *asc, register int status,
register int ss, register int ir));
script_fn_t __P((struct asc_softc *asc, int status,
int ss, int ir));
/* forward decls of script actions */
@ -419,7 +419,7 @@ struct scsipi_device asc_dev = {
/*
* Definition of the controller for the old auto-configuration program.
*/
void asc_start __P((register ScsiCmd *scsicmd));
void asc_start __P((ScsiCmd *scsicmd));
int asc_intr __P ((void *asc));
struct pmax_driver ascdriver = {
"asc", NULL, asc_start, 0, asc_intr,
@ -434,10 +434,10 @@ extern struct cfdriver asc_cd;
*/
void
ascattach(asc, bus_speed)
register asc_softc_t asc;
asc_softc_t asc;
int bus_speed;
{
register asc_regmap_t *regs;
asc_regmap_t *regs;
int id, s;
int unit;
@ -556,10 +556,10 @@ asc_minphys(bp)
*/
void
asc_start(scsicmd)
register ScsiCmd *scsicmd; /* command to start */
ScsiCmd *scsicmd; /* command to start */
{
register struct pmax_scsi_device *sdp = scsicmd->sd;
register asc_softc_t asc = asc_cd.cd_devs[sdp->sd_ctlr];
struct pmax_scsi_device *sdp = scsicmd->sd;
asc_softc_t asc = asc_cd.cd_devs[sdp->sd_ctlr];
int s;
s = splbio();
@ -657,9 +657,9 @@ asc_startcmd(asc, target)
asc_softc_t asc;
int target;
{
register asc_regmap_t *regs;
register ScsiCmd *scsicmd;
register State *state;
asc_regmap_t *regs;
ScsiCmd *scsicmd;
State *state;
int len;
/*
@ -815,12 +815,12 @@ int
asc_intr(sc)
void *sc;
{
register asc_softc_t asc = (asc_softc_t) sc;
register asc_regmap_t *regs = asc->regs;
register State *state = NULL; /* XXX shut gcc up */
register script_t *scpt;
register int ss, ir, status;
register unsigned char cmd_was;
asc_softc_t asc = (asc_softc_t) sc;
asc_regmap_t *regs = asc->regs;
State *state = NULL; /* XXX shut gcc up */
script_t *scpt;
int ss, ir, status;
unsigned char cmd_was;
static int ill_cmd_count = 0; /* XXX */
/* collect ephemeral information */
@ -893,7 +893,7 @@ again:
/* check for message in or out */
if ((ir & ~ASC_INT_FC) == ASC_INT_BS) {
register int len, fifo;
int len, fifo;
state = &asc->st[asc->target];
switch (ASC_PHASE(status)) {
@ -1108,7 +1108,7 @@ again:
/* check for SCSI bus reset */
if (ir & ASC_INT_RESET) {
register int i;
int i;
printf("%s: SCSI bus reset!!\n", asc->sc_dev.dv_xname);
/* need to flush any pending commands */
@ -1301,8 +1301,8 @@ abort:
/* ARGSUSED */
static int
script_nop(asc, status, ss, ir)
register asc_softc_t asc;
register int status, ss, ir;
asc_softc_t asc;
int status, ss, ir;
{
return (1);
}
@ -1310,11 +1310,11 @@ script_nop(asc, status, ss, ir)
/* ARGSUSED */
static int
asc_get_status(asc, status, ss, ir)
register asc_softc_t asc;
register int status, ss, ir;
asc_softc_t asc;
int status, ss, ir;
{
register asc_regmap_t *regs = asc->regs;
register int data;
asc_regmap_t *regs = asc->regs;
int data;
/*
* Get the last two bytes in the FIFO.
@ -1359,12 +1359,12 @@ asc_get_status(asc, status, ss, ir)
/* ARGSUSED */
static int
asc_end(asc, status, ss, ir)
register asc_softc_t asc;
register int status, ss, ir;
asc_softc_t asc;
int status, ss, ir;
{
register ScsiCmd *scsicmd;
register State *state;
register int i, target;
ScsiCmd *scsicmd;
State *state;
int i, target;
asc->state = ASC_STATE_IDLE;
target = asc->target;
@ -1444,12 +1444,12 @@ asc_end(asc, status, ss, ir)
/* ARGSUSED */
static int
asc_dma_in(asc, status, ss, ir)
register asc_softc_t asc;
register int status, ss, ir;
asc_softc_t asc;
int status, ss, ir;
{
register asc_regmap_t *regs = asc->regs;
register State *state = &asc->st[asc->target];
register int len;
asc_regmap_t *regs = asc->regs;
State *state = &asc->st[asc->target];
int len;
/* check for previous chunk in buffer */
if (state->flags & DMA_IN_PROGRESS) {
@ -1526,12 +1526,12 @@ asc_dma_in(asc, status, ss, ir)
/* ARGSUSED */
static int
asc_last_dma_in(asc, status, ss, ir)
register asc_softc_t asc;
register int status, ss, ir;
asc_softc_t asc;
int status, ss, ir;
{
register asc_regmap_t *regs = asc->regs;
register State *state = &asc->st[asc->target];
register int len, fifo;
asc_regmap_t *regs = asc->regs;
State *state = &asc->st[asc->target];
int len, fifo;
ASC_TC_GET(regs, len);
fifo = regs->asc_flags & ASC_FLAGS_FIFO_CNT;
@ -1557,12 +1557,12 @@ asc_last_dma_in(asc, status, ss, ir)
/* ARGSUSED */
static int
asc_resume_in(asc, status, ss, ir)
register asc_softc_t asc;
register int status, ss, ir;
asc_softc_t asc;
int status, ss, ir;
{
register asc_regmap_t *regs = asc->regs;
register State *state = &asc->st[asc->target];
register int len;
asc_regmap_t *regs = asc->regs;
State *state = &asc->st[asc->target];
int len;
/* setup to start reading the next chunk */
len = state->buflen;
@ -1595,12 +1595,12 @@ asc_resume_in(asc, status, ss, ir)
/* ARGSUSED */
static int
asc_resume_dma_in(asc, status, ss, ir)
register asc_softc_t asc;
register int status, ss, ir;
asc_softc_t asc;
int status, ss, ir;
{
register asc_regmap_t *regs = asc->regs;
register State *state = &asc->st[asc->target];
register int len, off;
asc_regmap_t *regs = asc->regs;
State *state = &asc->st[asc->target];
int len, off;
/* setup to finish reading the current chunk */
len = state->dmaresid;
@ -1639,12 +1639,12 @@ asc_resume_dma_in(asc, status, ss, ir)
/* ARGSUSED */
static int
asc_dma_out(asc, status, ss, ir)
register asc_softc_t asc;
register int status, ss, ir;
asc_softc_t asc;
int status, ss, ir;
{
register asc_regmap_t *regs = asc->regs;
register State *state = &asc->st[asc->target];
register int len, fifo;
asc_regmap_t *regs = asc->regs;
State *state = &asc->st[asc->target];
int len, fifo;
if (state->flags & DMA_IN_PROGRESS) {
/* check to be sure previous chunk was finished */
@ -1698,12 +1698,12 @@ asc_dma_out(asc, status, ss, ir)
/* ARGSUSED */
static int
asc_last_dma_out(asc, status, ss, ir)
register asc_softc_t asc;
register int status, ss, ir;
asc_softc_t asc;
int status, ss, ir;
{
register asc_regmap_t *regs = asc->regs;
register State *state = &asc->st[asc->target];
register int len, fifo;
asc_regmap_t *regs = asc->regs;
State *state = &asc->st[asc->target];
int len, fifo;
ASC_TC_GET(regs, len);
fifo = regs->asc_flags & ASC_FLAGS_FIFO_CNT;
@ -1728,12 +1728,12 @@ asc_last_dma_out(asc, status, ss, ir)
/* ARGSUSED */
static int
asc_resume_out(asc, status, ss, ir)
register asc_softc_t asc;
register int status, ss, ir;
asc_softc_t asc;
int status, ss, ir;
{
register asc_regmap_t *regs = asc->regs;
register State *state = &asc->st[asc->target];
register int len;
asc_regmap_t *regs = asc->regs;
State *state = &asc->st[asc->target];
int len;
/* setup for this chunk */
len = state->buflen;
@ -1766,12 +1766,12 @@ asc_resume_out(asc, status, ss, ir)
/* ARGSUSED */
static int
asc_resume_dma_out(asc, status, ss, ir)
register asc_softc_t asc;
register int status, ss, ir;
asc_softc_t asc;
int status, ss, ir;
{
register asc_regmap_t *regs = asc->regs;
register State *state = &asc->st[asc->target];
register int len, off;
asc_regmap_t *regs = asc->regs;
State *state = &asc->st[asc->target];
int len, off;
/* setup to finish writing this chunk */
len = state->dmaresid;
@ -1813,11 +1813,11 @@ asc_resume_dma_out(asc, status, ss, ir)
/* ARGSUSED */
static int
asc_sendsync(asc, status, ss, ir)
register asc_softc_t asc;
register int status, ss, ir;
asc_softc_t asc;
int status, ss, ir;
{
register asc_regmap_t *regs = asc->regs;
register State *state = &asc->st[asc->target];
asc_regmap_t *regs = asc->regs;
State *state = &asc->st[asc->target];
/* send the extended synchronous negotiation message */
regs->asc_fifo = SCSI_EXTENDED_MSG;
@ -1838,11 +1838,11 @@ asc_sendsync(asc, status, ss, ir)
/* ARGSUSED */
static int
asc_replysync(asc, status, ss, ir)
register asc_softc_t asc;
register int status, ss, ir;
asc_softc_t asc;
int status, ss, ir;
{
register asc_regmap_t *regs = asc->regs;
register State *state = &asc->st[asc->target];
asc_regmap_t *regs = asc->regs;
State *state = &asc->st[asc->target];
#ifdef DEBUG
if (asc_debug > 2)
@ -1878,12 +1878,12 @@ asc_replysync(asc, status, ss, ir)
/* ARGSUSED */
static int
asc_msg_in(asc, status, ss, ir)
register asc_softc_t asc;
register int status, ss, ir;
asc_softc_t asc;
int status, ss, ir;
{
register asc_regmap_t *regs = asc->regs;
register State *state = &asc->st[asc->target];
register int msg;
asc_regmap_t *regs = asc->regs;
State *state = &asc->st[asc->target];
int msg;
int i;
/* read one message byte */
@ -2072,13 +2072,13 @@ done:
/* ARGSUSED */
static int
asc_disconnect(asc, status, ss, ir)
register asc_softc_t asc;
register int status, ss, ir;
asc_softc_t asc;
int status, ss, ir;
{
int i;
#ifdef DIAGNOSTIC
/* later Mach driver checks for late asych disconnect here. */
register State *state = &asc->st[asc->target];
State *state = &asc->st[asc->target];
if (!(state->flags & DISCONN)) {
printf("asc_disconnect: device %d: DISCONN not set!\n",
@ -2127,8 +2127,8 @@ void
asc_DumpLog(str)
char *str;
{
register struct asc_log *lp;
register u_int status;
struct asc_log *lp;
u_int status;
printf("asc: %s: cmd %x bn %d cnt %d\n", str, asc_debug_cmd,
asc_debug_bn, asc_debug_sz);

24
sys/dev/tc/if_le_ibus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_le_ibus.c,v 1.14 2000/01/10 13:32:02 simonb Exp $ */
/* $NetBSD: if_le_ibus.c,v 1.15 2000/03/30 12:45:43 augustss Exp $ */
/*
* Copyright 1996 The Board of Trustees of The Leland Stanford
@ -95,10 +95,10 @@ le_pmax_attach(parent, self, aux)
struct device *parent, *self;
void *aux;
{
register struct le_softc *lesc = (void *)self;
register struct lance_softc *sc = &lesc->sc_am7990.lsc;
register u_char *cp;
register struct ibus_attach_args *ia = aux;
struct le_softc *lesc = (void *)self;
struct lance_softc *sc = &lesc->sc_am7990.lsc;
u_char *cp;
struct ibus_attach_args *ia = aux;
/*
* It's on the baseboard, with a dedicated interrupt line.
@ -131,11 +131,11 @@ le_dec_copytobuf_gap2(sc, fromv, boff, len)
struct lance_softc *sc;
void *fromv;
int boff;
register int len;
int len;
{
volatile caddr_t buf = sc->sc_mem;
register caddr_t from = fromv;
register volatile u_int16_t *bptr;
caddr_t from = fromv;
volatile u_int16_t *bptr;
if (boff & 0x1) {
/* handle unaligned first byte */
@ -162,9 +162,9 @@ le_dec_copyfrombuf_gap2(sc, tov, boff, len)
int boff, len;
{
volatile caddr_t buf = sc->sc_mem;
register caddr_t to = tov;
register volatile u_int16_t *bptr;
register u_int16_t tmp;
caddr_t to = tov;
volatile u_int16_t *bptr;
u_int16_t tmp;
if (boff & 0x1) {
/* handle unaligned first byte */
@ -191,7 +191,7 @@ le_dec_zerobuf_gap2(sc, boff, len)
int boff, len;
{
volatile caddr_t buf = sc->sc_mem;
register volatile u_int16_t *bptr;
volatile u_int16_t *bptr;
if ((unsigned)boff & 0x1) {
bptr = ((volatile u_int16_t *)buf) + (boff - 1);

60
sys/dev/tc/if_le_ioasic.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_le_ioasic.c,v 1.14 1999/10/01 09:19:42 nisimura Exp $ */
/* $NetBSD: if_le_ioasic.c,v 1.15 2000/03/30 12:45:43 augustss Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & macro defns */
__KERNEL_RCSID(0, "$NetBSD: if_le_ioasic.c,v 1.14 1999/10/01 09:19:42 nisimura Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_le_ioasic.c,v 1.15 2000/03/30 12:45:43 augustss Exp $");
#include "opt_inet.h"
@ -119,8 +119,8 @@ le_ioasic_attach(parent, self, aux)
void *aux;
{
struct ioasicdev_attach_args *d = aux;
register struct le_softc *lesc = (void *)self;
register struct lance_softc *sc = &lesc->sc_am7990.lsc;
struct le_softc *lesc = (void *)self;
struct lance_softc *sc = &lesc->sc_am7990.lsc;
ioasic_lance_dma_setup(parent);
@ -162,11 +162,11 @@ le_ioasic_copytobuf_gap2(sc, fromv, boff, len)
struct lance_softc *sc;
void *fromv;
int boff;
register int len;
int len;
{
volatile caddr_t buf = sc->sc_mem;
register caddr_t from = fromv;
register volatile u_int16_t *bptr;
caddr_t from = fromv;
volatile u_int16_t *bptr;
if (boff & 0x1) {
/* handle unaligned first byte */
@ -193,9 +193,9 @@ le_ioasic_copyfrombuf_gap2(sc, tov, boff, len)
int boff, len;
{
volatile caddr_t buf = sc->sc_mem;
register caddr_t to = tov;
register volatile u_int16_t *bptr;
register u_int16_t tmp;
caddr_t to = tov;
volatile u_int16_t *bptr;
u_int16_t tmp;
if (boff & 0x1) {
/* handle unaligned first byte */
@ -227,11 +227,11 @@ le_ioasic_copytobuf_gap16(sc, fromv, boff, len)
struct lance_softc *sc;
void *fromv;
int boff;
register int len;
int len;
{
volatile caddr_t buf = sc->sc_mem;
register caddr_t from = fromv;
register caddr_t bptr;
caddr_t from = fromv;
caddr_t bptr;
bptr = buf + ((boff << 1) & ~0x1f);
boff &= 0xf;
@ -241,7 +241,7 @@ le_ioasic_copytobuf_gap16(sc, fromv, boff, len)
* 16-byte aligned.
*/
if (boff) {
register int xfer;
int xfer;
xfer = min(len, 16 - boff);
bcopy(from, bptr + boff, xfer);
from += xfer;
@ -255,9 +255,9 @@ le_ioasic_copytobuf_gap16(sc, fromv, boff, len)
case 2:
/* Ethernet headers make this the dominant case. */
do {
register u_int32_t *dst = (u_int32_t*)bptr;
register u_int16_t t0;
register u_int32_t t1, t2, t3, t4;
u_int32_t *dst = (u_int32_t*)bptr;
u_int16_t t0;
u_int32_t t1, t2, t3, t4;
/* read from odd-16-bit-aligned, cached src */
t0 = *(u_int16_t*)from;
@ -280,9 +280,9 @@ le_ioasic_copytobuf_gap16(sc, fromv, boff, len)
case 0:
do {
register u_int32_t *src = (u_int32_t*)from;
register u_int32_t *dst = (u_int32_t*)bptr;
register u_int32_t t0, t1, t2, t3;
u_int32_t *src = (u_int32_t*)from;
u_int32_t *dst = (u_int32_t*)bptr;
u_int32_t t0, t1, t2, t3;
t0 = src[0]; t1 = src[1]; t2 = src[2]; t3 = src[3];
dst[0] = t0; dst[1] = t1; dst[2] = t2; dst[3] = t3;
@ -314,15 +314,15 @@ le_ioasic_copyfrombuf_gap16(sc, tov, boff, len)
int boff, len;
{
volatile caddr_t buf = sc->sc_mem;
register caddr_t to = tov;
register caddr_t bptr;
caddr_t to = tov;
caddr_t bptr;
bptr = buf + ((boff << 1) & ~0x1f);
boff &= 0xf;
/* Dispose of boff. source of copy is subsequently 16-byte aligned. */
if (boff) {
register int xfer;
int xfer;
xfer = min(len, 16 - boff);
bcopy(bptr+boff, to, xfer);
to += xfer;
@ -337,8 +337,8 @@ le_ioasic_copyfrombuf_gap16(sc, tov, boff, len)
* make this the dominant case (98% or more).
*/
do {
register u_int32_t *src = (u_int32_t*)bptr;
register u_int32_t t0, t1, t2, t3;
u_int32_t *src = (u_int32_t*)bptr;
u_int32_t t0, t1, t2, t3;
/* read from uncached aligned DMA buf */
t0 = src[0]; t1 = src[1]; t2 = src[2]; t3 = src[3];
@ -357,9 +357,9 @@ le_ioasic_copyfrombuf_gap16(sc, tov, boff, len)
case 0:
/* 32-bit aligned aligned copy. Rare. */
do {
register u_int32_t *src = (u_int32_t*)bptr;
register u_int32_t *dst = (u_int32_t*)to;
register u_int32_t t0, t1, t2, t3;
u_int32_t *src = (u_int32_t*)bptr;
u_int32_t *dst = (u_int32_t*)to;
u_int32_t t0, t1, t2, t3;
t0 = src[0]; t1 = src[1]; t2 = src[2]; t3 = src[3];
dst[0] = t0; dst[1] = t1; dst[2] = t2; dst[3] = t3;
@ -389,8 +389,8 @@ le_ioasic_zerobuf_gap16(sc, boff, len)
int boff, len;
{
volatile caddr_t buf = sc->sc_mem;
register caddr_t bptr;
register int xfer;
caddr_t bptr;
int xfer;
bptr = buf + ((boff << 1) & ~0x1f);
boff &= 0xf;

6
sys/dev/tc/if_le_tc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_le_tc.c,v 1.10 1999/03/04 01:39:04 nisimura Exp $ */
/* $NetBSD: if_le_tc.c,v 1.11 2000/03/30 12:45:43 augustss Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@ -86,8 +86,8 @@ le_tc_attach(parent, self, aux)
struct device *parent, *self;
void *aux;
{
register struct le_softc *lesc = (void *)self;
register struct lance_softc *sc = &lesc->sc_am7990.lsc;
struct le_softc *lesc = (void *)self;
struct lance_softc *sc = &lesc->sc_am7990.lsc;
struct tc_attach_args *d = aux;
/*

26
sys/dev/vnd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vnd.c,v 1.64 2000/02/07 20:16:55 thorpej Exp $ */
/* $NetBSD: vnd.c,v 1.65 2000/03/30 12:45:27 augustss Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@ -309,7 +309,7 @@ vndclose(dev, flags, mode, p)
*/
void
vndstrategy(bp)
register struct buf *bp;
struct buf *bp;
{
int unit = vndunit(bp->b_dev);
struct vnd_softc *vnd = &vnd_softc[unit];
@ -514,7 +514,7 @@ out: /* Arrive here at splbio */
*/
void
vndstart(vnd)
register struct vnd_softc *vnd;
struct vnd_softc *vnd;
{
struct buf *bp;
@ -555,10 +555,10 @@ void
vndiodone(bp)
struct buf *bp;
{
register struct vndbuf *vbp = (struct vndbuf *) bp;
register struct vndxfer *vnx = (struct vndxfer *)vbp->vb_xfer;
register struct buf *pbp = vnx->vx_bp;
register struct vnd_softc *vnd = &vnd_softc[vndunit(pbp->b_dev)];
struct vndbuf *vbp = (struct vndbuf *) bp;
struct vndxfer *vnx = (struct vndxfer *)vbp->vb_xfer;
struct buf *pbp = vnx->vx_bp;
struct vnd_softc *vnd = &vnd_softc[vndunit(pbp->b_dev)];
int s, resid;
s = splbio();
@ -688,7 +688,7 @@ vndioctl(dev, cmd, data, flag, p)
struct proc *p;
{
int unit = vndunit(dev);
register struct vnd_softc *vnd;
struct vnd_softc *vnd;
struct vnd_ioctl *vio;
struct vattr vattr;
struct nameidata nd;
@ -964,7 +964,7 @@ vndioctl(dev, cmd, data, flag, p)
*/
int
vndsetcred(vnd, cred)
register struct vnd_softc *vnd;
struct vnd_softc *vnd;
struct ucred *cred;
{
struct uio auio;
@ -1008,7 +1008,7 @@ vndsetcred(vnd, cred)
*/
void
vndthrottle(vnd, vp)
register struct vnd_softc *vnd;
struct vnd_softc *vnd;
struct vnode *vp;
{
#ifdef NFS
@ -1027,7 +1027,7 @@ vndthrottle(vnd, vp)
void
vndshutdown()
{
register struct vnd_softc *vnd;
struct vnd_softc *vnd;
for (vnd = &vnd_softc[0]; vnd < &vnd_softc[numvnd]; vnd++)
if (vnd->sc_flags & VNF_INITED)
@ -1036,9 +1036,9 @@ vndshutdown()
void
vndclear(vnd)
register struct vnd_softc *vnd;
struct vnd_softc *vnd;
{
register struct vnode *vp = vnd->sc_vp;
struct vnode *vp = vnd->sc_vp;
struct proc *p = curproc; /* XXX */
#ifdef DEBUG

8
sys/dev/wscons/wscons_rops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wscons_rops.c,v 1.5 1999/02/12 11:25:23 drochner Exp $ */
/* $NetBSD: wscons_rops.c,v 1.6 2000/03/30 12:45:44 augustss Exp $ */
/*
* Copyright (c) 1991, 1993
@ -60,8 +60,8 @@ rcons_cursor(id, on, row, col)
void *id;
int on, row, col;
{
register struct rcons *rc = id;
register int x, y;
struct rcons *rc = id;
int x, y;
/* turn the cursor off */
if (!on) {
@ -120,7 +120,7 @@ rcons_putchar(id, row, col, uc, attr)
long attr;
{
struct rcons *rc = id;
register int x, y, op;
int x, y, op;
u_char help;
x = col * rc->rc_font->width + rc->rc_xorigin;

8
sys/dev/wscons/wsdisplay.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wsdisplay.c,v 1.36 2000/03/23 07:01:47 thorpej Exp $ */
/* $NetBSD: wsdisplay.c,v 1.37 2000/03/30 12:45:44 augustss Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.36 2000/03/23 07:01:47 thorpej Exp $");
__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.37 2000/03/30 12:45:44 augustss Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@ -1163,11 +1163,11 @@ wsdisplaypoll(dev, events, p)
void
wsdisplaystart(tp)
register struct tty *tp;
struct tty *tp;
{
struct wsdisplay_softc *sc;
struct wsscreen *scr;
register int s, n;
int s, n;
u_char *buf;
s = spltty();

12
sys/dev/wscons/wsevent.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: wsevent.c,v 1.4 2000/01/05 11:19:37 drochner Exp $ */
/* $NetBSD: wsevent.c,v 1.5 2000/03/30 12:45:44 augustss Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: wsevent.c,v 1.4 2000/01/05 11:19:37 drochner Exp $");
__KERNEL_RCSID(0, "$NetBSD: wsevent.c,v 1.5 2000/03/30 12:45:44 augustss Exp $");
/*
* Copyright (c) 1992, 1993
@ -98,7 +98,7 @@ __KERNEL_RCSID(0, "$NetBSD: wsevent.c,v 1.4 2000/01/05 11:19:37 drochner Exp $")
*/
void
wsevent_init(ev)
register struct wseventvar *ev;
struct wseventvar *ev;
{
ev->get = ev->put = 0;
@ -112,7 +112,7 @@ wsevent_init(ev)
*/
void
wsevent_fini(ev)
register struct wseventvar *ev;
struct wseventvar *ev;
{
free(ev->q, M_DEVBUF);
@ -124,7 +124,7 @@ wsevent_fini(ev)
*/
int
wsevent_read(ev, uio, flags)
register struct wseventvar *ev;
struct wseventvar *ev;
struct uio *uio;
int flags;
{
@ -182,7 +182,7 @@ wsevent_read(ev, uio, flags)
int
wsevent_poll(ev, events, p)
register struct wseventvar *ev;
struct wseventvar *ev;
int events;
struct proc *p;
{

4
sys/ntfs/ntfs_ihash.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ntfs_ihash.h,v 1.5 2000/03/16 18:08:32 jdolecek Exp $ */
/* $NetBSD: ntfs_ihash.h,v 1.6 2000/03/30 12:47:01 augustss Exp $ */
/*-
* Copyright (c) 1998, 1999 Semen Ustimenko
@ -34,4 +34,4 @@ void ntfs_nthashdone __P((void));
struct ntnode *ntfs_nthashlookup __P((dev_t, ino_t));
struct ntnode *ntfs_nthashget __P((dev_t, ino_t));
void ntfs_nthashins __P((struct ntnode *));
void ntfs_nthashrem __P((register struct ntnode *));
void ntfs_nthashrem __P((struct ntnode *));

20
sys/ntfs/ntfs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ntfs_vfsops.c,v 1.26 2000/03/30 02:47:18 simonb Exp $ */
/* $NetBSD: ntfs_vfsops.c,v 1.27 2000/03/30 12:47:02 augustss Exp $ */
/*-
* Copyright (c) 1998, 1999 Semen Ustimenko
@ -84,7 +84,7 @@ static int ntfs_sync __P((struct mount *, int, struct ucred *,
static int ntfs_unmount __P((struct mount *, int, struct proc *));
static int ntfs_vget __P((struct mount *mp, ino_t ino,
struct vnode **vpp));
static int ntfs_mountfs __P((register struct vnode *, struct mount *,
static int ntfs_mountfs __P((struct vnode *, struct mount *,
struct ntfs_args *, struct proc *));
static int ntfs_vptofh __P((struct vnode *, struct fid *));
@ -117,13 +117,13 @@ static int ntfs_fhtovp __P((struct mount *, struct fid *,
*/
static int
ntfs_checkexp(mp, nam, exflagsp, credanonp)
register struct mount *mp;
struct mount *mp;
struct mbuf *nam;
int *exflagsp;
struct ucred **credanonp;
{
register struct netcred *np;
register struct ntfsmount *ntm = VFSTONTFS(mp);
struct netcred *np;
struct ntfsmount *ntm = VFSTONTFS(mp);
/*
* Get the export permission structure for this <mp, client> tuple.
@ -415,7 +415,7 @@ success:
*/
int
ntfs_mountfs(devvp, mp, argsp, p)
register struct vnode *devvp;
struct vnode *devvp;
struct mount *mp;
struct ntfs_args *argsp;
struct proc *p;
@ -631,7 +631,7 @@ ntfs_unmount(
int mntflags,
struct proc *p)
{
register struct ntfsmount *ntmp;
struct ntfsmount *ntmp;
int error, ronly = 0, flags, i;
dprintf(("ntfs_unmount: unmounting...\n"));
@ -858,8 +858,8 @@ ntfs_vptofh(
struct vnode *vp,
struct fid *fhp)
{
register struct ntnode *ntp;
register struct ntfid *ntfhp;
struct ntnode *ntp;
struct ntfid *ntfhp;
struct fnode *fn;
ddprintf(("ntfs_fhtovp(): %s: %p\n", vp->v_mount->mnt_stat->f_mntonname,
@ -889,7 +889,7 @@ ntfs_vgetex(
struct vnode **vpp)
{
int error;
register struct ntfsmount *ntmp;
struct ntfsmount *ntmp;
struct ntnode *ip;
struct fnode *fp;
struct vnode *vp;

60
sys/ntfs/ntfs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ntfs_vnops.c,v 1.23 1999/10/31 19:45:27 jdolecek Exp $ */
/* $NetBSD: ntfs_vnops.c,v 1.24 2000/03/30 12:47:02 augustss Exp $ */
/*
* Copyright (c) 1992, 1993
@ -153,9 +153,9 @@ ntfs_read(ap)
struct ucred *a_cred;
} */ *ap;
{
register struct vnode *vp = ap->a_vp;
register struct fnode *fp = VTOF(vp);
register struct ntnode *ip = FTONT(fp);
struct vnode *vp = ap->a_vp;
struct fnode *fp = VTOF(vp);
struct ntnode *ip = FTONT(fp);
struct uio *uio = ap->a_uio;
struct ntfsmount *ntmp = ip->i_mp;
u_int64_t toread;
@ -208,10 +208,10 @@ ntfs_getattr(ap)
struct proc *a_p;
} */ *ap;
{
register struct vnode *vp = ap->a_vp;
register struct fnode *fp = VTOF(vp);
register struct ntnode *ip = FTONT(fp);
register struct vattr *vap = ap->a_vap;
struct vnode *vp = ap->a_vp;
struct fnode *fp = VTOF(vp);
struct ntnode *ip = FTONT(fp);
struct vattr *vap = ap->a_vap;
dprintf(("ntfs_getattr: %d, flags: %d\n",ip->i_number,ip->i_flag));
@ -249,9 +249,9 @@ ntfs_inactive(ap)
struct vnode *a_vp;
} */ *ap;
{
register struct vnode *vp = ap->a_vp;
struct vnode *vp = ap->a_vp;
#ifdef NTFS_DEBUG
register struct ntnode *ip = VTONT(vp);
struct ntnode *ip = VTONT(vp);
#endif
dprintf(("ntfs_inactive: vnode: %p, ntnode: %d\n", vp, ip->i_number));
@ -276,9 +276,9 @@ ntfs_reclaim(ap)
struct vnode *a_vp;
} */ *ap;
{
register struct vnode *vp = ap->a_vp;
register struct fnode *fp = VTOF(vp);
register struct ntnode *ip = FTONT(fp);
struct vnode *vp = ap->a_vp;
struct fnode *fp = VTOF(vp);
struct ntnode *ip = FTONT(fp);
int error;
dprintf(("ntfs_reclaim: vnode: %p, ntnode: %d\n", vp, ip->i_number));
@ -322,10 +322,10 @@ ntfs_strategy(ap)
struct buf *a_bp;
} */ *ap;
{
register struct buf *bp = ap->a_bp;
register struct vnode *vp = bp->b_vp;
register struct fnode *fp = VTOF(vp);
register struct ntnode *ip = FTONT(fp);
struct buf *bp = ap->a_bp;
struct vnode *vp = bp->b_vp;
struct fnode *fp = VTOF(vp);
struct ntnode *ip = FTONT(fp);
struct ntfsmount *ntmp = ip->i_mp;
int error;
@ -404,9 +404,9 @@ ntfs_write(ap)
struct ucred *a_cred;
} */ *ap;
{
register struct vnode *vp = ap->a_vp;
register struct fnode *fp = VTOF(vp);
register struct ntnode *ip = FTONT(fp);
struct vnode *vp = ap->a_vp;
struct fnode *fp = VTOF(vp);
struct ntnode *ip = FTONT(fp);
struct uio *uio = ap->a_uio;
struct ntfsmount *ntmp = ip->i_mp;
u_int64_t towrite;
@ -448,7 +448,7 @@ ntfs_access(ap)
struct ntnode *ip = VTONT(vp);
struct ucred *cred = ap->a_cred;
mode_t mask, mode = ap->a_mode;
register gid_t *gp;
gid_t *gp;
int i;
#ifdef QUOTA
int error;
@ -531,8 +531,8 @@ ntfs_open(ap)
} */ *ap;
{
#if NTFS_DEBUG
register struct vnode *vp = ap->a_vp;
register struct ntnode *ip = VTONT(vp);
struct vnode *vp = ap->a_vp;
struct ntnode *ip = VTONT(vp);
printf("ntfs_open: %d\n",ip->i_number);
#endif
@ -560,8 +560,8 @@ ntfs_close(ap)
} */ *ap;
{
#if NTFS_DEBUG
register struct vnode *vp = ap->a_vp;
register struct ntnode *ip = VTONT(vp);
struct vnode *vp = ap->a_vp;
struct ntnode *ip = VTONT(vp);
printf("ntfs_close: %d\n",ip->i_number);
#endif
@ -579,9 +579,9 @@ ntfs_readdir(ap)
u_int **cookies;
} */ *ap;
{
register struct vnode *vp = ap->a_vp;
register struct fnode *fp = VTOF(vp);
register struct ntnode *ip = FTONT(fp);
struct vnode *vp = ap->a_vp;
struct fnode *fp = VTOF(vp);
struct ntnode *ip = FTONT(fp);
struct uio *uio = ap->a_uio;
struct ntfsmount *ntmp = ip->i_mp;
int i, error = 0;
@ -716,8 +716,8 @@ ntfs_lookup(ap)
struct componentname *a_cnp;
} */ *ap;
{
register struct vnode *dvp = ap->a_dvp;
register struct ntnode *dip = VTONT(dvp);
struct vnode *dvp = ap->a_dvp;
struct ntnode *dip = VTONT(dvp);
struct ntfsmount *ntmp = dip->i_mp;
struct componentname *cnp = ap->a_cnp;
struct ucred *cred = cnp->cn_cred;

46
sys/ufs/ext2fs/ext2fs_alloc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ext2fs_alloc.c,v 1.6 1999/02/10 13:14:09 bouyer Exp $ */
/* $NetBSD: ext2fs_alloc.c,v 1.7 2000/03/30 12:41:09 augustss Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer.
@ -85,12 +85,12 @@ static ufs_daddr_t ext2fs_mapsearch __P((struct m_ext2fs *, char *, ufs_daddr_t)
*/
int
ext2fs_alloc(ip, lbn, bpref, cred, bnp)
register struct inode *ip;
struct inode *ip;
ufs_daddr_t lbn, bpref;
struct ucred *cred;
ufs_daddr_t *bnp;
{
register struct m_ext2fs *fs;
struct m_ext2fs *fs;
ufs_daddr_t bno;
int cg;
@ -149,10 +149,10 @@ ext2fs_valloc(v)
struct ucred *a_cred;
struct vnode **a_vpp;
} */ *ap = v;
register struct vnode *pvp = ap->a_pvp;
register struct inode *pip;
register struct m_ext2fs *fs;
register struct inode *ip;
struct vnode *pvp = ap->a_pvp;
struct inode *pip;
struct m_ext2fs *fs;
struct inode *ip;
mode_t mode = ap->a_mode;
ino_t ino, ipref;
int cg, error;
@ -207,7 +207,7 @@ noinodes:
*/
static u_long
ext2fs_dirpref(fs)
register struct m_ext2fs *fs;
struct m_ext2fs *fs;
{
int cg, maxspace, mincg, avgifree;
@ -242,8 +242,8 @@ ext2fs_blkpref(ip, lbn, indx, bap)
int indx;
ufs_daddr_t *bap;
{
register struct m_ext2fs *fs;
register int cg, i;
struct m_ext2fs *fs;
int cg, i;
fs = ip->i_e2fs;
/*
@ -290,7 +290,7 @@ ext2fs_hashalloc(ip, cg, pref, size, allocator)
int size; /* size for data blocks, mode for inodes */
ufs_daddr_t (*allocator) __P((struct inode *, int, ufs_daddr_t, int));
{
register struct m_ext2fs *fs;
struct m_ext2fs *fs;
long result;
int i, icg = cg;
@ -343,8 +343,8 @@ ext2fs_alloccg(ip, cg, bpref, size)
ufs_daddr_t bpref;
int size;
{
register struct m_ext2fs *fs;
register char *bbp;
struct m_ext2fs *fs;
char *bbp;
struct buf *bp;
int error, bno, start, end, loc;
@ -431,8 +431,8 @@ ext2fs_nodealloccg(ip, cg, ipref, mode)
ufs_daddr_t ipref;
int mode;
{
register struct m_ext2fs *fs;
register char *ibp;
struct m_ext2fs *fs;
char *ibp;
struct buf *bp;
int error, start, len, loc, map, i;
@ -498,11 +498,11 @@ gotit:
*/
void
ext2fs_blkfree(ip, bno)
register struct inode *ip;
struct inode *ip;
ufs_daddr_t bno;
{
register struct m_ext2fs *fs;
register char *bbp;
struct m_ext2fs *fs;
char *bbp;
struct buf *bp;
int error, cg;
@ -549,9 +549,9 @@ ext2fs_vfree(v)
ino_t a_ino;
int a_mode;
} */ *ap = v;
register struct m_ext2fs *fs;
register char *ibp;
register struct inode *pip;
struct m_ext2fs *fs;
char *ibp;
struct inode *pip;
ino_t ino = ap->a_ino;
struct buf *bp;
int error, cg;
@ -597,8 +597,8 @@ ext2fs_vfree(v)
static ufs_daddr_t
ext2fs_mapsearch(fs, bbp, bpref)
register struct m_ext2fs *fs;
register char *bbp;
struct m_ext2fs *fs;
char *bbp;
ufs_daddr_t bpref;
{
ufs_daddr_t bno;

10
sys/ufs/ext2fs/ext2fs_balloc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ext2fs_balloc.c,v 1.3 1998/03/01 02:23:45 fvdl Exp $ */
/* $NetBSD: ext2fs_balloc.c,v 1.4 2000/03/30 12:41:11 augustss Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer.
@ -60,15 +60,15 @@
*/
int
ext2fs_balloc(ip, bn, size, cred, bpp, flags)
register struct inode *ip;
register ufs_daddr_t bn;
struct inode *ip;
ufs_daddr_t bn;
int size;
struct ucred *cred;
struct buf **bpp;
int flags;
{
register struct m_ext2fs *fs;
register ufs_daddr_t nb;
struct m_ext2fs *fs;
ufs_daddr_t nb;
struct buf *bp, *nbp;
struct vnode *vp = ITOV(ip);
struct indir indirs[NIADDR + 2];

6
sys/ufs/ext2fs/ext2fs_bmap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ext2fs_bmap.c,v 1.4 1998/03/01 02:23:45 fvdl Exp $ */
/* $NetBSD: ext2fs_bmap.c,v 1.5 2000/03/30 12:41:11 augustss Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer.
@ -109,13 +109,13 @@ ext2fs_bmap(v)
int
ext2fs_bmaparray(vp, bn, bnp, ap, nump, runp)
struct vnode *vp;
register ufs_daddr_t bn;
ufs_daddr_t bn;
ufs_daddr_t *bnp;
struct indir *ap;
int *nump;
int *runp;
{
register struct inode *ip;
struct inode *ip;
struct buf *bp;
struct ufsmount *ump;
struct mount *mp;

22
sys/ufs/ext2fs/ext2fs_inode.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ext2fs_inode.c,v 1.13 1999/03/24 05:51:30 mrg Exp $ */
/* $NetBSD: ext2fs_inode.c,v 1.14 2000/03/30 12:41:11 augustss Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer.
@ -129,7 +129,7 @@ ext2fs_update(v)
struct timespec *a_modify;
int a_waitfor;
} */ *ap = v;
register struct m_ext2fs *fs;
struct m_ext2fs *fs;
struct buf *bp;
struct inode *ip;
int error;
@ -183,17 +183,17 @@ ext2fs_truncate(v)
struct ucred *a_cred;
struct proc *a_p;
} */ *ap = v;
register struct vnode *ovp = ap->a_vp;
register ufs_daddr_t lastblock;
register struct inode *oip;
struct vnode *ovp = ap->a_vp;
ufs_daddr_t lastblock;
struct inode *oip;
ufs_daddr_t bn, lbn, lastiblock[NIADDR], indir_lbn[NIADDR];
ufs_daddr_t oldblks[NDADDR + NIADDR], newblks[NDADDR + NIADDR];
off_t length = ap->a_length;
register struct m_ext2fs *fs;
struct m_ext2fs *fs;
struct buf *bp;
int offset, size, level;
long count, nblocks, vflags, blocksreleased = 0;
register int i;
int i;
int aflags, error, allerror;
off_t osize;
@ -393,16 +393,16 @@ done:
*/
static int
ext2fs_indirtrunc(ip, lbn, dbn, lastbn, level, countp)
register struct inode *ip;
struct inode *ip;
ufs_daddr_t lbn, lastbn;
ufs_daddr_t dbn;
int level;
long *countp;
{
register int i;
int i;
struct buf *bp;
register struct m_ext2fs *fs = ip->i_e2fs;
register ufs_daddr_t *bap;
struct m_ext2fs *fs = ip->i_e2fs;
ufs_daddr_t *bap;
struct vnode *vp;
ufs_daddr_t *copy = NULL, nb, nlbn, last;
long blkcount, factor;

20
sys/ufs/ext2fs/ext2fs_lookup.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ext2fs_lookup.c,v 1.14 2000/01/28 16:00:23 bouyer Exp $ */
/* $NetBSD: ext2fs_lookup.c,v 1.15 2000/03/30 12:41:11 augustss Exp $ */
/*
* Modified for NetBSD 1.2E
@ -267,7 +267,7 @@ ext2fs_lookup(v)
struct vnode *vdp; /* vnode for directory being searched */
struct inode *dp; /* inode for directory being searched */
struct buf *bp; /* a buffer of directory entries */
register struct ext2fs_direct *ep; /* the current directory entry */
struct ext2fs_direct *ep; /* the current directory entry */
int entryoffsetinblock; /* offset of ep in bp's buffer */
enum {NONE, COMPACT, FOUND} slotstatus;
doff_t slotoffset; /* offset of area with free space */
@ -706,7 +706,7 @@ found:
static int
ext2fs_dirbadentry(dp, de, entryoffsetinblock)
struct vnode *dp;
register struct ext2fs_direct *de;
struct ext2fs_direct *de;
int entryoffsetinblock;
{
int dirblksize = VTOI(dp)->i_e2fs->e2fs_bsize;
@ -750,10 +750,10 @@ int
ext2fs_direnter(ip, dvp, cnp)
struct inode *ip;
struct vnode *dvp;
register struct componentname *cnp;
struct componentname *cnp;
{
register struct ext2fs_direct *ep, *nep;
register struct inode *dp;
struct ext2fs_direct *ep, *nep;
struct inode *dp;
struct buf *bp;
struct ext2fs_direct newdir;
struct iovec aiov;
@ -897,7 +897,7 @@ ext2fs_dirremove(dvp, cnp)
struct vnode *dvp;
struct componentname *cnp;
{
register struct inode *dp;
struct inode *dp;
struct ext2fs_direct *ep;
struct buf *bp;
int error;
@ -970,13 +970,13 @@ ext2fs_dirrewrite(dp, ip, cnp)
*/
int
ext2fs_dirempty(ip, parentino, cred)
register struct inode *ip;
struct inode *ip;
ino_t parentino;
struct ucred *cred;
{
register off_t off;
off_t off;
struct ext2fs_dirtemplate dbuf;
register struct ext2fs_direct *dp = (struct ext2fs_direct *)&dbuf;
struct ext2fs_direct *dp = (struct ext2fs_direct *)&dbuf;
int error, namlen;
size_t count;

18
sys/ufs/ext2fs/ext2fs_readwrite.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ext2fs_readwrite.c,v 1.10 1999/03/24 05:51:30 mrg Exp $ */
/* $NetBSD: ext2fs_readwrite.c,v 1.11 2000/03/30 12:41:11 augustss Exp $ */
/*-
* Copyright (c) 1997 Manuel Bouyer.
@ -78,10 +78,10 @@ ext2fs_read(v)
int a_ioflag;
struct ucred *a_cred;
} */ *ap = v;
register struct vnode *vp;
register struct inode *ip;
register struct uio *uio;
register struct m_ext2fs *fs;
struct vnode *vp;
struct inode *ip;
struct uio *uio;
struct m_ext2fs *fs;
struct buf *bp;
ufs_daddr_t lbn, nextlbn;
off_t bytesinfile;
@ -181,10 +181,10 @@ ext2fs_write(v)
int a_ioflag;
struct ucred *a_cred;
} */ *ap = v;
register struct vnode *vp;
register struct uio *uio;
register struct inode *ip;
register struct m_ext2fs *fs;
struct vnode *vp;
struct uio *uio;
struct inode *ip;
struct m_ext2fs *fs;
struct buf *bp;
struct proc *p;
ufs_daddr_t lbn;

8
sys/ufs/ext2fs/ext2fs_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ext2fs_subr.c,v 1.3 1998/03/04 06:50:25 cgd Exp $ */
/* $NetBSD: ext2fs_subr.c,v 1.4 2000/03/30 12:41:11 augustss Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer.
@ -62,7 +62,7 @@ ext2fs_blkatoff(v)
struct buf **a_bpp;
} */ *ap = v;
struct inode *ip;
register struct m_ext2fs *fs;
struct m_ext2fs *fs;
struct buf *bp;
ufs_daddr_t lbn;
int error;
@ -88,8 +88,8 @@ ext2fs_checkoverlap(bp, ip)
struct buf *bp;
struct inode *ip;
{
register struct buf *ebp, *ep;
register ufs_daddr_t start, last;
struct buf *ebp, *ep;
ufs_daddr_t start, last;
struct vnode *vp;
ebp = &buf[nbuf];

50
sys/ufs/ext2fs/ext2fs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ext2fs_vfsops.c,v 1.34 2000/03/16 18:08:32 jdolecek Exp $ */
/* $NetBSD: ext2fs_vfsops.c,v 1.35 2000/03/30 12:41:11 augustss Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer.
@ -195,7 +195,7 @@ ext2fs_mountroot()
*/
int
ext2fs_mount(mp, path, data, ndp, p)
register struct mount *mp;
struct mount *mp;
const char *path;
void * data;
struct nameidata *ndp;
@ -204,7 +204,7 @@ ext2fs_mount(mp, path, data, ndp, p)
struct vnode *devvp;
struct ufs_args args;
struct ufsmount *ump = NULL;
register struct m_ext2fs *fs;
struct m_ext2fs *fs;
size_t size;
int error, flags;
mode_t accessmode;
@ -354,11 +354,11 @@ ext2fs_mount(mp, path, data, ndp, p)
*/
int
ext2fs_reload(mountp, cred, p)
register struct mount *mountp;
struct mount *mountp;
struct ucred *cred;
struct proc *p;
{
register struct vnode *vp, *nvp, *devvp;
struct vnode *vp, *nvp, *devvp;
struct inode *ip;
struct buf *bp;
struct m_ext2fs *fs;
@ -479,14 +479,14 @@ loop:
*/
int
ext2fs_mountfs(devvp, mp, p)
register struct vnode *devvp;
struct vnode *devvp;
struct mount *mp;
struct proc *p;
{
register struct ufsmount *ump;
struct ufsmount *ump;
struct buf *bp;
register struct ext2fs *fs;
register struct m_ext2fs *m_fs;
struct ext2fs *fs;
struct m_ext2fs *m_fs;
dev_t dev;
struct partinfo dpart;
int error, i, size, ronly;
@ -618,8 +618,8 @@ ext2fs_unmount(mp, mntflags, p)
int mntflags;
struct proc *p;
{
register struct ufsmount *ump;
register struct m_ext2fs *fs;
struct ufsmount *ump;
struct m_ext2fs *fs;
int error, flags;
flags = 0;
@ -654,12 +654,12 @@ ext2fs_unmount(mp, mntflags, p)
*/
int
ext2fs_flushfiles(mp, flags, p)
register struct mount *mp;
struct mount *mp;
int flags;
struct proc *p;
{
extern int doforce;
register struct ufsmount *ump;
struct ufsmount *ump;
int error;
if (!doforce)
@ -675,11 +675,11 @@ ext2fs_flushfiles(mp, flags, p)
int
ext2fs_statfs(mp, sbp, p)
struct mount *mp;
register struct statfs *sbp;
struct statfs *sbp;
struct proc *p;
{
register struct ufsmount *ump;
register struct m_ext2fs *fs;
struct ufsmount *ump;
struct m_ext2fs *fs;
u_int32_t overhead, overhead_per_group;
int i, ngroups;
@ -929,14 +929,14 @@ ext2fs_vget(mp, ino, vpp)
*/
int
ext2fs_fhtovp(mp, fhp, vpp)
register struct mount *mp;
struct mount *mp;
struct fid *fhp;
struct vnode **vpp;
{
register struct inode *ip;
struct inode *ip;
struct vnode *nvp;
int error;
register struct ufid *ufhp;
struct ufid *ufhp;
struct m_ext2fs *fs;
ufhp = (struct ufid *)fhp;
@ -969,8 +969,8 @@ ext2fs_vptofh(vp, fhp)
struct vnode *vp;
struct fid *fhp;
{
register struct inode *ip;
register struct ufid *ufhp;
struct inode *ip;
struct ufid *ufhp;
ip = VTOI(vp);
ufhp = (struct ufid *)fhp;
@ -1001,8 +1001,8 @@ ext2fs_sbupdate(mp, waitfor)
struct ufsmount *mp;
int waitfor;
{
register struct m_ext2fs *fs = mp->um_e2fs;
register struct buf *bp;
struct m_ext2fs *fs = mp->um_e2fs;
struct buf *bp;
int error = 0;
bp = getblk(mp->um_devvp, SBLOCK, SBSIZE, 0, 0);
@ -1019,8 +1019,8 @@ ext2fs_cgupdate(mp, waitfor)
struct ufsmount *mp;
int waitfor;
{
register struct m_ext2fs *fs = mp->um_e2fs;
register struct buf *bp;
struct m_ext2fs *fs = mp->um_e2fs;
struct buf *bp;
int i, error = 0, allerror = 0;
allerror = ext2fs_sbupdate(mp, waitfor);

58
sys/ufs/ext2fs/ext2fs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ext2fs_vnops.c,v 1.24 2000/03/22 01:03:33 thorpej Exp $ */
/* $NetBSD: ext2fs_vnops.c,v 1.25 2000/03/30 12:41:11 augustss Exp $ */
/*
* Copyright (c) 1997 Manuel Bouyer.
@ -131,9 +131,9 @@ ext2fs_mknod(v)
struct componentname *a_cnp;
struct vattr *a_vap;
} */ *ap = v;
register struct vattr *vap = ap->a_vap;
register struct vnode **vpp = ap->a_vpp;
register struct inode *ip;
struct vattr *vap = ap->a_vap;
struct vnode **vpp = ap->a_vpp;
struct inode *ip;
int error;
if ((error = ext2fs_makeinode(MAKEIMODE(vap->va_type, vap->va_mode),
@ -238,9 +238,9 @@ ext2fs_getattr(v)
struct ucred *a_cred;
struct proc *a_p;
} */ *ap = v;
register struct vnode *vp = ap->a_vp;
register struct inode *ip = VTOI(vp);
register struct vattr *vap = ap->a_vap;
struct vnode *vp = ap->a_vp;
struct inode *ip = VTOI(vp);
struct vattr *vap = ap->a_vap;
struct timespec ts;
TIMEVAL_TO_TIMESPEC(&time, &ts);
@ -404,12 +404,12 @@ ext2fs_setattr(v)
*/
static int
ext2fs_chmod(vp, mode, cred, p)
register struct vnode *vp;
register int mode;
register struct ucred *cred;
struct vnode *vp;
int mode;
struct ucred *cred;
struct proc *p;
{
register struct inode *ip = VTOI(vp);
struct inode *ip = VTOI(vp);
int error;
if (cred->cr_uid != ip->i_e2fs_uid &&
@ -435,13 +435,13 @@ ext2fs_chmod(vp, mode, cred, p)
*/
static int
ext2fs_chown(vp, uid, gid, cred, p)
register struct vnode *vp;
struct vnode *vp;
uid_t uid;
gid_t gid;
struct ucred *cred;
struct proc *p;
{
register struct inode *ip = VTOI(vp);
struct inode *ip = VTOI(vp);
uid_t ouid;
gid_t ogid;
int error = 0;
@ -610,7 +610,7 @@ ext2fs_rename(v)
struct componentname *a_tcnp;
} */ *ap = v;
struct vnode *tvp = ap->a_tvp;
register struct vnode *tdvp = ap->a_tdvp;
struct vnode *tdvp = ap->a_tdvp;
struct vnode *fvp = ap->a_fvp;
struct vnode *fdvp = ap->a_fdvp;
struct componentname *tcnp = ap->a_tcnp;
@ -993,10 +993,10 @@ ext2fs_mkdir(v)
struct componentname *a_cnp;
struct vattr *a_vap;
} */ *ap = v;
register struct vnode *dvp = ap->a_dvp;
register struct vattr *vap = ap->a_vap;
register struct componentname *cnp = ap->a_cnp;
register struct inode *ip, *dp;
struct vnode *dvp = ap->a_dvp;
struct vattr *vap = ap->a_vap;
struct componentname *cnp = ap->a_cnp;
struct inode *ip, *dp;
struct vnode *tvp;
struct ext2fs_dirtemplate dirtemplate;
int error, dmode;
@ -1108,10 +1108,10 @@ ext2fs_rmdir(v)
struct vnode *a_vp;
struct componentname *a_cnp;
} */ *ap = v;
register struct vnode *vp = ap->a_vp;
register struct vnode *dvp = ap->a_dvp;
register struct componentname *cnp = ap->a_cnp;
register struct inode *ip, *dp;
struct vnode *vp = ap->a_vp;
struct vnode *dvp = ap->a_dvp;
struct componentname *cnp = ap->a_cnp;
struct inode *ip, *dp;
int error;
ip = VTOI(vp);
@ -1191,8 +1191,8 @@ ext2fs_symlink(v)
struct vattr *a_vap;
char *a_target;
} */ *ap = v;
register struct vnode *vp, **vpp = ap->a_vpp;
register struct inode *ip;
struct vnode *vp, **vpp = ap->a_vpp;
struct inode *ip;
int len, error;
error = ext2fs_makeinode(IFLNK | ap->a_vap->va_mode, ap->a_dvp,
@ -1226,8 +1226,8 @@ ext2fs_readlink(v)
struct uio *a_uio;
struct ucred *a_cred;
} */ *ap = v;
register struct vnode *vp = ap->a_vp;
register struct inode *ip = VTOI(vp);
struct vnode *vp = ap->a_vp;
struct inode *ip = VTOI(vp);
int isize;
isize = ip->i_e2fs_size;
@ -1253,7 +1253,7 @@ ext2fs_advlock(v)
struct flock *a_fl;
int a_flags;
} */ *ap = v;
register struct inode *ip = VTOI(ap->a_vp);
struct inode *ip = VTOI(ap->a_vp);
return (lf_advlock(&ip->i_lockf, ip->i_e2fs_size, ap->a_id, ap->a_op,
ap->a_fl, ap->a_flags));
@ -1329,7 +1329,7 @@ ext2fs_makeinode(mode, dvp, vpp, cnp)
struct vnode **vpp;
struct componentname *cnp;
{
register struct inode *ip, *pdir;
struct inode *ip, *pdir;
struct vnode *tvp;
int error;
@ -1396,7 +1396,7 @@ ext2fs_reclaim(v)
struct vop_reclaim_args /* {
struct vnode *a_vp;
} */ *ap = v;
register struct vnode *vp = ap->a_vp;
struct vnode *vp = ap->a_vp;
struct inode *ip;
extern int prtactive;

56
sys/ufs/ffs/ffs_alloc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ffs_alloc.c,v 1.32 2000/03/29 08:46:57 jdolecek Exp $ */
/* $NetBSD: ffs_alloc.c,v 1.33 2000/03/30 12:41:12 augustss Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@ -104,13 +104,13 @@ extern u_char *fragtbl[];
*/
int
ffs_alloc(ip, lbn, bpref, size, cred, bnp)
register struct inode *ip;
struct inode *ip;
ufs_daddr_t lbn, bpref;
int size;
struct ucred *cred;
ufs_daddr_t *bnp;
{
register struct fs *fs;
struct fs *fs;
ufs_daddr_t bno;
int cg;
#ifdef QUOTA
@ -172,14 +172,14 @@ nospace:
*/
int
ffs_realloccg(ip, lbprev, bpref, osize, nsize, cred, bpp)
register struct inode *ip;
struct inode *ip;
ufs_daddr_t lbprev;
ufs_daddr_t bpref;
int osize, nsize;
struct ucred *cred;
struct buf **bpp;
{
register struct fs *fs;
struct fs *fs;
struct buf *bp;
int cg, request, error;
ufs_daddr_t bprev, bno;
@ -569,10 +569,10 @@ ffs_valloc(v)
struct ucred *a_cred;
struct vnode **a_vpp;
} */ *ap = v;
register struct vnode *pvp = ap->a_pvp;
register struct inode *pip;
register struct fs *fs;
register struct inode *ip;
struct vnode *pvp = ap->a_pvp;
struct inode *pip;
struct fs *fs;
struct inode *ip;
mode_t mode = ap->a_mode;
ino_t ino, ipref;
int cg, error;
@ -630,7 +630,7 @@ noinodes:
*/
static ino_t
ffs_dirpref(fs)
register struct fs *fs;
struct fs *fs;
{
int cg, minndir, mincg, avgifree;
@ -679,8 +679,8 @@ ffs_blkpref(ip, lbn, indx, bap)
int indx;
ufs_daddr_t *bap;
{
register struct fs *fs;
register int cg;
struct fs *fs;
int cg;
int avgbfree, startcg;
ufs_daddr_t nextblk;
@ -754,7 +754,7 @@ ffs_hashalloc(ip, cg, pref, size, allocator)
int size; /* size for data blocks, mode for inodes */
ufs_daddr_t (*allocator) __P((struct inode *, int, ufs_daddr_t, int));
{
register struct fs *fs;
struct fs *fs;
long result;
int i, icg = cg;
@ -806,8 +806,8 @@ ffs_fragextend(ip, cg, bprev, osize, nsize)
long bprev;
int osize, nsize;
{
register struct fs *fs;
register struct cg *cgp;
struct fs *fs;
struct cg *cgp;
struct buf *bp;
long bno;
int frags, bbase;
@ -986,7 +986,7 @@ ffs_alloccgblk(ip, bp, bpref)
ufs_daddr_t bno, blkno;
int cylno, pos, delta;
short *cylbp;
register int i;
int i;
struct fs *fs = ip->i_fs;
#ifdef FFS_EI
const int needswap = UFS_FSNEEDSWAP(fs);
@ -1105,8 +1105,8 @@ ffs_clusteralloc(ip, cg, bpref, len)
ufs_daddr_t bpref;
int len;
{
register struct fs *fs;
register struct cg *cgp;
struct fs *fs;
struct cg *cgp;
struct buf *bp;
int i, got, run, bno, bit, map;
u_char *mapp;
@ -1220,10 +1220,10 @@ ffs_nodealloccg(ip, cg, ipref, mode)
ufs_daddr_t ipref;
int mode;
{
register struct cg *cgp;
struct cg *cgp;
struct buf *bp;
int error, start, len, loc, map, i;
register struct fs *fs = ip->i_fs;
struct fs *fs = ip->i_fs;
#ifdef FFS_EI
const int needswap = UFS_FSNEEDSWAP(fs);
#endif
@ -1301,15 +1301,15 @@ gotit:
*/
void
ffs_blkfree(ip, bno, size)
register struct inode *ip;
struct inode *ip;
ufs_daddr_t bno;
long size;
{
register struct cg *cgp;
struct cg *cgp;
struct buf *bp;
ufs_daddr_t blkno;
int i, error, cg, blk, frags, bbase;
register struct fs *fs = ip->i_fs;
struct fs *fs = ip->i_fs;
const int needswap = UFS_FSNEEDSWAP(fs);
if ((u_int)size > fs->fs_bsize || fragoff(fs, size) != 0 ||
@ -1488,9 +1488,9 @@ ffs_freefile(v)
ino_t a_ino;
int a_mode;
} */ *ap = v;
register struct cg *cgp;
register struct inode *pip = VTOI(ap->a_pvp);
register struct fs *fs = pip->i_fs;
struct cg *cgp;
struct inode *pip = VTOI(ap->a_pvp);
struct fs *fs = pip->i_fs;
ino_t ino = ap->a_ino;
struct buf *bp;
int error, cg;
@ -1545,8 +1545,8 @@ ffs_freefile(v)
*/
static ufs_daddr_t
ffs_mapsearch(fs, cgp, bpref, allocsiz)
register struct fs *fs;
register struct cg *cgp;
struct fs *fs;
struct cg *cgp;
ufs_daddr_t bpref;
int allocsiz;
{

24
sys/ufs/ffs/ffs_inode.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ffs_inode.c,v 1.29 1999/11/15 18:49:13 fvdl Exp $ */
/* $NetBSD: ffs_inode.c,v 1.30 2000/03/30 12:41:12 augustss Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@ -89,7 +89,7 @@ ffs_update(v)
struct timespec *a_modify;
int a_waitfor;
} */ *ap = v;
register struct fs *fs;
struct fs *fs;
struct buf *bp;
struct inode *ip;
int error;
@ -160,17 +160,17 @@ ffs_truncate(v)
struct ucred *a_cred;
struct proc *a_p;
} */ *ap = v;
register struct vnode *ovp = ap->a_vp;
register ufs_daddr_t lastblock;
register struct inode *oip;
struct vnode *ovp = ap->a_vp;
ufs_daddr_t lastblock;
struct inode *oip;
ufs_daddr_t bn, lbn, lastiblock[NIADDR], indir_lbn[NIADDR];
ufs_daddr_t oldblks[NDADDR + NIADDR], newblks[NDADDR + NIADDR];
off_t length = ap->a_length;
register struct fs *fs;
struct fs *fs;
struct buf *bp;
int offset, size, level;
long count, nblocks, vflags, blocksreleased = 0;
register int i;
int i;
int aflags, error, allerror;
off_t osize;
@ -360,7 +360,7 @@ ffs_truncate(v)
* All whole direct blocks or frags.
*/
for (i = NDADDR - 1; i > lastblock; i--) {
register long bsize;
long bsize;
bn = ufs_rw32(oip->i_ffs_db[i], UFS_FSNEEDSWAP(fs));
if (bn == 0)
@ -438,16 +438,16 @@ done:
*/
static int
ffs_indirtrunc(ip, lbn, dbn, lastbn, level, countp)
register struct inode *ip;
struct inode *ip;
ufs_daddr_t lbn, lastbn;
ufs_daddr_t dbn;
int level;
long *countp;
{
register int i;
int i;
struct buf *bp;
register struct fs *fs = ip->i_fs;
register ufs_daddr_t *bap;
struct fs *fs = ip->i_fs;
ufs_daddr_t *bap;
struct vnode *vp;
ufs_daddr_t *copy = NULL, nb, nlbn, last;
long blkcount, factor;

12
sys/ufs/ffs/ffs_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ffs_subr.c,v 1.14 1999/11/15 18:49:13 fvdl Exp $ */
/* $NetBSD: ffs_subr.c,v 1.15 2000/03/30 12:41:12 augustss Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@ -76,7 +76,7 @@ ffs_blkatoff(v)
struct buf **a_bpp;
} */ *ap = v;
struct inode *ip;
register struct fs *fs;
struct fs *fs;
struct buf *bp;
ufs_daddr_t lbn;
int bsize, error;
@ -111,8 +111,8 @@ ffs_fragacct(fs, fragmap, fraglist, cnt, needswap)
int needswap;
{
int inblk;
register int field, subfield;
register int siz, pos;
int field, subfield;
int siz, pos;
inblk = (int)(fragtbl[fs->fs_frag][fragmap]) << 1;
fragmap <<= 1;
@ -142,8 +142,8 @@ ffs_checkoverlap(bp, ip)
struct buf *bp;
struct inode *ip;
{
register struct buf *ebp, *ep;
register ufs_daddr_t start, last;
struct buf *ebp, *ep;
ufs_daddr_t start, last;
struct vnode *vp;
ebp = &buf[nbuf];

42
sys/ufs/ffs/ffs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ffs_vfsops.c,v 1.60 2000/03/30 02:48:22 simonb Exp $ */
/* $NetBSD: ffs_vfsops.c,v 1.61 2000/03/30 12:41:12 augustss Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1994
@ -165,7 +165,7 @@ ffs_mountroot()
*/
int
ffs_mount(mp, path, data, ndp, p)
register struct mount *mp;
struct mount *mp;
const char *path;
void *data;
struct nameidata *ndp;
@ -174,7 +174,7 @@ ffs_mount(mp, path, data, ndp, p)
struct vnode *devvp;
struct ufs_args args;
struct ufsmount *ump = NULL;
register struct fs *fs;
struct fs *fs;
size_t size;
int error, flags;
mode_t accessmode;
@ -340,11 +340,11 @@ ffs_mount(mp, path, data, ndp, p)
*/
int
ffs_reload(mountp, cred, p)
register struct mount *mountp;
struct mount *mountp;
struct ucred *cred;
struct proc *p;
{
register struct vnode *vp, *nvp, *devvp;
struct vnode *vp, *nvp, *devvp;
struct inode *ip;
struct buf *bp;
struct fs *fs, *newfs;
@ -499,7 +499,7 @@ loop:
*/
int
ffs_mountfs(devvp, mp, p)
register struct vnode *devvp;
struct vnode *devvp;
struct mount *mp;
struct proc *p;
{
@ -727,8 +727,8 @@ ffs_unmount(mp, mntflags, p)
int mntflags;
struct proc *p;
{
register struct ufsmount *ump;
register struct fs *fs;
struct ufsmount *ump;
struct fs *fs;
int error, flags;
flags = 0;
@ -768,12 +768,12 @@ ffs_unmount(mp, mntflags, p)
*/
int
ffs_flushfiles(mp, flags, p)
register struct mount *mp;
struct mount *mp;
int flags;
struct proc *p;
{
extern int doforce;
register struct ufsmount *ump;
struct ufsmount *ump;
int error;
if (!doforce)
@ -816,11 +816,11 @@ ffs_flushfiles(mp, flags, p)
int
ffs_statfs(mp, sbp, p)
struct mount *mp;
register struct statfs *sbp;
struct statfs *sbp;
struct proc *p;
{
register struct ufsmount *ump;
register struct fs *fs;
struct ufsmount *ump;
struct fs *fs;
ump = VFSTOUFS(mp);
fs = ump->um_fs;
@ -1068,11 +1068,11 @@ ffs_vget(mp, ino, vpp)
*/
int
ffs_fhtovp(mp, fhp, vpp)
register struct mount *mp;
struct mount *mp;
struct fid *fhp;
struct vnode **vpp;
{
register struct ufid *ufhp;
struct ufid *ufhp;
struct fs *fs;
ufhp = (struct ufid *)fhp;
@ -1092,8 +1092,8 @@ ffs_vptofh(vp, fhp)
struct vnode *vp;
struct fid *fhp;
{
register struct inode *ip;
register struct ufid *ufhp;
struct inode *ip;
struct ufid *ufhp;
ip = VTOI(vp);
ufhp = (struct ufid *)fhp;
@ -1169,8 +1169,8 @@ ffs_sbupdate(mp, waitfor)
struct ufsmount *mp;
int waitfor;
{
register struct fs *fs = mp->um_fs;
register struct buf *bp;
struct fs *fs = mp->um_fs;
struct buf *bp;
int i, error = 0;
int32_t saved_nrpos = fs->fs_nrpos;
int64_t saved_qbmask = fs->fs_qbmask;
@ -1220,8 +1220,8 @@ ffs_cgupdate(mp, waitfor)
struct ufsmount *mp;
int waitfor;
{
register struct fs *fs = mp->um_fs;
register struct buf *bp;
struct fs *fs = mp->um_fs;
struct buf *bp;
int blks;
caddr_t space;
int i, size, error = 0, allerror = 0;

4
sys/ufs/ffs/ffs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ffs_vnops.c,v 1.25 2000/03/29 03:43:34 simonb Exp $ */
/* $NetBSD: ffs_vnops.c,v 1.26 2000/03/30 12:41:13 augustss Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@ -354,7 +354,7 @@ ffs_reclaim(v)
struct vnode *a_vp;
struct proc *a_p;
} */ *ap = v;
register struct vnode *vp = ap->a_vp;
struct vnode *vp = ap->a_vp;
int error;
if ((error = ufs_reclaim(vp, ap->a_p)) != 0)

12
sys/ufs/lfs/lfs_bio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lfs_bio.c,v 1.16 1999/12/15 07:10:34 perseant Exp $ */
/* $NetBSD: lfs_bio.c,v 1.17 2000/03/30 12:41:13 augustss Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -137,7 +137,7 @@ lfs_bwrite(v)
struct vop_bwrite_args /* {
struct buf *a_bp;
} */ *ap = v;
register struct buf *bp = ap->a_bp;
struct buf *bp = ap->a_bp;
#ifdef DIAGNOSTIC
if(VTOI(bp->b_vp)->i_lfs->lfs_ronly == 0
@ -317,7 +317,7 @@ lfs_flush(fs, flags)
struct lfs *fs;
int flags;
{
register struct mount *mp, *nmp;
struct mount *mp, *nmp;
if(lfs_dostats)
++lfs_stats.write_exceeded;
@ -478,9 +478,9 @@ lfs_countlocked(count, bytes)
int *count;
long *bytes;
{
register struct buf *bp;
register int n = 0;
register long int size = 0L;
struct buf *bp;
int n = 0;
long int size = 0L;
for (bp = bufqueues[BQ_LOCKED].tqh_first; bp;
bp = bp->b_freelist.tqe_next) {

8
sys/ufs/lfs/lfs_cksum.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lfs_cksum.c,v 1.11 1999/03/25 21:54:10 perseant Exp $ */
/* $NetBSD: lfs_cksum.c,v 1.12 2000/03/30 12:41:13 augustss Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -93,10 +93,10 @@
*/
u_long
cksum(str, len)
register void *str;
register size_t len;
void *str;
size_t len;
{
register u_long sum;
u_long sum;
len &= ~(sizeof(u_short) - 1);
for (sum = 0; len; len -= sizeof(u_short)) {

20
sys/ufs/lfs/lfs_inode.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lfs_inode.c,v 1.31 2000/03/12 01:45:01 bouyer Exp $ */
/* $NetBSD: lfs_inode.c,v 1.32 2000/03/30 12:41:13 augustss Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -103,9 +103,9 @@ lfs_ifind(fs, ino, bp)
ino_t ino;
struct buf *bp;
{
register int cnt;
register struct dinode *dip = (struct dinode *)bp->b_data;
register struct dinode *ldip;
int cnt;
struct dinode *dip = (struct dinode *)bp->b_data;
struct dinode *ldip;
for (cnt = INOPB(fs), ldip = dip + (cnt - 1); cnt--; --ldip)
if (ldip->di_inumber == ino)
@ -225,10 +225,10 @@ lfs_truncate(v)
struct ucred *a_cred;
struct proc *a_p;
} */ *ap = v;
register struct indir *inp;
register int i;
register ufs_daddr_t *daddrp;
register struct vnode *vp = ap->a_vp;
struct indir *inp;
int i;
ufs_daddr_t *daddrp;
struct vnode *vp = ap->a_vp;
off_t length = ap->a_length;
struct buf *bp, *sup_bp;
struct ifile *ifp;
@ -498,12 +498,12 @@ lfs_truncate(v)
*/
int
lfs_vinvalbuf(vp, cred, p, maxblk)
register struct vnode *vp;
struct vnode *vp;
struct ucred *cred;
struct proc *p;
ufs_daddr_t maxblk;
{
register struct buf *bp;
struct buf *bp;
struct buf *nbp, *blist;
int i, s, error, dirty;

14
sys/ufs/lfs/lfs_segment.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lfs_segment.c,v 1.41 2000/03/13 23:52:41 soren Exp $ */
/* $NetBSD: lfs_segment.c,v 1.42 2000/03/30 12:41:13 augustss Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -121,7 +121,7 @@ int lfs_match_dindir __P((struct lfs *, struct buf *));
int lfs_match_indir __P((struct lfs *, struct buf *));
int lfs_match_tindir __P((struct lfs *, struct buf *));
void lfs_newseg __P((struct lfs *));
void lfs_shellsort __P((struct buf **, ufs_daddr_t *, register int));
void lfs_shellsort __P((struct buf **, ufs_daddr_t *, int));
void lfs_supercallback __P((struct buf *));
void lfs_updatemeta __P((struct segment *));
int lfs_vref __P((struct vnode *));
@ -1600,10 +1600,10 @@ void
lfs_shellsort(bp_array, lb_array, nmemb)
struct buf **bp_array;
ufs_daddr_t *lb_array;
register int nmemb;
int nmemb;
{
static int __rsshell_increments[] = { 4, 1, 0 };
register int incr, *incrp, t1, t2;
int incr, *incrp, t1, t2;
struct buf *bp_temp;
u_long lb_temp;
@ -1627,7 +1627,7 @@ lfs_shellsort(bp_array, lb_array, nmemb)
*/
int
lfs_vref(vp)
register struct vnode *vp;
struct vnode *vp;
{
/*
* If we return 1 here during a flush, we risk vinvalbuf() not
@ -1649,7 +1649,7 @@ lfs_vref(vp)
*/
void
lfs_vunref(vp)
register struct vnode *vp;
struct vnode *vp;
{
/*
* Analogous to lfs_vref, if the node is flushing, fake it.
@ -1697,7 +1697,7 @@ lfs_vunref(vp)
*/
void
lfs_vunref_head(vp)
register struct vnode *vp;
struct vnode *vp;
{
simple_lock(&vp->v_interlock);
#ifdef DIAGNOSTIC

4
sys/ufs/lfs/lfs_subr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lfs_subr.c,v 1.12 2000/01/19 00:03:05 perseant Exp $ */
/* $NetBSD: lfs_subr.c,v 1.13 2000/03/30 12:41:13 augustss Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -99,7 +99,7 @@ lfs_blkatoff(v)
char **a_res;
struct buf **a_bpp;
} */ *ap = v;
register struct lfs *fs;
struct lfs *fs;
struct inode *ip;
struct buf *bp;
ufs_daddr_t lbn;

4
sys/ufs/lfs/lfs_syscalls.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lfs_syscalls.c,v 1.40 2000/01/19 00:03:05 perseant Exp $ */
/* $NetBSD: lfs_syscalls.c,v 1.41 2000/03/30 12:41:13 augustss Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -892,7 +892,7 @@ lfs_fastvget(mp, ino, daddr, vpp, dinp, need_unlock)
struct dinode *dinp;
int *need_unlock;
{
register struct inode *ip;
struct inode *ip;
struct vnode *vp;
struct ufsmount *ump;
dev_t dev;

34
sys/ufs/lfs/lfs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lfs_vfsops.c,v 1.47 2000/03/16 18:08:33 jdolecek Exp $ */
/* $NetBSD: lfs_vfsops.c,v 1.48 2000/03/30 12:41:13 augustss Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -211,7 +211,7 @@ lfs_mountroot()
*/
int
lfs_mount(mp, path, data, ndp, p)
register struct mount *mp;
struct mount *mp;
const char *path;
void *data;
struct nameidata *ndp;
@ -220,7 +220,7 @@ lfs_mount(mp, path, data, ndp, p)
struct vnode *devvp;
struct ufs_args args;
struct ufsmount *ump = NULL;
register struct lfs *fs = NULL; /* LFS */
struct lfs *fs = NULL; /* LFS */
size_t size;
int error;
mode_t accessmode;
@ -325,14 +325,14 @@ lfs_mount(mp, path, data, ndp, p)
*/
int
lfs_mountfs(devvp, mp, p)
register struct vnode *devvp;
struct vnode *devvp;
struct mount *mp;
struct proc *p;
{
extern struct vnode *rootvp;
struct dlfs *dfs, *adfs;
register struct lfs *fs;
register struct ufsmount *ump;
struct lfs *fs;
struct ufsmount *ump;
struct vnode *vp;
struct buf *bp, *abp;
struct partinfo dpart;
@ -496,8 +496,8 @@ lfs_unmount(mp, mntflags, p)
int mntflags;
struct proc *p;
{
register struct ufsmount *ump;
register struct lfs *fs;
struct ufsmount *ump;
struct lfs *fs;
int error, flags, ronly;
extern int lfs_allclean_wakeup;
@ -559,11 +559,11 @@ lfs_unmount(mp, mntflags, p)
int
lfs_statfs(mp, sbp, p)
struct mount *mp;
register struct statfs *sbp;
struct statfs *sbp;
struct proc *p;
{
register struct lfs *fs;
register struct ufsmount *ump;
struct lfs *fs;
struct ufsmount *ump;
ump = VFSTOUFS(mp);
fs = ump->um_lfs;
@ -648,8 +648,8 @@ lfs_vget(mp, ino, vpp)
ino_t ino;
struct vnode **vpp;
{
register struct lfs *fs;
register struct inode *ip;
struct lfs *fs;
struct inode *ip;
struct buf *bp;
struct ifile *ifp;
struct vnode *vp;
@ -774,11 +774,11 @@ lfs_vget(mp, ino, vpp)
*/
int
lfs_fhtovp(mp, fhp, vpp)
register struct mount *mp;
struct mount *mp;
struct fid *fhp;
struct vnode **vpp;
{
register struct ufid *ufhp;
struct ufid *ufhp;
ufhp = (struct ufid *)fhp;
if (ufhp->ufid_ino < ROOTINO)
@ -795,8 +795,8 @@ lfs_vptofh(vp, fhp)
struct vnode *vp;
struct fid *fhp;
{
register struct inode *ip;
register struct ufid *ufhp;
struct inode *ip;
struct ufid *ufhp;
ip = VTOI(vp);
ufhp = (struct ufid *)fhp;

12
sys/ufs/lfs/lfs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lfs_vnops.c,v 1.34 1999/12/15 07:19:07 perseant Exp $ */
/* $NetBSD: lfs_vnops.c,v 1.35 2000/03/30 12:41:14 augustss Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -639,9 +639,9 @@ lfs_getattr(v)
struct ucred *a_cred;
struct proc *a_p;
} */ *ap = v;
register struct vnode *vp = ap->a_vp;
register struct inode *ip = VTOI(vp);
register struct vattr *vap = ap->a_vap;
struct vnode *vp = ap->a_vp;
struct inode *ip = VTOI(vp);
struct vattr *vap = ap->a_vap;
/*
* Copy from inode table
*/
@ -692,8 +692,8 @@ lfs_close(v)
struct ucred *a_cred;
struct proc *a_p;
} */ *ap = v;
register struct vnode *vp = ap->a_vp;
register struct inode *ip = VTOI(vp);
struct vnode *vp = ap->a_vp;
struct inode *ip = VTOI(vp);
int mod;
struct timespec ts;

16
sys/ufs/mfs/mfs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mfs_vfsops.c,v 1.24 2000/03/29 04:03:08 simonb Exp $ */
/* $NetBSD: mfs_vfsops.c,v 1.25 2000/03/30 12:41:14 augustss Exp $ */
/*
* Copyright (c) 1989, 1990, 1993, 1994
@ -209,7 +209,7 @@ mfs_initminiroot(base)
/* ARGSUSED */
int
mfs_mount(mp, path, data, ndp, p)
register struct mount *mp;
struct mount *mp;
const char *path;
void *data;
struct nameidata *ndp;
@ -218,8 +218,8 @@ mfs_mount(mp, path, data, ndp, p)
struct vnode *devvp;
struct mfs_args args;
struct ufsmount *ump;
register struct fs *fs;
register struct mfsnode *mfsp;
struct fs *fs;
struct mfsnode *mfsp;
size_t size;
int flags, error;
@ -294,10 +294,10 @@ mfs_start(mp, flags, p)
int flags;
struct proc *p;
{
register struct vnode *vp = VFSTOUFS(mp)->um_devvp;
register struct mfsnode *mfsp = VTOMFS(vp);
register struct buf *bp;
register caddr_t base;
struct vnode *vp = VFSTOUFS(mp)->um_devvp;
struct mfsnode *mfsp = VTOMFS(vp);
struct buf *bp;
caddr_t base;
int sleepreturn = 0;
base = mfsp->mfs_baseoff;

18
sys/ufs/mfs/mfs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mfs_vnops.c,v 1.19 2000/01/21 23:43:10 thorpej Exp $ */
/* $NetBSD: mfs_vnops.c,v 1.20 2000/03/30 12:41:14 augustss Exp $ */
/*
* Copyright (c) 1989, 1993
@ -141,8 +141,8 @@ mfs_strategy(v)
struct vop_strategy_args /* {
struct buf *a_bp;
} */ *ap = v;
register struct buf *bp = ap->a_bp;
register struct mfsnode *mfsp;
struct buf *bp = ap->a_bp;
struct mfsnode *mfsp;
struct vnode *vp;
struct proc *p = curproc; /* XXX */
@ -175,7 +175,7 @@ mfs_strategy(v)
*/
void
mfs_doio(bp, base)
register struct buf *bp;
struct buf *bp;
caddr_t base;
{
base += (bp->b_blkno << DEV_BSHIFT);
@ -228,9 +228,9 @@ mfs_close(v)
struct ucred *a_cred;
struct proc *a_p;
} */ *ap = v;
register struct vnode *vp = ap->a_vp;
register struct mfsnode *mfsp = VTOMFS(vp);
register struct buf *bp;
struct vnode *vp = ap->a_vp;
struct mfsnode *mfsp = VTOMFS(vp);
struct buf *bp;
int error;
/*
@ -297,7 +297,7 @@ mfs_reclaim(v)
struct vop_reclaim_args /* {
struct vnode *a_vp;
} */ *ap = v;
register struct vnode *vp = ap->a_vp;
struct vnode *vp = ap->a_vp;
FREE(vp->v_data, M_MFSNODE);
vp->v_data = NULL;
@ -314,7 +314,7 @@ mfs_print(v)
struct vop_print_args /* {
struct vnode *a_vp;
} */ *ap = v;
register struct mfsnode *mfsp = VTOMFS(ap->a_vp);
struct mfsnode *mfsp = VTOMFS(ap->a_vp);
printf("tag VT_MFS, pid %d, base %p, size %ld\n", mfsp->mfs_pid,
mfsp->mfs_baseoff, mfsp->mfs_size);

6
sys/ufs/ufs/ufs_bmap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ufs_bmap.c,v 1.8 1998/06/13 16:26:22 kleink Exp $ */
/* $NetBSD: ufs_bmap.c,v 1.9 2000/03/30 12:41:14 augustss Exp $ */
/*
* Copyright (c) 1989, 1991, 1993
@ -109,7 +109,7 @@ ufs_bmaparray(vp, bn, bnp, ap, nump, runp)
int *nump;
int *runp;
{
register struct inode *ip;
struct inode *ip;
struct buf *bp;
struct ufsmount *ump;
struct mount *mp;
@ -236,7 +236,7 @@ ufs_bmaparray(vp, bn, bnp, ap, nump, runp)
int
ufs_getlbns(vp, bn, ap, nump)
struct vnode *vp;
register ufs_daddr_t bn;
ufs_daddr_t bn;
struct indir *ap;
int *nump;
{

4
sys/ufs/ufs/ufs_inode.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ufs_inode.c,v 1.13 1999/03/05 21:09:50 mycroft Exp $ */
/* $NetBSD: ufs_inode.c,v 1.14 2000/03/30 12:41:14 augustss Exp $ */
/*
* Copyright (c) 1991, 1993
@ -115,7 +115,7 @@ ufs_reclaim(vp, p)
struct vnode *vp;
struct proc *p;
{
register struct inode *ip;
struct inode *ip;
extern int prtactive;
if (prtactive && vp->v_usecount != 0)

18
sys/ufs/ufs/ufs_lookup.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ufs_lookup.c,v 1.29 2000/02/20 06:34:46 wiz Exp $ */
/* $NetBSD: ufs_lookup.c,v 1.30 2000/03/30 12:41:14 augustss Exp $ */
/*
* Copyright (c) 1989, 1993
@ -111,10 +111,10 @@ ufs_lookup(v)
struct vnode **a_vpp;
struct componentname *a_cnp;
} */ *ap = v;
register struct vnode *vdp; /* vnode for directory being searched */
register struct inode *dp; /* inode for directory being searched */
struct vnode *vdp; /* vnode for directory being searched */
struct inode *dp; /* inode for directory being searched */
struct buf *bp; /* a buffer of directory entries */
register struct direct *ep; /* the current directory entry */
struct direct *ep; /* the current directory entry */
int entryoffsetinblock; /* offset of ep in bp's buffer */
enum {NONE, COMPACT, FOUND} slotstatus;
doff_t slotoffset; /* offset of area with free space */
@ -634,10 +634,10 @@ ufs_dirbad(ip, offset, how)
int
ufs_dirbadentry(dp, ep, entryoffsetinblock)
struct vnode *dp;
register struct direct *ep;
struct direct *ep;
int entryoffsetinblock;
{
register int i;
int i;
int namlen;
const int needswap = UFS_MPNEEDSWAP(dp->v_mount);
@ -1043,13 +1043,13 @@ ufs_dirrewrite(dp, oip, newinum, newtype, isrmdir)
*/
int
ufs_dirempty(ip, parentino, cred)
register struct inode *ip;
struct inode *ip;
ino_t parentino;
struct ucred *cred;
{
register off_t off;
off_t off;
struct dirtemplate dbuf;
register struct direct *dp = (struct direct *)&dbuf;
struct direct *dp = (struct direct *)&dbuf;
int error, namlen;
size_t count;
#define MINDIRSIZ (sizeof (struct dirtemplate) / 2)

44
sys/ufs/ufs/ufs_quota.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ufs_quota.c,v 1.14 2000/03/16 18:26:49 jdolecek Exp $ */
/* $NetBSD: ufs_quota.c,v 1.15 2000/03/30 12:41:14 augustss Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993, 1995
@ -67,7 +67,7 @@ static char *quotatypes[] = INITQFNAMES;
*/
int
getinoquota(ip)
register struct inode *ip;
struct inode *ip;
{
struct ufsmount *ump;
struct vnode *vp = ITOV(ip);
@ -100,13 +100,13 @@ getinoquota(ip)
*/
int
chkdq(ip, change, cred, flags)
register struct inode *ip;
struct inode *ip;
long change;
struct ucred *cred;
int flags;
{
register struct dquot *dq;
register int i;
struct dquot *dq;
int i;
int ncurblocks, error;
#ifdef DIAGNOSTIC
@ -165,7 +165,7 @@ chkdqchg(ip, change, cred, type)
struct ucred *cred;
int type;
{
register struct dquot *dq = ip->i_dquot[type];
struct dquot *dq = ip->i_dquot[type];
long ncurblocks = dq->dq_curblocks + change;
/*
@ -215,13 +215,13 @@ chkdqchg(ip, change, cred, type)
*/
int
chkiq(ip, change, cred, flags)
register struct inode *ip;
struct inode *ip;
long change;
struct ucred *cred;
int flags;
{
register struct dquot *dq;
register int i;
struct dquot *dq;
int i;
int ncurinodes, error;
#ifdef DIAGNOSTIC
@ -280,7 +280,7 @@ chkiqchg(ip, change, cred, type)
struct ucred *cred;
int type;
{
register struct dquot *dq = ip->i_dquot[type];
struct dquot *dq = ip->i_dquot[type];
long ncurinodes = dq->dq_curinodes + change;
/*
@ -332,10 +332,10 @@ chkiqchg(ip, change, cred, type)
*/
void
chkdquot(ip)
register struct inode *ip;
struct inode *ip;
{
struct ufsmount *ump = VFSTOUFS(ITOV(ip)->v_mount);
register int i;
int i;
for (i = 0; i < MAXQUOTAS; i++) {
if (ump->um_quotas[i] == NULLVP ||
@ -360,7 +360,7 @@ int
quotaon(p, mp, type, fname)
struct proc *p;
struct mount *mp;
register int type;
int type;
caddr_t fname;
{
struct ufsmount *ump = VFSTOUFS(mp);
@ -434,7 +434,7 @@ int
quotaoff(p, mp, type)
struct proc *p;
struct mount *mp;
register int type;
int type;
{
struct vnode *vp;
struct vnode *qvp, *nextvp;
@ -510,7 +510,7 @@ setquota(mp, id, type, addr)
int type;
caddr_t addr;
{
register struct dquot *dq;
struct dquot *dq;
struct dquot *ndq;
struct ufsmount *ump = VFSTOUFS(mp);
struct dqblk newlim;
@ -570,7 +570,7 @@ setuse(mp, id, type, addr)
int type;
caddr_t addr;
{
register struct dquot *dq;
struct dquot *dq;
struct ufsmount *ump = VFSTOUFS(mp);
struct dquot *ndq;
struct dqblk usage;
@ -705,8 +705,8 @@ int
dqget(vp, id, ump, type, dqp)
struct vnode *vp;
u_long id;
register struct ufsmount *ump;
register int type;
struct ufsmount *ump;
int type;
struct dquot **dqp;
{
struct dquot *dq;
@ -832,7 +832,7 @@ dqref(dq)
void
dqrele(vp, dq)
struct vnode *vp;
register struct dquot *dq;
struct dquot *dq;
{
if (dq == NODQUOT)
@ -854,7 +854,7 @@ dqrele(vp, dq)
int
dqsync(vp, dq)
struct vnode *vp;
register struct dquot *dq;
struct dquot *dq;
{
struct vnode *dqvp;
struct iovec aiov;
@ -904,9 +904,9 @@ dqsync(vp, dq)
*/
void
dqflush(vp)
register struct vnode *vp;
struct vnode *vp;
{
register struct dquot *dq, *nextdq;
struct dquot *dq, *nextdq;
struct dqhash *dqh;
/*

18
sys/ufs/ufs/ufs_readwrite.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ufs_readwrite.c,v 1.23 1999/11/15 18:49:15 fvdl Exp $ */
/* $NetBSD: ufs_readwrite.c,v 1.24 2000/03/30 12:41:15 augustss Exp $ */
/*-
* Copyright (c) 1993
@ -69,10 +69,10 @@ READ(v)
int a_ioflag;
struct ucred *a_cred;
} */ *ap = v;
register struct vnode *vp;
register struct inode *ip;
register struct uio *uio;
register FS *fs;
struct vnode *vp;
struct inode *ip;
struct uio *uio;
FS *fs;
struct buf *bp;
ufs_daddr_t lbn, nextlbn;
off_t bytesinfile;
@ -178,10 +178,10 @@ WRITE(v)
int a_ioflag;
struct ucred *a_cred;
} */ *ap = v;
register struct vnode *vp;
register struct uio *uio;
register struct inode *ip;
register FS *fs;
struct vnode *vp;
struct uio *uio;
struct inode *ip;
FS *fs;
struct buf *bp;
struct proc *p;
ufs_daddr_t lbn;

12
sys/ufs/ufs/ufs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ufs_vfsops.c,v 1.10 2000/03/16 18:26:49 jdolecek Exp $ */
/* $NetBSD: ufs_vfsops.c,v 1.11 2000/03/30 12:41:15 augustss Exp $ */
/*
* Copyright (c) 1991, 1993, 1994
@ -171,13 +171,13 @@ ufs_quotactl(mp, cmds, uid, arg, p)
*/
int
ufs_check_export(mp, nam, exflagsp, credanonp)
register struct mount *mp;
struct mount *mp;
struct mbuf *nam;
int *exflagsp;
struct ucred **credanonp;
{
register struct netcred *np;
register struct ufsmount *ump = VFSTOUFS(mp);
struct netcred *np;
struct ufsmount *ump = VFSTOUFS(mp);
/*
* Get the export permission structure for this <mp, client> tuple.
@ -197,12 +197,12 @@ ufs_check_export(mp, nam, exflagsp, credanonp)
*/
int
ufs_fhtovp(mp, ufhp, vpp)
register struct mount *mp;
struct mount *mp;
struct ufid *ufhp;
struct vnode **vpp;
{
struct vnode *nvp;
register struct inode *ip;
struct inode *ip;
int error;
if ((error = VFS_VGET(mp, ufhp->ufid_ino, &nvp)) != 0) {

64
sys/ufs/ufs/ufs_vnops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ufs_vnops.c,v 1.63 2000/03/30 02:49:11 simonb Exp $ */
/* $NetBSD: ufs_vnops.c,v 1.64 2000/03/30 12:41:15 augustss Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993, 1995
@ -206,8 +206,8 @@ ufs_close(v)
struct ucred *a_cred;
struct proc *a_p;
} */ *ap = v;
register struct vnode *vp = ap->a_vp;
register struct inode *ip = VTOI(vp);
struct vnode *vp = ap->a_vp;
struct inode *ip = VTOI(vp);
struct timespec ts;
simple_lock(&vp->v_interlock);
@ -229,8 +229,8 @@ ufs_access(v)
struct ucred *a_cred;
struct proc *a_p;
} */ *ap = v;
register struct vnode *vp = ap->a_vp;
register struct inode *ip = VTOI(vp);
struct vnode *vp = ap->a_vp;
struct inode *ip = VTOI(vp);
mode_t mode = ap->a_mode;
#ifdef QUOTA
int error = 0;
@ -283,9 +283,9 @@ ufs_getattr(v)
struct ucred *a_cred;
struct proc *a_p;
} */ *ap = v;
register struct vnode *vp = ap->a_vp;
register struct inode *ip = VTOI(vp);
register struct vattr *vap = ap->a_vap;
struct vnode *vp = ap->a_vp;
struct inode *ip = VTOI(vp);
struct vattr *vap = ap->a_vap;
struct timespec ts;
TIMEVAL_TO_TIMESPEC(&time, &ts);
@ -443,12 +443,12 @@ ufs_setattr(v)
*/
static int
ufs_chmod(vp, mode, cred, p)
register struct vnode *vp;
register int mode;
register struct ucred *cred;
struct vnode *vp;
int mode;
struct ucred *cred;
struct proc *p;
{
register struct inode *ip = VTOI(vp);
struct inode *ip = VTOI(vp);
int error;
if (cred->cr_uid != ip->i_ffs_uid &&
@ -474,18 +474,18 @@ ufs_chmod(vp, mode, cred, p)
*/
static int
ufs_chown(vp, uid, gid, cred, p)
register struct vnode *vp;
struct vnode *vp;
uid_t uid;
gid_t gid;
struct ucred *cred;
struct proc *p;
{
register struct inode *ip = VTOI(vp);
struct inode *ip = VTOI(vp);
int error = 0;
#ifdef QUOTA
uid_t ouid;
gid_t ogid;
register int i;
int i;
long change;
#endif
@ -796,7 +796,7 @@ ufs_rename(v)
struct componentname *a_tcnp;
} */ *ap = v;
struct vnode *tvp = ap->a_tvp;
register struct vnode *tdvp = ap->a_tdvp;
struct vnode *tdvp = ap->a_tdvp;
struct vnode *fvp = ap->a_fvp;
struct vnode *fdvp = ap->a_fdvp;
struct componentname *tcnp = ap->a_tcnp;
@ -1171,10 +1171,10 @@ ufs_mkdir(v)
struct componentname *a_cnp;
struct vattr *a_vap;
} */ *ap = v;
register struct vnode *dvp = ap->a_dvp;
register struct vattr *vap = ap->a_vap;
register struct componentname *cnp = ap->a_cnp;
register struct inode *ip, *dp;
struct vnode *dvp = ap->a_dvp;
struct vattr *vap = ap->a_vap;
struct componentname *cnp = ap->a_cnp;
struct inode *ip, *dp;
struct vnode *tvp;
struct buf *bp;
struct dirtemplate dirtemplate;
@ -1435,8 +1435,8 @@ ufs_symlink(v)
struct vattr *a_vap;
char *a_target;
} */ *ap = v;
register struct vnode *vp, **vpp = ap->a_vpp;
register struct inode *ip;
struct vnode *vp, **vpp = ap->a_vpp;
struct inode *ip;
int len, error;
error = ufs_makeinode(IFLNK | ap->a_vap->va_mode, ap->a_dvp,
@ -1479,7 +1479,7 @@ ufs_readdir(v)
off_t **a_cookies;
int *ncookies;
} */ *ap = v;
register struct uio *uio = ap->a_uio;
struct uio *uio = ap->a_uio;
int error;
size_t count, lost;
off_t off = uio->uio_offset;
@ -1598,8 +1598,8 @@ ufs_readlink(v)
struct uio *a_uio;
struct ucred *a_cred;
} */ *ap = v;
register struct vnode *vp = ap->a_vp;
register struct inode *ip = VTOI(vp);
struct vnode *vp = ap->a_vp;
struct inode *ip = VTOI(vp);
int isize;
isize = ip->i_ffs_size;
@ -1622,9 +1622,9 @@ ufs_strategy(v)
struct vop_strategy_args /* {
struct buf *a_bp;
} */ *ap = v;
register struct buf *bp = ap->a_bp;
register struct vnode *vp = bp->b_vp;
register struct inode *ip;
struct buf *bp = ap->a_bp;
struct vnode *vp = bp->b_vp;
struct inode *ip;
int error;
ip = VTOI(vp);
@ -1662,8 +1662,8 @@ ufs_print(v)
struct vop_print_args /* {
struct vnode *a_vp;
} */ *ap = v;
register struct vnode *vp = ap->a_vp;
register struct inode *ip = VTOI(vp);
struct vnode *vp = ap->a_vp;
struct inode *ip = VTOI(vp);
printf("tag VT_UFS, ino %d, on dev %d, %d", ip->i_number,
major(ip->i_dev), minor(ip->i_dev));
@ -1879,7 +1879,7 @@ ufs_advlock(v)
struct flock *a_fl;
int a_flags;
} */ *ap = v;
register struct inode *ip = VTOI(ap->a_vp);
struct inode *ip = VTOI(ap->a_vp);
return (lf_advlock(&ip->i_lockf, ip->i_ffs_size, ap->a_id, ap->a_op,
ap->a_fl, ap->a_flags));
@ -1956,7 +1956,7 @@ ufs_makeinode(mode, dvp, vpp, cnp)
struct vnode **vpp;
struct componentname *cnp;
{
register struct inode *ip, *pdir;
struct inode *ip, *pdir;
struct direct newdir;
struct vnode *tvp;
int error;