diff options
33 files changed, 208 insertions, 213 deletions
diff --git a/sys/arch/mvme88k/conf/Makefile.mvme88k b/sys/arch/mvme88k/conf/Makefile.mvme88k index 0d18414abd7..27876e0e004 100644 --- a/sys/arch/mvme88k/conf/Makefile.mvme88k +++ b/sys/arch/mvme88k/conf/Makefile.mvme88k @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.mvme88k,v 1.29 2003/10/01 20:39:38 miod Exp $ +# $OpenBSD: Makefile.mvme88k,v 1.30 2003/10/11 22:08:55 miod Exp $ # # Makefile for OpenBSD # @@ -171,7 +171,7 @@ links: SRCS= param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend -.depend: ${SRCS} assym.h param.c +.depend: ${SRCS} assym.h param.c ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} @@ -183,16 +183,16 @@ depend:: .depend # depend on root or device configuration autoconf.o conf.o: Makefile - -# depend on network or filesystem configuration -uipc_domain.o uipc_proto.o vfs_conf.o: Makefile + +# depend on network or filesystem configuration +uipc_domain.o uipc_proto.o vfs_conf.o: Makefile if_tun.o if_loop.o if_ethersubr.o: Makefile in_proto.o: Makefile # depend on maxusers assym.h machdep.o: Makefile -# depend on CPU configuration +# depend on CPU configuration locore.o machdep.o: Makefile process.o locore_asm_routines.o eh.o: assym.h m88110_mmu.o m88110_fp.o m88100_fp.o : assym.h diff --git a/sys/arch/mvme88k/ddb/db_sstep.c b/sys/arch/mvme88k/ddb/db_sstep.c index 4294c82bd62..3b8e79eea37 100644 --- a/sys/arch/mvme88k/ddb/db_sstep.c +++ b/sys/arch/mvme88k/ddb/db_sstep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_sstep.c,v 1.11 2002/03/14 01:26:38 millert Exp $ */ +/* $OpenBSD: db_sstep.c,v 1.12 2003/10/11 22:08:57 miod Exp $ */ /* * Mach Operating System * Copyright (c) 1993-1991 Carnegie Mellon University @@ -44,7 +44,7 @@ boolean_t inst_delayed(unsigned int ins); #ifdef INTERNAL_SSTEP db_breakpoint_t db_not_taken_bkpt = 0; db_breakpoint_t db_taken_bkpt = 0; -#endif +#endif /* * Returns TRUE is the instruction a branch or jump instruction @@ -70,7 +70,7 @@ inst_branch(ins) return FALSE; } -/* +/* * inst_load(ins) * Returns the number of words the instruction loads. byte, * half and word count as 1; double word as 2 @@ -286,7 +286,7 @@ getreg_val(frame, regno) #ifdef INTERNAL_SSTEP void db_set_single_step(regs) - register db_regs_t *regs; + db_regs_t *regs; { if (cputyp == CPU_88110) { ((regs)->epsr |= (PSR_TRACE | PSR_SER)); @@ -334,4 +334,4 @@ db_clear_single_step(regs) } } } -#endif +#endif diff --git a/sys/arch/mvme88k/dev/bugtty.c b/sys/arch/mvme88k/dev/bugtty.c index e8f6b482bbd..b5873c4a88a 100644 --- a/sys/arch/mvme88k/dev/bugtty.c +++ b/sys/arch/mvme88k/dev/bugtty.c @@ -1,9 +1,9 @@ -/* $OpenBSD: bugtty.c,v 1.16 2003/09/01 19:14:01 miod Exp $ */ +/* $OpenBSD: bugtty.c,v 1.17 2003/10/11 22:08:57 miod Exp $ */ -/* Copyright (c) 1998 Steve Murphree, Jr. +/* Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1995 Dale Rahn. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -25,7 +25,7 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ + */ #include <sys/param.h> #include <sys/systm.h> @@ -51,7 +51,7 @@ void bugttyattach(struct device *parent, struct device *self, void *aux); struct cfattach bugtty_ca = { sizeof(struct device), bugttymatch, bugttyattach -}; +}; struct cfdriver bugtty_cd = { NULL, "bugtty", DV_TTY, 0 @@ -86,7 +86,7 @@ int needprom = 1; int ca_ipl; int ca_vec; char *ca_name; - void *ca_master; points to bus-dependent data + void *ca_master; points to bus-dependent data */ int @@ -96,7 +96,7 @@ bugttymatch(parent, self, aux) void *aux; { struct confargs *ca = aux; - + if (needprom == 0) return (0); ca->ca_paddr = (void *)0xfff45000; @@ -122,7 +122,7 @@ void bugttyoutput(struct tty *tp); int bugttydefaultrate = TTYDEF_SPEED; int bugttyswflags; -struct tty * +struct tty * bugttytty(dev) dev_t dev; { @@ -308,7 +308,7 @@ bugttyread(dev, uio, flag) struct tty *tp; if ((tp = bugtty_tty[BUGTTYUNIT(dev)]) == NULL) - return (ENXIO); + return (ENXIO); return ((*linesw[tp->t_line].l_read)(tp, uio, flag)); } @@ -378,7 +378,7 @@ bugttyioctl(dev, cmd, data, flag, p) return (ENXIO); error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag, p); - if (error >= 0) + if (error >= 0) return (error); error = ttioctl(tp, cmd, data, flag, p); @@ -421,9 +421,9 @@ bugttyioctl(dev, cmd, data, flag, p) *(int *)data = SWFLAGS(dev); break; case TIOCSFLAGS: - error = suser(p, 0); + error = suser(p, 0); if (error != 0) - return (EPERM); + return (EPERM); bugttyswflags = *(int *)data; bugttyswflags &= /* only allow valid flags */ @@ -461,12 +461,12 @@ bugttycnprobe(cp) { int maj; int needprom = 1; - + if (needprom == 0) { cp->cn_pri = CN_DEAD; return (0); } - + /* locate the major number */ for (maj = 0; maj < nchrdev; maj++) if (cdevsw[maj].d_open == bugttyopen) diff --git a/sys/arch/mvme88k/dev/busswreg.h b/sys/arch/mvme88k/dev/busswreg.h index 7ae067e298f..ab7e8158bd7 100644 --- a/sys/arch/mvme88k/dev/busswreg.h +++ b/sys/arch/mvme88k/dev/busswreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: busswreg.h,v 1.3 2001/12/19 04:02:25 smurph Exp $ */ +/* $OpenBSD: busswreg.h,v 1.4 2003/10/11 22:08:57 miod Exp $ */ /* * Memory map for BusSwitch chip found in mvme197 boards. @@ -126,11 +126,11 @@ struct bussw_reg { #define BS_XCC_FBSY 0x00000004 #define BS_XCC_DIAG 0x00000008 -/* - * INTR1 - Abort Control Register - * Cross Processor Interrupt Register - * Timer Interrupt 1 Register - * Timer Interrupt 2 Register +/* + * INTR1 - Abort Control Register + * Cross Processor Interrupt Register + * Timer Interrupt 1 Register + * Timer Interrupt 2 Register */ #define BS_INTR1_ABORT_ICLR 0x08000000 /* abort interrupt clear */ #define BS_INTR1_ABORT_IEN 0x10000000 /* abort interrupt enable */ @@ -163,11 +163,11 @@ struct bussw_reg { #define BS_VBASE_SRC_EXT 0x4 /* external interrupt */ #define BS_VBASE_SRC_SPUR 0x7 /* spurious interrupt */ -/* - * INTR2 - Write Post Control Register - * Processor Address Log Interrupt Register - * External Interrupt Register - * Vector Base +/* + * INTR2 - Write Post Control Register + * Processor Address Log Interrupt Register + * External Interrupt Register + * Vector Base */ #define BS_INTR2_WPINT_ICLR 0x08000000 /* WPINT interrupt clear */ #define BS_INTR2_WPINT_IEN 0x10000000 /* WPINT interrupt enable */ diff --git a/sys/arch/mvme88k/dev/clreg.h b/sys/arch/mvme88k/dev/clreg.h index 01e82849a94..93bd1566f0b 100644 --- a/sys/arch/mvme88k/dev/clreg.h +++ b/sys/arch/mvme88k/dev/clreg.h @@ -1,9 +1,9 @@ -/* $OpenBSD: clreg.h,v 1.3 2003/06/04 16:36:15 deraadt Exp $ */ +/* $OpenBSD: clreg.h,v 1.4 2003/10/11 22:08:57 miod Exp $ */ -/* Copyright (c) 1998 Steve Murphree, Jr. +/* Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1995 Dale Rahn. All rights reserved. * - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -25,7 +25,7 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ + */ struct clreg { volatile u_char anon1[0x7]; diff --git a/sys/arch/mvme88k/dev/dart.c b/sys/arch/mvme88k/dev/dart.c index 0d355417c49..b357f8742d4 100644 --- a/sys/arch/mvme88k/dev/dart.c +++ b/sys/arch/mvme88k/dev/dart.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dart.c,v 1.24 2003/10/03 16:44:50 miod Exp $ */ +/* $OpenBSD: dart.c,v 1.25 2003/10/11 22:08:57 miod Exp $ */ /* * Mach Operating System @@ -86,9 +86,9 @@ struct dartsoftc { int dartmatch(struct device *parent, void *self, void *aux); void dartattach(struct device *parent, struct device *self, void *aux); -struct cfattach dart_ca = { +struct cfattach dart_ca = { sizeof(struct dartsoftc), dartmatch, dartattach -}; +}; struct cfdriver dart_cd = { NULL, "dart", DV_TTY, 0 @@ -154,14 +154,14 @@ dart_speed(speed) { struct dart_s *ds = dart_speeds; while (ds->kspeed != 0xFFFF) { - if (ds->kspeed == speed) + if (ds->kspeed == speed) return ds->dspeed; ds++; } return NOBAUD; } -struct tty* +struct tty* darttty(dev) dev_t dev; { @@ -188,7 +188,7 @@ dartmatch(parent, vcf, args) if (brdtyp != BRD_188) return (0); ca->ca_vaddr = ca->ca_paddr; /* 1:1 */ addr = (union dartreg *)ca->ca_vaddr; - + if (badvaddr((vaddr_t)addr, 2)) { printf("==> dart: failed address check.\n"); return (0); @@ -218,7 +218,7 @@ dartattach(parent, self, aux) sc->sc_dart[A_PORT].tty = NULL; sc->sc_dart[B_PORT].tty = NULL; ca->ca_vec = SYSCV_SCC; /* hard coded vector */ - sc->sc_vec = ca->ca_vec; + sc->sc_vec = ca->ca_vec; addr = sc->dart_reg; @@ -238,7 +238,7 @@ dartattach(parent, self, aux) /* Start out with Tx and RX interrupts disabled */ /* Enable input port change interrupt */ dart_sv_reg.sv_imr = IIPCHG; - + if (dart_cons >= 0) { printf(" console (tty%s) ", dart_cons == 0 ? "a" : "b"); } @@ -323,19 +323,19 @@ dartstart(tp) port = DART_PORT(dev); if (dart_cd.cd_ndevs == 0 || port >= NDARTPORTS) return; - + sc = (struct dartsoftc *) dart_cd.cd_devs[0]; addr = sc->dart_reg; ptaddr = sc->port_reg[port]; if ((tp->t_state & TS_ISOPEN) == 0) return; - + s = spltty(); - + if (tp->t_state & (TS_TIMEOUT |TS_BUSY | TS_TTSTOP)) goto bail; - + if (tp->t_outq.c_cc <= tp->t_lowat) { if (tp->t_state & TS_ASLEEP) { tp->t_state &= ~TS_ASLEEP; @@ -369,7 +369,7 @@ dartstart(tp) dprintf(("dartstart: writing char \"%c\" (0x%02x) to port %d\n", c & 0xff, c & 0xff, port)); ptaddr->write.wr_tb = c & 0xff; - + if (port != dart_cons) dprintf(("dartstart: enabling Tx int\n")); if (port == A_PORT) @@ -443,12 +443,12 @@ dartmctl (dev, flags, how) int newflags = 0; struct dart_info *dart; struct dartsoftc *sc; - int s; + int s; port = DART_PORT(dev); if (dart_cd.cd_ndevs == 0 || port >= NDARTPORTS) return (ENODEV); - + sc = (struct dartsoftc *) dart_cd.cd_devs[0]; dart = &sc->sc_dart[port]; addr = sc->dart_reg; @@ -463,9 +463,9 @@ dartmctl (dev, flags, how) dartbreak(port, 0); flags &= ~TIOCCBRK; } -#endif +#endif s = spltty(); - + HANDLE_FLAG(TIOCM_DTR, port, OPDTRA, OPDTRB); HANDLE_FLAG(TIOCM_RTS, port, OPRTSA, OPRTSB); @@ -476,7 +476,7 @@ dartmctl (dev, flags, how) HOW2STR(how), flags, FLAGSTRING); panic("dartmctl"); } -#endif +#endif dprintf(("dartmctl: action=%s flags=0x%x\n", HOW2STR(how), newflags)); @@ -527,7 +527,7 @@ dartbreak(dev, state) addr = sc->dart_reg; ptaddr = sc->port_reg[port]; - + if (state == 1) { /* the duart must be enabled with a dummy byte, to prevent the transmitter empty interrupt */ @@ -540,7 +540,7 @@ dartbreak(dev, state) return; } -int +int dartioctl(dev, cmd, data, flag, p) dev_t dev; u_long cmd; @@ -557,7 +557,7 @@ dartioctl(dev, cmd, data, flag, p) port = DART_PORT(dev); if (dart_cd.cd_ndevs == 0 || port >= NDARTPORTS) return (ENODEV); - + sc = (struct dartsoftc *) dart_cd.cd_devs[0]; dart = &sc->sc_dart[port]; tp = dart->tty; @@ -610,9 +610,9 @@ dartioctl(dev, cmd, data, flag, p) *(int *)data = dart->dart_swflags; break; case TIOCSFLAGS: - error = suser(p, 0); + error = suser(p, 0); if (error != 0) - return(EPERM); + return(EPERM); dart->dart_swflags = *(int *)data; if (dart_cons == port) @@ -630,7 +630,7 @@ dartioctl(dev, cmd, data, flag, p) /* * To be called at spltty - tty already locked. */ -int +int dartparam(tp, t) struct tty *tp; struct termios *t; @@ -655,7 +655,7 @@ dartparam(tp, t) dart = &sc->sc_dart[port]; addr = sc->dart_reg; ptaddr = sc->port_reg[port]; - + tp->t_ispeed = t->c_ispeed; tp->t_ospeed = t->c_ospeed; tp->t_cflag = t->c_cflag; @@ -809,7 +809,7 @@ dartmodemtrans(sc, ip, ipcr) (void) ttymodem(tp, dcdstate); } -int +int dartopen (dev, flag, mode, p) dev_t dev; int flag; @@ -872,7 +872,7 @@ dartopen (dev, flag, mode, p) return ((*linesw[tp->t_line].l_open)(dev, tp)); } -int +int dartclose (dev, flag, mode, p) dev_t dev; int flag; @@ -887,17 +887,17 @@ dartclose (dev, flag, mode, p) port = DART_PORT(dev); if (dart_cd.cd_ndevs == 0 || port >= NDARTPORTS) return (ENODEV); - + sc = (struct dartsoftc *) dart_cd.cd_devs[0]; dart = &sc->sc_dart[port]; tp = dart->tty; (*linesw[tp->t_line].l_close)(tp, flag); ttyclose(tp); - + return 0; } -int +int dartread (dev, uio, flag) dev_t dev; struct uio *uio; @@ -911,7 +911,7 @@ dartread (dev, uio, flag) port = DART_PORT(dev); if (dart_cd.cd_ndevs == 0 || port >= NDARTPORTS) return (ENODEV); - + sc = (struct dartsoftc *) dart_cd.cd_devs[0]; dart = &sc->sc_dart[port]; tp = dart->tty; @@ -921,7 +921,7 @@ dartread (dev, uio, flag) return ((*linesw[tp->t_line].l_read)(tp, uio, flag)); } -int +int dartwrite(dev, uio, flag) dev_t dev; struct uio *uio; @@ -935,7 +935,7 @@ dartwrite(dev, uio, flag) port = DART_PORT(dev); if (dart_cd.cd_ndevs == 0 || port >= NDARTPORTS) return (ENODEV); - + sc = (struct dartsoftc *)dart_cd.cd_devs[0]; dart = &sc->sc_dart[port]; @@ -1022,7 +1022,7 @@ dartrint(sc, port) data &= 0177; /* CS7 */ ttyinput(data, tp); } -#endif +#endif } } } @@ -1092,9 +1092,8 @@ dartintr(arg) addr = sc->dart_reg; isr = addr->read.rd_isr; - isr &= dart_sv_reg.sv_imr; - + if (isr) { /* interrupt from this duart */ if (isr & IIPCHG) { unsigned int ip = addr->read.rd_ip; @@ -1191,13 +1190,13 @@ dartcnputc(dev, c) ptaddr = (union dart_pt_io *) addr + (port * 0x20); #else ptaddr = (union dart_pt_io *) addr + ((dev & 1) ? 1 : 0); -#endif +#endif #if 1 s = spltty(); -#else +#else psr = disable_interrupts_return_psr(); -#endif +#endif /* Assume first port initialized if we get here. */ /* Assume the bug initializes the port */ @@ -1223,9 +1222,9 @@ dartcnputc(dev, c) #if 1 splx(s); -#else +#else set_psr(psr); -#endif +#endif } int @@ -1255,7 +1254,7 @@ dartcngetc(dev) ptaddr = (union dart_pt_io *) addr + (port * 0x20); #else ptaddr = (union dart_pt_io *) addr + ((dev & 1) ? 1 : 0); -#endif +#endif /* enable receiver */ ptaddr->write.wr_cr = RXEN; @@ -1276,9 +1275,9 @@ dartcngetc(dev) ptaddr->write.wr_cr = ERRRESET; #if 1 splx(s); -#else +#else set_psr(psr); -#endif +#endif return c; } @@ -1291,17 +1290,17 @@ dartcngetc(dev) buf[5] = (char) c; #if 1 splx(s); -#else +#else set_psr(psr); -#endif +#endif return (c & 0x7f); } } } while (-1); #if 1 splx(s); -#else +#else set_psr(psr); -#endif +#endif return -1; } diff --git a/sys/arch/mvme88k/dev/i82586.h b/sys/arch/mvme88k/dev/i82586.h index fc278d29a8c..4c4ab17a7c6 100644 --- a/sys/arch/mvme88k/dev/i82586.h +++ b/sys/arch/mvme88k/dev/i82586.h @@ -1,7 +1,7 @@ -/* $OpenBSD: i82586.h,v 1.3 2003/06/02 07:06:56 deraadt Exp $ */ +/* $OpenBSD: i82586.h,v 1.4 2003/10/11 22:08:57 miod Exp $ */ /*- - * Copyright (c) 1998 Steve Murphree, Jr. + * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1995 Theo de Raadt * Copyright (c) 1992, University of Vermont and State Agricultural College. * Copyright (c) 1992, Garrett A. Wollman. diff --git a/sys/arch/mvme88k/dev/if_ie.h b/sys/arch/mvme88k/dev/if_ie.h index 5fd3ab90340..b535a0a5ff7 100644 --- a/sys/arch/mvme88k/dev/if_ie.h +++ b/sys/arch/mvme88k/dev/if_ie.h @@ -1,6 +1,6 @@ -/* $OpenBSD: if_ie.h,v 1.4 2003/06/02 07:06:56 deraadt Exp $ */ +/* $OpenBSD: if_ie.h,v 1.5 2003/10/11 22:08:57 miod Exp $ */ -/* Copyright (c) 1998 Steve Murphree, Jr. +/* Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1995 Theo de Raadt * All rights reserved. * diff --git a/sys/arch/mvme88k/dev/if_vereg.h b/sys/arch/mvme88k/dev/if_vereg.h index 6284fd65b5e..67b5038d7db 100644 --- a/sys/arch/mvme88k/dev/if_vereg.h +++ b/sys/arch/mvme88k/dev/if_vereg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vereg.h,v 1.4 2003/06/02 23:27:51 millert Exp $ */ +/* $OpenBSD: if_vereg.h,v 1.5 2003/10/11 22:08:57 miod Exp $ */ /*- * Copyright (c) 1982, 1992, 1993 @@ -176,7 +176,7 @@ struct veinit { #define LE_MODE_DRX 0x0001 /* disable receiver */ #define LE_MODE_NORMAL 0 /* none of the above */ -/* Receive message descriptor 1 (rmd1_bits) */ +/* Receive message descriptor 1 (rmd1_bits) */ #define LE_R1_OWN 0x80 /* LANCE owns the packet */ #define LE_R1_ERR 0x40 /* error summary */ #define LE_R1_FRAM 0x20 /* framing error */ @@ -189,7 +189,7 @@ struct veinit { #define LE_R1_BITS \ "\20\10OWN\7ERR\6FRAM\5OFLO\4CRC\3BUFF\2STP\1ENP" -/* Transmit message descriptor 1 (tmd1_bits) */ +/* Transmit message descriptor 1 (tmd1_bits) */ #define LE_T1_OWN 0x80 /* LANCE owns the packet */ #define LE_T1_ERR 0x40 /* error summary */ #define LE_T1_MORE 0x10 /* multiple collisions */ @@ -201,7 +201,7 @@ struct veinit { #define LE_T1_BITS \ "\20\10OWN\7ERR\6RES\5MORE\4ONE\3DEF\2STP\1ENP" -/* Transmit message descriptor 3 (tmd3) */ +/* Transmit message descriptor 3 (tmd3) */ #define LE_T3_BUFF 0x8000 /* buffer error */ #define LE_T3_UFLO 0x4000 /* underflow error */ #define LE_T3_LCOL 0x1000 /* late collision */ diff --git a/sys/arch/mvme88k/dev/if_vevar.h b/sys/arch/mvme88k/dev/if_vevar.h index b2425f4004a..22483b1bd73 100644 --- a/sys/arch/mvme88k/dev/if_vevar.h +++ b/sys/arch/mvme88k/dev/if_vevar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vevar.h,v 1.3 2002/03/14 01:26:39 millert Exp $ */ +/* $OpenBSD: if_vevar.h,v 1.4 2003/10/11 22:08:57 miod Exp $ */ /* * Copyright (c) 1995 Charles M. Hannum. All rights reserved. @@ -35,7 +35,7 @@ * Ethernet software status per device. * * Each interface is referenced by a network interface structure, - * arpcom.ac_if, which the routing code uses to locate the interface. + * arpcom.ac_if, which the routing code uses to locate the interface. * This structure contains the output queue for the interface, its address, ... * * NOTE: this structure MUST be the first element in machine-dependent diff --git a/sys/arch/mvme88k/dev/nvramreg.h b/sys/arch/mvme88k/dev/nvramreg.h index 1ad006e44b6..4ff1b688b8e 100644 --- a/sys/arch/mvme88k/dev/nvramreg.h +++ b/sys/arch/mvme88k/dev/nvramreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nvramreg.h,v 1.5 2003/06/02 23:27:51 millert Exp $ */ +/* $OpenBSD: nvramreg.h,v 1.6 2003/10/11 22:08:57 miod Exp $ */ /* * Copyright (c) 1992, 1993 @@ -46,13 +46,13 @@ /* * Mostek MK48T08 clock. - * + * * This chip is 8k in size. * The first TOD clock starts at offset 0x1FF8. The following structure * describes last 2K of it's 8K address space. The first 6K of the NVRAM * space is used for various things as follows: * 0000-0fff User Area - * 1000-10ff Networking Area + * 1000-10ff Networking Area * 1100-16f7 Operating System Area * 16f8-1ef7 ROM Debugger Area * 1ef8-1ff7 Configuration Area (Ethernet address etc) diff --git a/sys/arch/mvme88k/dev/sram.c b/sys/arch/mvme88k/dev/sram.c index 21765f930dc..d4022a8e8aa 100644 --- a/sys/arch/mvme88k/dev/sram.c +++ b/sys/arch/mvme88k/dev/sram.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sram.c,v 1.10 2003/06/02 07:06:56 deraadt Exp $ */ +/* $OpenBSD: sram.c,v 1.11 2003/10/11 22:08:57 miod Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -165,7 +165,7 @@ sramioctl(dev, cmd, data, flag, p) int unit = minor(dev); struct sramsoftc *sc = (struct sramsoftc *) sram_cd.cd_devs[unit]; int error = 0; - + switch (cmd) { case MIOCGSIZ: *(int *)data = sc->sc_len; diff --git a/sys/arch/mvme88k/dev/syscon.c b/sys/arch/mvme88k/dev/syscon.c index 76c7c030de3..0817db63376 100644 --- a/sys/arch/mvme88k/dev/syscon.c +++ b/sys/arch/mvme88k/dev/syscon.c @@ -1,4 +1,4 @@ -/* $OpenBSD: syscon.c,v 1.12 2003/09/28 22:14:33 miod Exp $ */ +/* $OpenBSD: syscon.c,v 1.13 2003/10/11 22:08:57 miod Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. * All rights reserved. @@ -67,9 +67,9 @@ struct sysconreg syscon_reg = { (unsigned int *volatile)RMAD_REG, (unsigned int *volatile)WVAD_REG, (unsigned int *volatile)RVAD_REG, (unsigned int *volatile)CIO_PORTC, (unsigned int *volatile)CIO_PORTB, (unsigned int *volatile)CIO_PORTA, - (unsigned int *volatile)CIO_CTRL + (unsigned int *volatile)CIO_CTRL }; - + struct sysconsoftc { struct device sc_dev; void *sc_vaddr; /* Utility I/O space */ @@ -119,7 +119,7 @@ sysconmatch(parent, vcf, args) return (0); /* - * Uh, MVME188 better have on of these, so always match if it + * Uh, MVME188 better have on of these, so always match if it * is a MVME188... */ syscon = (struct sysconreg *)(IIOV(ca->ca_paddr)); @@ -193,7 +193,7 @@ sysconattach(parent, self, args) printf(": rev %d\n", 1); - /* + /* * pseudo driver, abort interrupt handler */ sc->sc_abih.ih_fn = sysconabort; diff --git a/sys/arch/mvme88k/dev/sysconreg.h b/sys/arch/mvme88k/dev/sysconreg.h index 7c43c023cc1..816931b8ed4 100644 --- a/sys/arch/mvme88k/dev/sysconreg.h +++ b/sys/arch/mvme88k/dev/sysconreg.h @@ -1,10 +1,10 @@ -/* $OpenBSD: sysconreg.h,v 1.3 2002/01/14 21:34:39 miod Exp $ */ +/* $OpenBSD: sysconreg.h,v 1.4 2003/10/11 22:08:57 miod Exp $ */ /* * Memory map for SYSCON found in mvme188 board set. - * No specific chips are found here like the PCCTWO + * No specific chips are found here like the PCCTWO * on MVME1x7. All chips are included in this one - * map/device so that devices don't run rampant in + * map/device so that devices don't run rampant in * the config files. I may change this later XXX smurph. */ @@ -17,8 +17,8 @@ struct sysconreg { unsigned int *volatile ien3; unsigned int *volatile ienall; unsigned int *volatile ist; - unsigned int *volatile setswi; - unsigned int *volatile clrswi; + unsigned int *volatile setswi; + unsigned int *volatile clrswi; unsigned int *volatile istate; unsigned int *volatile clrint; unsigned char *volatile global0; @@ -42,7 +42,7 @@ struct sysconreg { unsigned int *volatile cio_portb; unsigned int *volatile cio_porta; unsigned int *volatile cio_ctrl; -}; +}; extern struct sysconreg *sys_syscon; diff --git a/sys/arch/mvme88k/dev/vme.h b/sys/arch/mvme88k/dev/vme.h index 49909ac5e33..c12cf72fecb 100644 --- a/sys/arch/mvme88k/dev/vme.h +++ b/sys/arch/mvme88k/dev/vme.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vme.h,v 1.9 2003/06/04 04:11:37 deraadt Exp $ */ +/* $OpenBSD: vme.h,v 1.10 2003/10/11 22:08:57 miod Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -347,10 +347,10 @@ struct vme2reg { #define VME2_GET_VBR1(x) ((((x)->vme2_vbr >> 24) & 0xf) << 4) #define VME2_VBR_GPOXXXX 0x00ffffff /*8c*/ volatile u_long vme2_misc; -#define VME2_MISC_MPIRQEN 0x00000080 /* do not set */ +#define VME2_MISC_MPIRQEN 0x00000080 /* do not set */ #define VME2_MISC_REVEROM 0x00000040 /* 167: dis eprom. 166: en flash */ #define VME2_MISC_DISSRAM 0x00000020 /* do not set */ -#define VME2_MISC_DISMST 0x00000010 +#define VME2_MISC_DISMST 0x00000010 #define VME2_MISC_NOELBBSY 0x00000008 /* do not set */ #define VME2_MISC_DISBSYT 0x00000004 /* do not set */ #define VME2_MISC_ENINT 0x00000002 /* do not set */ diff --git a/sys/arch/mvme88k/dev/vmes.c b/sys/arch/mvme88k/dev/vmes.c index 8d349c5128a..d8f1a84a944 100644 --- a/sys/arch/mvme88k/dev/vmes.c +++ b/sys/arch/mvme88k/dev/vmes.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vmes.c,v 1.11 2003/06/04 04:11:37 deraadt Exp $ */ +/* $OpenBSD: vmes.c,v 1.12 2003/10/11 22:08:57 miod Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -49,8 +49,8 @@ int vmesmatch(struct device *, void *, void *); struct cfattach vmes_ca = { sizeof(struct vmessoftc), vmesmatch, vmesattach -}; - +}; + struct cfdriver vmes_cd = { NULL, "vmes", DV_DULL, 0 }; diff --git a/sys/arch/mvme88k/dev/vsdma.c b/sys/arch/mvme88k/dev/vsdma.c index 0237c792dbc..31fc8c7854b 100644 --- a/sys/arch/mvme88k/dev/vsdma.c +++ b/sys/arch/mvme88k/dev/vsdma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vsdma.c,v 1.9 2002/03/14 01:26:39 millert Exp $ */ +/* $OpenBSD: vsdma.c,v 1.10 2003/10/11 22:08:57 miod Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. * All rights reserved. @@ -81,11 +81,11 @@ struct scsi_device vs_scsidev = { struct cfattach vs_ca = { sizeof(struct vs_softc), vsmatch, vsattach, -}; +}; struct cfdriver vs_cd = { - NULL, "vs", DV_DULL, 0 -}; + NULL, "vs", DV_DULL, 0 +}; int vsmatch(pdp, vcf, args) @@ -97,7 +97,7 @@ vsmatch(pdp, vcf, args) return (1); } else { return (0); - } + } } void diff --git a/sys/arch/mvme88k/dev/vxreg.h b/sys/arch/mvme88k/dev/vxreg.h index 81f57542fc2..1f60b239521 100644 --- a/sys/arch/mvme88k/dev/vxreg.h +++ b/sys/arch/mvme88k/dev/vxreg.h @@ -1,9 +1,9 @@ -/* $OpenBSD: vxreg.h,v 1.2 2001/01/14 20:25:23 smurph Exp $ */ +/* $OpenBSD: vxreg.h,v 1.3 2003/10/11 22:08:57 miod Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. All rights reserved. * - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -28,7 +28,7 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ + */ /* IPC - Intelligent Peripheral Controller */ @@ -36,13 +36,13 @@ struct vxreg { /*0x0*/volatile u_short ipc_addrh; /* IPC addr reg, most significant */ /*0x2*/volatile u_short ipc_addrl; /* IPC addr reg, least significant */ /*0x4*/volatile u_char ipc_amr; /* IPC address modifier reg */ -/*0x5*/volatile u_char unused1; +/*0x5*/volatile u_char unused1; /*0x6*/volatile u_short ipc_cr; /* IPC control ceg */ /*0x8*/volatile u_short ipc_sr; /* IPC status reg */ /*0xA*/volatile u_char ipc_mdbp; /* IPC model data byte pointer */ -/*0xB*/volatile u_char reserved3; +/*0xB*/volatile u_char reserved3; /*0xC*/volatile u_char ipc_avrp; /* IPC abort vector reg pointer */ -/*0xD*/volatile u_char unused2; +/*0xD*/volatile u_char unused2; /*0xE*/volatile u_short ipc_tas; /* IPC test and set reg */ }; @@ -269,8 +269,8 @@ struct packet { /* 68 bytes */ volatile short ioctl_mode_h; volatile short ioctl_mode_l; volatile char filler4[6]; - volatile short error_h; - volatile short error_l; + volatile short error_h; + volatile short error_l; volatile short event_code; volatile char filler5[6]; union { @@ -301,8 +301,8 @@ struct ioctl_a_packet { /* 68 bytes */ volatile short ioctl_mode_h; volatile short ioctl_mode_l; volatile char filler4[6]; - volatile short error_h; - volatile short error_l; + volatile short error_h; + volatile short error_l; volatile short event_code; volatile char filler5[6]; volatile unsigned short c_iflag; @@ -393,8 +393,8 @@ struct init_packet { volatile char filler_3[7]; volatile char interrupt_vec; volatile char filler_4[6]; - volatile short error_h; - volatile short error_l; + volatile short error_h; + volatile short error_l; }; struct event_packet { @@ -406,8 +406,8 @@ struct event_packet { volatile char filler_1[4]; volatile char device_number; volatile char filler_2[19]; - volatile short error_h; - volatile short error_l; + volatile short error_h; + volatile short error_l; #define E_INTR 0x0001 #define E_QUIT 0x0002 #define E_HUP 0x0004 @@ -434,8 +434,8 @@ struct open_packet { volatile char filler_1[4]; volatile char device_number; volatile char filler_2[19]; - volatile short error_h; - volatile short error_l; + volatile short error_h; + volatile short error_l; volatile unsigned short event_code; /* returned from IPC */ }; @@ -448,8 +448,8 @@ struct close_packet { volatile char filler_1[4]; volatile char device_number; volatile char filler_2[19]; - volatile short error_h; - volatile short error_l; + volatile short error_h; + volatile short error_l; volatile unsigned short event_code; /* returned from IPC */ }; @@ -462,8 +462,8 @@ struct read_wakeup_packet { volatile char filler_1[4]; volatile char device_number; volatile char filler_2[19]; - volatile short error_h; - volatile short error_l; + volatile short error_h; + volatile short error_l; }; struct write_wakeup_packet { @@ -475,12 +475,12 @@ struct write_wakeup_packet { volatile char filler_1[4]; volatile char device_number; volatile char filler_2[19]; - volatile short error_h; - volatile short error_l; + volatile short error_h; + volatile short error_l; }; /* - * All structures must reside in dual port user memory. + * All structures must reside in dual port user memory. * ($FFxx0100 to $FFxxFFF0) * All structures must be word aligned (see byte counts above) * diff --git a/sys/arch/mvme88k/include/ansi.h b/sys/arch/mvme88k/include/ansi.h index 39aedc8cde0..809c570acf5 100644 --- a/sys/arch/mvme88k/include/ansi.h +++ b/sys/arch/mvme88k/include/ansi.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ansi.h,v 1.15 2003/08/01 07:44:05 miod Exp $ */ +/* $OpenBSD: ansi.h,v 1.16 2003/10/11 22:08:57 miod Exp $ */ /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -61,7 +61,7 @@ struct __va_list_tag; * chosen over a long is that the is*() and to*() routines take ints (says * ANSI C), but they use _RUNE_T_ instead of int. By changing it here, you * lose a bit of ANSI conformance, but your programs will still work. - * + * * Note that _WCHAR_T_ and _RUNE_T_ must be of the same type. When wchar_t * and rune_t are typedef'd, _WCHAR_T_ will be undef'd, but _RUNE_T remains * defined for ctype.h. diff --git a/sys/arch/mvme88k/include/board.h b/sys/arch/mvme88k/include/board.h index 4b69c4e73ce..d30f9dc63ba 100644 --- a/sys/arch/mvme88k/include/board.h +++ b/sys/arch/mvme88k/include/board.h @@ -1,4 +1,4 @@ -/* $OpenBSD: board.h,v 1.17 2003/09/28 16:01:11 miod Exp $ */ +/* $OpenBSD: board.h,v 1.18 2003/10/11 22:08:57 miod Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * All rights reserved. @@ -62,7 +62,7 @@ #define VMEA32D16_SIZE 0x007FFFFF /* VMEbus A32/D16 size */ -/* These need to be here because of the way m18x_cmmu.c +/* These need to be here because of the way m18x_cmmu.c handles the CMMU's. */ #define CMMU_SIZE 0x1000 @@ -99,7 +99,7 @@ #endif #ifdef MVME187 #include <machine/mvme187.h> -#endif +#endif #ifdef MVME188 #include <machine/mvme188.h> #endif diff --git a/sys/arch/mvme88k/include/cpus.h b/sys/arch/mvme88k/include/cpus.h index ecf5bd9e2d5..4de514f31ae 100644 --- a/sys/arch/mvme88k/include/cpus.h +++ b/sys/arch/mvme88k/include/cpus.h @@ -1,35 +1,31 @@ -/* $OpenBSD: cpus.h,v 1.11 2001/12/19 07:04:41 smurph Exp $ */ -/* +/* $OpenBSD: cpus.h,v 1.12 2003/10/11 22:08:57 miod Exp $ */ +/* * Mach Operating System * Copyright (c) 1993-1992 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * - * any improvements or extensions that they make and grant Carnegie Mellon + * + * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ /* - * - * HISTORY - */ -/* - Versions Idents for 88k family chips + * Versions Idents for 88k family chips */ #ifndef __MACHINE_CPUS_H__ diff --git a/sys/arch/mvme88k/include/disklabel.h b/sys/arch/mvme88k/include/disklabel.h index 0e7cbd6592c..d7ae09fbec9 100644 --- a/sys/arch/mvme88k/include/disklabel.h +++ b/sys/arch/mvme88k/include/disklabel.h @@ -1,9 +1,9 @@ -/* $OpenBSD: disklabel.h,v 1.10 2003/06/03 21:09:01 deraadt Exp $ */ +/* $OpenBSD: disklabel.h,v 1.11 2003/10/11 22:08:57 miod Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * Copyright (c) 1995 Dale Rahn. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -25,7 +25,7 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ + */ #ifndef __MACHINE_DISKLABEL_H__ #define __MACHINE_DISKLABEL_H__ diff --git a/sys/arch/mvme88k/include/exec.h b/sys/arch/mvme88k/include/exec.h index 760e511cfca..f1d8d097898 100644 --- a/sys/arch/mvme88k/include/exec.h +++ b/sys/arch/mvme88k/include/exec.h @@ -1,10 +1,10 @@ -/* $OpenBSD: exec.h,v 1.10 2001/08/12 12:03:02 heko Exp $ */ +/* $OpenBSD: exec.h,v 1.11 2003/10/11 22:08:57 miod Exp $ */ #ifndef __MACHINE_EXEC_H__ #define __MACHINE_EXEC_H__ #define __LDPGSZ 4096 -struct relocation_info_m88k { +struct relocation_info_m88k { unsigned int r_address; /* offset in text or data segment */ unsigned int r_symbolnum : 24, /* ordinal number of add symbol */ r_extern : 1, /* 1 if need to add symbol to value */ diff --git a/sys/arch/mvme88k/include/ieeefp.h b/sys/arch/mvme88k/include/ieeefp.h index ace84509abc..f70461fbca2 100644 --- a/sys/arch/mvme88k/include/ieeefp.h +++ b/sys/arch/mvme88k/include/ieeefp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ieeefp.h,v 1.3 2003/09/26 21:43:30 miod Exp $ */ +/* $OpenBSD: ieeefp.h,v 1.4 2003/10/11 22:08:57 miod Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * All rights reserved. @@ -33,7 +33,7 @@ * Values for fp_except are selected to match the bits in FPSR (see * m88100 user's manual page 6-33). This file is derived from the * definitions in the ABI/88k manual and sparc port. - * -- Nivas + * -- Nivas */ #ifndef _M88K_IEEEFP_H_ diff --git a/sys/arch/mvme88k/include/intr.h b/sys/arch/mvme88k/include/intr.h index 8c2754c8b77..197d25aa8f4 100644 --- a/sys/arch/mvme88k/include/intr.h +++ b/sys/arch/mvme88k/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.12 2003/01/13 20:12:16 miod Exp $ */ +/* $OpenBSD: intr.h,v 1.13 2003/10/11 22:08:57 miod Exp $ */ /* * Copyright (C) 2000 Steve Murphree, Jr. * All rights reserved. @@ -46,8 +46,8 @@ #define M88K_LEVEL5_IRQ 5 #define M88K_LEVEL6_IRQ 6 #define M88K_LEVEL7_IRQ 7 -/* - * We keep track of these separately, but +/* + * We keep track of these separately, but * they will be reflected with the above also. */ #define M88K_CLK_IRQ 8 @@ -57,7 +57,7 @@ extern int intrcnt[M88K_NIRQ]; -#endif +#endif /* * IPL levels. diff --git a/sys/arch/mvme88k/include/mvme188.h b/sys/arch/mvme88k/include/mvme188.h index 16186a0daef..6c82fa61556 100644 --- a/sys/arch/mvme88k/include/mvme188.h +++ b/sys/arch/mvme88k/include/mvme188.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mvme188.h,v 1.14 2003/09/28 16:01:12 miod Exp $ */ +/* $OpenBSD: mvme188.h,v 1.15 2003/10/11 22:08:57 miod Exp $ */ /* * Copyright (c) 1999 Steve Murphree, Jr. * All rights reserved. @@ -253,10 +253,10 @@ #define SLAVE_MASK (LVL6 | LVL1) #define MASK_LVL_0 (LVL7 | LVL6 | LVL5 | LVL4 | LVL3 | LVL2 | LVL1) -#define MASK_LVL_1 (LVL7 | LVL6 | LVL5 | LVL4 | LVL3 | LVL2) -#define MASK_LVL_2 (LVL7 | LVL6 | LVL5 | LVL4 | LVL3) -#define MASK_LVL_3 (LVL7 | LVL6 | LVL5 | LVL4) -#define MASK_LVL_4 (LVL7 | LVL6 | LVL5) +#define MASK_LVL_1 (LVL7 | LVL6 | LVL5 | LVL4 | LVL3 | LVL2) +#define MASK_LVL_2 (LVL7 | LVL6 | LVL5 | LVL4 | LVL3) +#define MASK_LVL_3 (LVL7 | LVL6 | LVL5 | LVL4) +#define MASK_LVL_4 (LVL7 | LVL6 | LVL5) #define MASK_LVL_5 (LVL7 | LVL6) #define MASK_LVL_6 (LVL7) #define MASK_LVL_7 0x00000000 /* all ints disabled */ @@ -364,7 +364,7 @@ extern unsigned int int_mask_val[INT_LEVEL]; extern unsigned int int_mask_shadow[MAX_CPUS]; extern unsigned int *volatile int_mask_reg[MAX_CPUS]; -#endif +#endif #define M188_IACK 0xFFF85000 #define M188_IVEC 0x40 /* vector returned upon MVME188 int */ diff --git a/sys/arch/mvme88k/include/pcb.h b/sys/arch/mvme88k/include/pcb.h index 4e7e3a2d9fa..6f6395d8d8a 100644 --- a/sys/arch/mvme88k/include/pcb.h +++ b/sys/arch/mvme88k/include/pcb.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pcb.h,v 1.9 2001/09/28 20:46:39 miod Exp $ */ +/* $OpenBSD: pcb.h,v 1.10 2003/10/11 22:08:57 miod Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * Mach Operating System @@ -25,8 +25,8 @@ * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ -/* - * Motorola 88100 pcb definitions +/* + * Motorola 88100 pcb definitions * */ /* @@ -36,7 +36,7 @@ #include <machine/reg.h> -/* +/* * Our PCB is the regular PCB+Save area for kernel frame. * Upon entering kernel mode from user land, save the user context * in the saved_state area - this is passed as the exception frame. diff --git a/sys/arch/mvme88k/include/pmap.h b/sys/arch/mvme88k/include/pmap.h index 83aa964865e..5d5a3948f69 100644 --- a/sys/arch/mvme88k/include/pmap.h +++ b/sys/arch/mvme88k/include/pmap.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.h,v 1.30 2003/09/26 22:27:25 miod Exp $ */ +/* $OpenBSD: pmap.h,v 1.31 2003/10/11 22:08:57 miod Exp $ */ /* * Mach Operating System * Copyright (c) 1991 Carnegie Mellon University @@ -37,7 +37,7 @@ struct pmap { u_int32_t pm_ibatc[BATC_MAX]; /* instruction BATCs */ u_int32_t pm_dbatc[BATC_MAX]; /* data BATCs */ #endif -}; +}; #define PMAP_NULL ((pmap_t) 0) diff --git a/sys/arch/mvme88k/include/prom.h b/sys/arch/mvme88k/include/prom.h index 551213cffd7..d7aa62e8b64 100644 --- a/sys/arch/mvme88k/include/prom.h +++ b/sys/arch/mvme88k/include/prom.h @@ -1,4 +1,4 @@ -/* $OpenBSD: prom.h,v 1.11 2003/09/01 19:14:04 miod Exp $ */ +/* $OpenBSD: prom.h,v 1.12 2003/10/11 22:08:57 miod Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -109,7 +109,7 @@ struct mvmeprom_brdid { u_char pwa[16]; /* printed wiring assembly number */ u_char speed[4]; /* cpu speed */ u_char etheraddr[6]; /* mac address, all zero if no ether */ - u_char fill[2]; + u_char fill[2]; u_char scsiid[2]; /* local SCSI id */ u_char sysid[8]; /* system id - nothing on mvme187 */ u_char brd1_pwb[8]; /* memory board 1 pwb */ diff --git a/sys/arch/mvme88k/include/psl.h b/sys/arch/mvme88k/include/psl.h index b963bc44e62..b900b9d71cf 100644 --- a/sys/arch/mvme88k/include/psl.h +++ b/sys/arch/mvme88k/include/psl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: psl.h,v 1.13 2003/09/26 19:04:28 miod Exp $ */ +/* $OpenBSD: psl.h,v 1.14 2003/10/11 22:08:57 miod Exp $ */ /* * Copyright (c) 1996 Nivas Madhur * All rights reserved. @@ -46,7 +46,7 @@ #ifndef __M88K_PSL_H__ #define __M88K_PSL_H__ -/* +/* * 88100 control registers */ diff --git a/sys/arch/mvme88k/mvme88k/genassym.cf b/sys/arch/mvme88k/mvme88k/genassym.cf index 4334bc5a239..68e03ce90a0 100644 --- a/sys/arch/mvme88k/mvme88k/genassym.cf +++ b/sys/arch/mvme88k/mvme88k/genassym.cf @@ -1,4 +1,4 @@ -# $OpenBSD: genassym.cf,v 1.7 2003/08/10 21:34:20 miod Exp $ +# $OpenBSD: genassym.cf,v 1.8 2003/10/11 22:08:57 miod Exp $ # # Copyright (c) 1982, 1990 The Regents of the University of California. # All rights reserved. @@ -28,7 +28,7 @@ # SUCH DAMAGE. # # @(#)genassym.c 7.8 (Berkeley) 5/7/91 -# $Id: genassym.cf,v 1.7 2003/08/10 21:34:20 miod Exp $ +# $Id: genassym.cf,v 1.8 2003/10/11 22:08:57 miod Exp $ # include <sys/param.h> @@ -66,7 +66,7 @@ member PCB_USER_STATE user_state # system calls export SYS_exit export SYS_sigreturn - + # m88100_saved_state element indexes define EF_R0 offsetof(struct m88100_saved_state, r[0]) / sizeof(int) define EF_FPSR offsetof(struct m88100_saved_state, fpsr) / sizeof(int) diff --git a/sys/arch/mvme88k/mvme88k/pmap_table.c b/sys/arch/mvme88k/mvme88k/pmap_table.c index 43ede1caf7a..890fcdbb836 100644 --- a/sys/arch/mvme88k/mvme88k/pmap_table.c +++ b/sys/arch/mvme88k/mvme88k/pmap_table.c @@ -1,28 +1,28 @@ -/* $OpenBSD: pmap_table.c,v 1.15 2003/09/16 20:52:22 miod Exp $ */ +/* $OpenBSD: pmap_table.c,v 1.16 2003/10/11 22:08:57 miod Exp $ */ -/* +/* * Mach Operating System * Copyright (c) 1993-1992 Carnegie Mellon University * All Rights Reserved. - * + * * Permission to use, copy, modify and distribute this software and its * documentation is hereby granted, provided that both the copyright * notice and this permission notice appear in all copies of the * software, derivative works or modified versions, and any portions * thereof, and that both notices appear in supporting documentation. - * + * * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * + * * Carnegie Mellon requests users of this software to return to - * + * * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU * School of Computer Science * Carnegie Mellon University * Pittsburgh PA 15213-3890 - * - * any improvements or extensions that they make and grant Carnegie Mellon + * + * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. */ @@ -49,7 +49,7 @@ m187_board_table[] = { { OBIO_START , OBIO_START , round_page(OBIO_SIZE) , RW, CI }, { 0, 0, 0xffffffff, 0, 0 }, }; -#endif +#endif #ifdef MVME188 const pmap_table_entry @@ -58,7 +58,7 @@ m188_board_table[] = { round_page(MVME188_UTILITY_SIZE), RW, CI }, { 0, 0, 0xffffffff, 0, 0 }, }; -#endif +#endif #ifdef MVME197 const pmap_table_entry @@ -68,24 +68,24 @@ m197_board_table[] = { /* No need to mention BUG here - it is contained inside OBIO */ { 0, 0, 0xffffffff, 0, 0 }, }; -#endif +#endif -pmap_table_t +pmap_table_t pmap_table_build(void) { switch (brdtyp) { #ifdef MVME187 case BRD_187: return m187_board_table; -#endif +#endif #ifdef MVME188 case BRD_188: return m188_board_table; -#endif +#endif #ifdef MVME197 case BRD_197: return m197_board_table; -#endif +#endif default: return NULL; /* silence warning */ } diff --git a/sys/arch/mvme88k/stand/Makefile.inc b/sys/arch/mvme88k/stand/Makefile.inc index 1dc813fddaa..bb712aaa08d 100644 --- a/sys/arch/mvme88k/stand/Makefile.inc +++ b/sys/arch/mvme88k/stand/Makefile.inc @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile.inc,v 1.6 2003/10/01 20:39:40 miod Exp $ +# $OpenBSD: Makefile.inc,v 1.7 2003/10/11 22:08:57 miod Exp $ MDEC_DIR?=/usr/mdec CFLAGS+= -fno-stack-protector -mmemcpy -# Load addresses for first and second stage bootstraps +# Load addresses for first and second stage bootstraps STAGE1_RELOC=0x009F0000 STAGE2_RELOC=0x00AF0000 |