diff options
Diffstat (limited to 'sys/arch/hp300/dev')
| -rw-r--r-- | sys/arch/hp300/dev/apci.c | 16 | ||||
| -rw-r--r-- | sys/arch/hp300/dev/ct.c | 10 | ||||
| -rw-r--r-- | sys/arch/hp300/dev/dioreg.h | 6 | ||||
| -rw-r--r-- | sys/arch/hp300/dev/hd.c | 4 | ||||
| -rw-r--r-- | sys/arch/hp300/dev/if_le.c | 4 | ||||
| -rw-r--r-- | sys/arch/hp300/dev/intio.c | 6 | ||||
| -rw-r--r-- | sys/arch/hp300/dev/mt.c | 4 | ||||
| -rw-r--r-- | sys/arch/hp300/dev/mtreg.h | 4 | ||||
| -rw-r--r-- | sys/arch/hp300/dev/nhpib.c | 6 | ||||
| -rw-r--r-- | sys/arch/hp300/dev/ppi.c | 6 |
10 files changed, 33 insertions, 33 deletions
diff --git a/sys/arch/hp300/dev/apci.c b/sys/arch/hp300/dev/apci.c index 7d974afe397..b979db27483 100644 --- a/sys/arch/hp300/dev/apci.c +++ b/sys/arch/hp300/dev/apci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apci.c,v 1.17 2004/09/29 07:35:52 miod Exp $ */ +/* $OpenBSD: apci.c,v 1.18 2005/01/15 21:13:08 miod Exp $ */ /* $NetBSD: apci.c,v 1.9 2000/11/02 00:35:05 eeh Exp $ */ /*- @@ -37,12 +37,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ -/* +/* * Copyright (c) 1997 Michael Smith. All rights reserved. * Copyright (c) 1982, 1986, 1990, 1993 * The Regents of the University of California. All rights reserved. * - * Redistribution and use in source and binary forms, with or without + * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright @@ -53,7 +53,7 @@ * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -99,9 +99,9 @@ #include <sys/uio.h> #include <sys/kernel.h> #include <sys/syslog.h> -#include <sys/device.h> -#include <sys/timeout.h> - +#include <sys/device.h> +#include <sys/timeout.h> + #include <machine/autoconf.h> #include <machine/cpu.h> #include <machine/hp300spu.h> @@ -368,7 +368,7 @@ apciopen(dev, flag, mode, p) } sc->sc_cua = 1; /* We go into CUA mode */ } - + /* Wait for carrier if necessary. */ if (flag & O_NONBLOCK) { if (!APCICUA(dev) && sc->sc_cua) { diff --git a/sys/arch/hp300/dev/ct.c b/sys/arch/hp300/dev/ct.c index d707030e46b..93cfa3eccb0 100644 --- a/sys/arch/hp300/dev/ct.c +++ b/sys/arch/hp300/dev/ct.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ct.c,v 1.10 2003/06/02 23:27:44 millert Exp $ */ +/* $OpenBSD: ct.c,v 1.11 2005/01/15 21:13:08 miod Exp $ */ /* $NetBSD: ct.c,v 1.21 1997/04/02 22:37:23 scottr Exp $ */ /* @@ -344,10 +344,10 @@ ctopen(dev, flag, type, p) else sc->sc_soptc.opt = C_SPAR; - /* + /* * Check the return of hpibsend() and hpibswait(). * Drive could be loading/unloading a tape. If not checked, - * driver hangs. + * driver hangs. */ cc = hpibsend(ctlr, slave, C_CMD, &sc->sc_soptc, sizeof(sc->sc_soptc)); if (cc != sizeof(sc->sc_soptc)) @@ -439,7 +439,7 @@ ctcommand(dev, cmd, cnt) #ifdef DEBUG if (ctdebug & CT_BSF) printf("%s: backup eof pos %d blk %d\n", - sc->sc_dev.dv_xname, sc->sc_eofp, + sc->sc_dev.dv_xname, sc->sc_eofp, sc->sc_eofs[sc->sc_eofp]); #endif } @@ -582,7 +582,7 @@ mustio: bp->b_resid = bp->b_bcount; ctdone(sc, bp); return; - } + } sc->sc_flags |= CTF_IO; sc->sc_ioc.unit = C_SUNIT(sc->sc_punit); sc->sc_ioc.saddr = C_SADDR; diff --git a/sys/arch/hp300/dev/dioreg.h b/sys/arch/hp300/dev/dioreg.h index 5d0d9a1efd9..52fa0e1ea19 100644 --- a/sys/arch/hp300/dev/dioreg.h +++ b/sys/arch/hp300/dev/dioreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dioreg.h,v 1.2 1997/02/03 04:47:20 downsj Exp $ */ +/* $OpenBSD: dioreg.h,v 1.3 2005/01/15 21:13:08 miod Exp $ */ /* $NetBSD: dioreg.h,v 1.3 1997/01/30 09:18:40 thorpej Exp $ */ /*- @@ -68,9 +68,9 @@ * e.g. a display framebuffer. * * DIO-II ranges from select codes 132-255 at physical addresses given by: - * 0x1000000 + (sc - 132) * 0x400000 + * 0x1000000 + (sc - 132) * 0x400000 * The address range of DIO-II space is thus [0x1000000-0x20000000). - * + * * DIO/DIO-II space is too large to map in its entirety, instead devices * are mapped into kernel virtual address space allocated from a range * of EIOMAPSIZE pages (vmparam.h) starting at ``extiobase''. diff --git a/sys/arch/hp300/dev/hd.c b/sys/arch/hp300/dev/hd.c index 3e96c8dd619..9edcf597933 100644 --- a/sys/arch/hp300/dev/hd.c +++ b/sys/arch/hp300/dev/hd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hd.c,v 1.24 2004/02/15 02:56:13 tedu Exp $ */ +/* $OpenBSD: hd.c,v 1.25 2005/01/15 21:13:08 miod Exp $ */ /* $NetBSD: rd.c,v 1.33 1997/07/10 18:14:08 kleink Exp $ */ /* @@ -356,7 +356,7 @@ hdident(parent, sc, ha) hpibsend(ctlr, slave, C_CMD, cmd, sizeof(cmd)); hpibrecv(ctlr, slave, C_EXEC, desc, 37); hpibrecv(ctlr, slave, C_QSTAT, &stat, sizeof(stat)); - bzero(name, sizeof(name)); + bzero(name, sizeof(name)); if (stat == 0) { n = desc->d_name; for (i = 5; i >= 0; i--) { diff --git a/sys/arch/hp300/dev/if_le.c b/sys/arch/hp300/dev/if_le.c index 7e78b6b42ed..09d25841993 100644 --- a/sys/arch/hp300/dev/if_le.c +++ b/sys/arch/hp300/dev/if_le.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le.c,v 1.16 2004/09/29 07:35:52 miod Exp $ */ +/* $OpenBSD: if_le.c,v 1.17 2005/01/15 21:13:08 miod Exp $ */ /* $NetBSD: if_le.c,v 1.43 1997/05/05 21:05:32 thorpej Exp $ */ /*- @@ -84,7 +84,7 @@ int leintr(void *); int lestd[] = { 0, 0x4000, 0x8000, 0xC008 }; hide void lewrcsr(struct am7990_softc *, u_int16_t, u_int16_t); -hide u_int16_t lerdcsr(struct am7990_softc *, u_int16_t); +hide u_int16_t lerdcsr(struct am7990_softc *, u_int16_t); hide void lewrcsr(sc, port, val) diff --git a/sys/arch/hp300/dev/intio.c b/sys/arch/hp300/dev/intio.c index 10dd01ef14e..bc5c3103288 100644 --- a/sys/arch/hp300/dev/intio.c +++ b/sys/arch/hp300/dev/intio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intio.c,v 1.3 2002/03/14 01:26:30 millert Exp $ */ +/* $OpenBSD: intio.c,v 1.4 2005/01/15 21:13:08 miod Exp $ */ /* $NetBSD: intio.c,v 1.2 1997/01/30 09:18:54 thorpej Exp $ */ /*- @@ -43,8 +43,8 @@ #include <sys/param.h> #include <sys/systm.h> -#include <sys/device.h> - +#include <sys/device.h> + #include <hp300/dev/intiovar.h> int intiomatch(struct device *, void *, void *); diff --git a/sys/arch/hp300/dev/mt.c b/sys/arch/hp300/dev/mt.c index dc801960306..d25c9617baf 100644 --- a/sys/arch/hp300/dev/mt.c +++ b/sys/arch/hp300/dev/mt.c @@ -1,7 +1,7 @@ -/* $OpenBSD: mt.c,v 1.12 2003/12/20 20:08:13 miod Exp $ */ +/* $OpenBSD: mt.c,v 1.13 2005/01/15 21:13:08 miod Exp $ */ /* $NetBSD: mt.c,v 1.8 1997/03/31 07:37:29 scottr Exp $ */ -/* +/* * Copyright (c) 1996, 1997 Jason R. Thorpe. All rights reserved. * Copyright (c) 1992, The University of Utah and * the Computer Systems Laboratory at the University of Utah (CSL). diff --git a/sys/arch/hp300/dev/mtreg.h b/sys/arch/hp300/dev/mtreg.h index 6cf71efd4c0..0277ca49056 100644 --- a/sys/arch/hp300/dev/mtreg.h +++ b/sys/arch/hp300/dev/mtreg.h @@ -1,7 +1,7 @@ -/* $OpenBSD: mtreg.h,v 1.3 2001/06/27 05:44:46 nate Exp $ */ +/* $OpenBSD: mtreg.h,v 1.4 2005/01/15 21:13:08 miod Exp $ */ /* $NetBSD: mtreg.h,v 1.1 1995/10/02 00:28:22 thorpej Exp $ */ -/* +/* * Copyright (c) 1992, The University of Utah and * the Computer Systems Laboratory at the University of Utah (CSL). * All rights reserved. diff --git a/sys/arch/hp300/dev/nhpib.c b/sys/arch/hp300/dev/nhpib.c index 3053f999a03..ac720462bf9 100644 --- a/sys/arch/hp300/dev/nhpib.c +++ b/sys/arch/hp300/dev/nhpib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nhpib.c,v 1.14 2004/12/25 23:02:24 miod Exp $ */ +/* $OpenBSD: nhpib.c,v 1.15 2005/01/15 21:13:08 miod Exp $ */ /* $NetBSD: nhpib.c,v 1.17 1997/05/05 21:06:41 thorpej Exp $ */ /* @@ -83,7 +83,7 @@ void nhpibifc(struct nhpibdevice *); void nhpibreadtimo(void *); int nhpibwait(struct nhpibdevice *, int); -void nhpibreset(struct hpibbus_softc *); +void nhpibreset(struct hpibbus_softc *); int nhpibsend(struct hpibbus_softc *, int, int, void *, int); int nhpibrecv(struct hpibbus_softc *, int, int, void *, int); int nhpibppoll(struct hpibbus_softc *); @@ -153,7 +153,7 @@ nhpibattach(parent, self, aux) { struct nhpib_softc *sc = (struct nhpib_softc *)self; struct dio_attach_args *da = aux; - struct hpibdev_attach_args ha; + struct hpibdev_attach_args ha; const char *desc; int ipl, type = HPIBA; diff --git a/sys/arch/hp300/dev/ppi.c b/sys/arch/hp300/dev/ppi.c index 11e7574a4c3..bd59d66f162 100644 --- a/sys/arch/hp300/dev/ppi.c +++ b/sys/arch/hp300/dev/ppi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ppi.c,v 1.11 2003/06/02 23:27:45 millert Exp $ */ +/* $OpenBSD: ppi.c,v 1.12 2005/01/15 21:13:08 miod Exp $ */ /* $NetBSD: ppi.c,v 1.13 1997/04/02 22:37:33 scottr Exp $ */ /* @@ -66,8 +66,8 @@ struct ppi_softc { }; /* sc_flags values */ -#define PPIF_ALIVE 0x01 -#define PPIF_OPEN 0x02 +#define PPIF_ALIVE 0x01 +#define PPIF_OPEN 0x02 #define PPIF_UIO 0x04 #define PPIF_TIMO 0x08 #define PPIF_DELAY 0x10 |