From 03ca5d05cf0c42850144539dc779cdfed09306d7 Mon Sep 17 00:00:00 2001 From: simonb Date: Thu, 25 Mar 1999 01:17:51 +0000 Subject: [PATCH] Remove trailing whitespace. --- sys/arch/pmax/pmax/bus_dma.c | 12 ++++---- sys/arch/pmax/pmax/clock.c | 6 ++-- sys/arch/pmax/pmax/conf.c | 4 +-- sys/arch/pmax/pmax/cpu.c | 12 ++++---- sys/arch/pmax/pmax/dec_3100.c | 20 ++++++------- sys/arch/pmax/pmax/dec_3max.c | 16 +++++------ sys/arch/pmax/pmax/dec_3max_subr.c | 6 ++-- sys/arch/pmax/pmax/dec_3max_subr.h | 6 ++-- sys/arch/pmax/pmax/dec_3maxplus.c | 22 +++++++-------- sys/arch/pmax/pmax/dec_3min.c | 38 ++++++++++++------------- sys/arch/pmax/pmax/dec_kn02_subr.c | 6 ++-- sys/arch/pmax/pmax/dec_maxine.c | 30 ++++++++++---------- sys/arch/pmax/pmax/disksubr.c | 12 ++++---- sys/arch/pmax/pmax/kmin.h | 20 ++++++------- sys/arch/pmax/pmax/kn01.h | 24 ++++++++-------- sys/arch/pmax/pmax/kn02.h | 26 ++++++++--------- sys/arch/pmax/pmax/kn03.h | 14 ++++----- sys/arch/pmax/pmax/kn230.h | 16 +++++------ sys/arch/pmax/pmax/locore_machdep.S | 6 ++-- sys/arch/pmax/pmax/machdep.c | 44 +++++++++++++---------------- sys/arch/pmax/pmax/mainbus.c | 14 ++++----- sys/arch/pmax/pmax/maxine.h | 18 ++++++------ sys/arch/pmax/pmax/nameglue.h | 6 ++-- sys/arch/pmax/pmax/sysconf.c | 4 +-- sys/arch/pmax/pmax/turbochannel.h | 16 +++++------ 25 files changed, 197 insertions(+), 201 deletions(-) diff --git a/sys/arch/pmax/pmax/bus_dma.c b/sys/arch/pmax/pmax/bus_dma.c index a0faecaffd85..9910cb58dc7a 100644 --- a/sys/arch/pmax/pmax/bus_dma.c +++ b/sys/arch/pmax/pmax/bus_dma.c @@ -1,4 +1,4 @@ -/* $NetBSD: bus_dma.c,v 1.11 1999/03/24 05:51:09 mrg Exp $ */ +/* $NetBSD: bus_dma.c,v 1.12 1999/03/25 01:17:51 simonb Exp $ */ /*- * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc. @@ -71,7 +71,7 @@ extern paddr_t kvtophys __P((vaddr_t)); /* XXX */ struct pmax_bus_dma_tag pmax_default_bus_dma_tag = { _bus_dmamap_create, _bus_dmamap_destroy, - _bus_dmamap_load, + _bus_dmamap_load, _bus_dmamap_load_mbuf, _bus_dmamap_load_uio, _bus_dmamap_load_raw, @@ -544,17 +544,17 @@ _bus_dmamap_sync(t, map, offset, len, ops) */ int _bus_dmamem_alloc(t, size, alignment, boundary, segs, nsegs, rsegs, flags) - bus_dma_tag_t t; + bus_dma_tag_t t; bus_size_t size, alignment, boundary; bus_dma_segment_t *segs; int nsegs; int *rsegs; - int flags; + int flags; { extern paddr_t avail_start, avail_end; vaddr_t curaddr, lastaddr; psize_t high; - vm_page_t m; + vm_page_t m; struct pglist mlist; int curseg, error; @@ -647,7 +647,7 @@ _bus_dmamem_map(t, segs, nsegs, size, kvap, flags) bus_dma_segment_t *segs; int nsegs; size_t size; - caddr_t *kvap; + caddr_t *kvap; int flags; { vaddr_t va; diff --git a/sys/arch/pmax/pmax/clock.c b/sys/arch/pmax/pmax/clock.c index 2b1491c3c80b..8b8dca07a956 100644 --- a/sys/arch/pmax/pmax/clock.c +++ b/sys/arch/pmax/pmax/clock.c @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.25 1998/09/26 20:59:42 drochner Exp $ */ +/* $NetBSD: clock.c,v 1.26 1999/03/25 01:17:51 simonb Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -44,7 +44,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.25 1998/09/26 20:59:42 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.26 1999/03/25 01:17:51 simonb Exp $"); #include #include @@ -162,7 +162,7 @@ setstatclockrate(newhz) /* nothing we can do */ } -/* +/* * Experiments (and passing years) show that Decstation PROMS * assume the kernel uses the clock chip as a time-of-year clock. * The PROM assumes the clock is always set to 1972 or 1973, and contains diff --git a/sys/arch/pmax/pmax/conf.c b/sys/arch/pmax/pmax/conf.c index a15af8988452..aa2ed790eb2e 100644 --- a/sys/arch/pmax/pmax/conf.c +++ b/sys/arch/pmax/pmax/conf.c @@ -1,4 +1,4 @@ -/* $NetBSD: conf.c,v 1.31 1998/11/17 22:41:05 jonathan Exp $ */ +/* $NetBSD: conf.c,v 1.32 1999/03/25 01:17:51 simonb Exp $ */ /* * Copyright (c) 1992, 1993 @@ -110,7 +110,7 @@ struct bdevsw bdevsw[] = int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]); /* - * Swapdev is a fake block device implemented in sw.c and only used + * Swapdev is a fake block device implemented in sw.c and only used * internally to get to swstrategy. It cannot be provided to the * users, because the swstrategy routine munches the b_dev and b_blkno * entries before calling the appropriate driver. This would horribly diff --git a/sys/arch/pmax/pmax/cpu.c b/sys/arch/pmax/pmax/cpu.c index 7d596f2b8b94..ac1e7f79ff19 100644 --- a/sys/arch/pmax/pmax/cpu.c +++ b/sys/arch/pmax/pmax/cpu.c @@ -1,21 +1,21 @@ -/* $NetBSD: cpu.c,v 1.10 1998/01/12 20:12:38 thorpej Exp $ */ +/* $NetBSD: cpu.c,v 1.11 1999/03/25 01:17:52 simonb Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. * All rights reserved. * * Author: Chris G. Demetriou - * + * * 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 + * + * 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 diff --git a/sys/arch/pmax/pmax/dec_3100.c b/sys/arch/pmax/pmax/dec_3100.c index 95d738335983..d9d7fe9d8dba 100644 --- a/sys/arch/pmax/pmax/dec_3100.c +++ b/sys/arch/pmax/pmax/dec_3100.c @@ -1,4 +1,4 @@ -/* $NetBSD: dec_3100.c,v 1.6 1998/09/05 04:11:04 nisimura Exp $ */ +/* $NetBSD: dec_3100.c,v 1.7 1999/03/25 01:17:52 simonb Exp $ */ /* * Copyright (c) 1998 Jonathan Stone. All rights reserved. @@ -87,8 +87,8 @@ #include /* mcclock CPUspeed estimation */ #include -#include -#include +#include +#include #include /* XXXjrs replace with vectors */ #include @@ -103,10 +103,10 @@ void dec_3100_init __P((void)); void dec_3100_os_init __P((void)); void dec_3100_bus_reset __P((void)); -void dec_3100_enable_intr +void dec_3100_enable_intr __P ((u_int slotno, int (*handler) __P((intr_arg_t sc)), intr_arg_t sc, int onoff)); -int dec_3100_intr __P((u_int mask, u_int pc, +int dec_3100_intr __P((u_int mask, u_int pc, u_int statusReg, u_int causeReg)); void dec_3100_cons_init __P((void)); @@ -119,9 +119,9 @@ dec_3100_intr_establish __P((void* cookie, int level, int (*handler) __P((intr_arg_t)), intr_arg_t arg)); void dec_3100_intr_disestablish __P((struct ibus_attach_args *ia)); - + /* - * Fill in platform struct. + * Fill in platform struct. */ void dec_3100_init() @@ -221,7 +221,7 @@ dec_3100_intr(mask, pc, statusReg, causeReg) unsigned statusReg; unsigned causeReg; { - register volatile struct chiptime *c = + register volatile struct chiptime *c = (volatile struct chiptime *)MIPS_PHYS_TO_KSEG1(KN01_SYS_CLOCK); struct clockframe cf; int temp; @@ -250,7 +250,7 @@ dec_3100_intr(mask, pc, statusReg, causeReg) #if NLE_PMAX > 0 if (mask & MIPS_INT_MASK_1) { - /* + /* * tty interrupts were disabled by the splx() call * that re-enables clock interrupts. A slip or ppp driver * manipulating if queues should have called splimp(), @@ -292,7 +292,7 @@ dec_3100_intr_disestablish(struct ibus_attach_args *ia) { printf("dec_3100_intr_distestablish: not implemented\n"); } - + /* * Handle memory errors. diff --git a/sys/arch/pmax/pmax/dec_3max.c b/sys/arch/pmax/pmax/dec_3max.c index 86089789f65e..adb2dcf11044 100644 --- a/sys/arch/pmax/pmax/dec_3max.c +++ b/sys/arch/pmax/pmax/dec_3max.c @@ -1,4 +1,4 @@ -/* $NetBSD: dec_3max.c,v 1.6 1998/08/29 16:16:37 mrg Exp $ */ +/* $NetBSD: dec_3max.c,v 1.7 1999/03/25 01:17:52 simonb Exp $ */ /* * Copyright (c) 1998 Jonathan Stone. All rights reserved. @@ -73,7 +73,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: dec_3max.c,v 1.6 1998/08/29 16:16:37 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dec_3max.c,v 1.7 1999/03/25 01:17:52 simonb Exp $"); #include #include @@ -90,8 +90,8 @@ __KERNEL_RCSID(0, "$NetBSD: dec_3max.c,v 1.6 1998/08/29 16:16:37 mrg Exp $"); #include /* mcclock CPUspeed estimation */ #include -#include -#include +#include +#include #include /* XXXjrs replace with vectors */ #include @@ -104,10 +104,10 @@ void dec_3max_init __P((void)); void dec_3max_os_init __P((void)); void dec_3max_bus_reset __P((void)); -void dec_3max_enable_intr +void dec_3max_enable_intr __P ((u_int slotno, int (*handler) __P((intr_arg_t sc)), intr_arg_t sc, int onoff)); -int dec_3max_intr __P((u_int mask, u_int pc, +int dec_3max_intr __P((u_int mask, u_int pc, u_int statusReg, u_int causeReg)); void dec_3max_cons_init __P((void)); void dec_3max_device_register __P((struct device *, void *)); @@ -116,7 +116,7 @@ static void dec_3max_errintr __P((void)); /* - * Fill in platform struct. + * Fill in platform struct. */ void dec_3max_init() @@ -255,7 +255,7 @@ dec_3max_intr(mask, pc, statusReg, causeReg) unsigned causeReg; { register unsigned i, m; - register volatile struct chiptime *c = + register volatile struct chiptime *c = (volatile struct chiptime *) MIPS_PHYS_TO_KSEG1(KN02_SYS_CLOCK); register unsigned csr; int temp; diff --git a/sys/arch/pmax/pmax/dec_3max_subr.c b/sys/arch/pmax/pmax/dec_3max_subr.c index c3601d0ae4ab..aecd3e3550f0 100644 --- a/sys/arch/pmax/pmax/dec_3max_subr.c +++ b/sys/arch/pmax/pmax/dec_3max_subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: dec_3max_subr.c,v 1.4 1998/03/29 01:12:15 jonathan Exp $ */ +/* $NetBSD: dec_3max_subr.c,v 1.5 1999/03/25 01:17:52 simonb Exp $ */ /* * Copyright (c) 1998 Jonathan Stone. All rights reserved. @@ -32,7 +32,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: dec_3max_subr.c,v 1.4 1998/03/29 01:12:15 jonathan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dec_3max_subr.c,v 1.5 1999/03/25 01:17:52 simonb Exp $"); #include #include @@ -43,7 +43,7 @@ __KERNEL_RCSID(0, "$NetBSD: dec_3max_subr.c,v 1.4 1998/03/29 01:12:15 jonathan E #include /* - * the 3max and 3maxplus have compatible memory subsystems; + * the 3max and 3maxplus have compatible memory subsystems; * we handle them both here. */ diff --git a/sys/arch/pmax/pmax/dec_3max_subr.h b/sys/arch/pmax/pmax/dec_3max_subr.h index 42b6d67e1f8b..9f537ec9225b 100644 --- a/sys/arch/pmax/pmax/dec_3max_subr.h +++ b/sys/arch/pmax/pmax/dec_3max_subr.h @@ -1,4 +1,4 @@ -/* $NetBSD: dec_3max_subr.h,v 1.1 1998/03/30 09:02:03 jonathan Exp $ */ +/* $NetBSD: dec_3max_subr.h,v 1.2 1999/03/25 01:17:52 simonb Exp $ */ /* * Copyright (c) 1998 Jonathan Stone. All rights reserved. @@ -31,9 +31,9 @@ */ /* - * the 3max and 3maxplus have compatible memory subsystems; + * the 3max and 3maxplus have compatible memory subsystems; * we handle them both here. - * used on both + * used on both */ void dec_mtasic_err __P((u_int erradr, u_int errsyn)); diff --git a/sys/arch/pmax/pmax/dec_3maxplus.c b/sys/arch/pmax/pmax/dec_3maxplus.c index 9ba630b5c4b3..97b2434cac4a 100644 --- a/sys/arch/pmax/pmax/dec_3maxplus.c +++ b/sys/arch/pmax/pmax/dec_3maxplus.c @@ -1,4 +1,4 @@ -/* $NetBSD: dec_3maxplus.c,v 1.11 1999/03/03 06:46:02 simonb Exp $ */ +/* $NetBSD: dec_3maxplus.c,v 1.12 1999/03/25 01:17:52 simonb Exp $ */ /* * Copyright (c) 1998 Jonathan Stone. All rights reserved. @@ -73,7 +73,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: dec_3maxplus.c,v 1.11 1999/03/03 06:46:02 simonb Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dec_3maxplus.c,v 1.12 1999/03/25 01:17:52 simonb Exp $"); #include #include @@ -97,7 +97,7 @@ __KERNEL_RCSID(0, "$NetBSD: dec_3maxplus.c,v 1.11 1999/03/03 06:46:02 simonb Exp #include #include -#include +#include #include /* XXXjrs replace with vectors */ #include @@ -109,11 +109,11 @@ __KERNEL_RCSID(0, "$NetBSD: dec_3maxplus.c,v 1.11 1999/03/03 06:46:02 simonb Exp void dec_3maxplus_init __P((void)); void dec_3maxplus_os_init __P((void)); void dec_3maxplus_bus_reset __P((void)); -void dec_3maxplus_enable_intr +void dec_3maxplus_enable_intr __P ((u_int slotno, int (*handler) __P((intr_arg_t sc)), intr_arg_t sc, int onoff)); -int dec_3maxplus_intr __P((u_int mask, u_int pc, +int dec_3maxplus_intr __P((u_int mask, u_int pc, u_int statusReg, u_int causeReg)); void dec_3maxplus_cons_init __P((void)); @@ -130,7 +130,7 @@ void dec_3maxplus_tc_reset __P((void)); /* XXX unused? */ /* - * Fill in platform struct. + * Fill in platform struct. */ void dec_3maxplus_init() @@ -314,7 +314,7 @@ dec_3maxplus_intr(mask, pc, statusReg, causeReg) unsigned causeReg; { register u_int intr; - register volatile struct chiptime *c = + register volatile struct chiptime *c = (volatile struct chiptime *) MIPS_PHYS_TO_KSEG1(KN03_SYS_CLOCK); volatile u_int *imaskp = (volatile u_int *) MIPS_PHYS_TO_KSEG1(KN03_REG_IMSK); @@ -378,7 +378,7 @@ dec_3maxplus_intr(mask, pc, statusReg, causeReg) asc_dma_intr(); #endif } - + /* * XXX * DMA and non-DMA interrupts from the IOCTl asic all use the @@ -403,14 +403,14 @@ dec_3maxplus_intr(mask, pc, statusReg, causeReg) (tc_slot_info[KN03_SCC0_SLOT].sc); intrcnt[SERIAL0_INTR]++; } - + if ((intr & KN03_INTR_SCC_1) && tc_slot_info[KN03_SCC1_SLOT].intr) { (*(tc_slot_info[KN03_SCC1_SLOT].intr)) (tc_slot_info[KN03_SCC1_SLOT].sc); intrcnt[SERIAL1_INTR]++; } - + if ((intr & KN03_INTR_TC_0) && tc_slot_info[0].intr) { (*(tc_slot_info[0].intr)) @@ -443,7 +443,7 @@ dec_3maxplus_intr(mask, pc, statusReg, causeReg) else if (intr & KN03_INTR_TC_2) printf ("can't handle tc2 interrupt\n"); #endif /*DIAGNOSTIC*/ - + if ((intr & KN03_INTR_LANCE) && tc_slot_info[KN03_LANCE_SLOT].intr) { (*(tc_slot_info[KN03_LANCE_SLOT].intr)) diff --git a/sys/arch/pmax/pmax/dec_3min.c b/sys/arch/pmax/pmax/dec_3min.c index 15f1b49a1341..c61a2ae1e6a1 100644 --- a/sys/arch/pmax/pmax/dec_3min.c +++ b/sys/arch/pmax/pmax/dec_3min.c @@ -1,4 +1,4 @@ -/* $NetBSD: dec_3min.c,v 1.11 1999/03/02 12:23:58 jonathan Exp $ */ +/* $NetBSD: dec_3min.c,v 1.12 1999/03/25 01:17:52 simonb Exp $ */ /* * Copyright (c) 1998 Jonathan Stone. All rights reserved. @@ -73,7 +73,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: dec_3min.c,v 1.11 1999/03/02 12:23:58 jonathan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dec_3min.c,v 1.12 1999/03/25 01:17:52 simonb Exp $"); #include @@ -97,8 +97,8 @@ __KERNEL_RCSID(0, "$NetBSD: dec_3min.c,v 1.11 1999/03/02 12:23:58 jonathan Exp $ #include /* ioasic_base */ #include -#include -#include +#include +#include #include /* XXXjrs replace with vectors */ @@ -114,10 +114,10 @@ void dec_3min_os_init __P((void)); void dec_3min_bus_reset __P((void)); void dec_3maxplus_device_register __P((struct device *, void *)); -void dec_3min_enable_intr +void dec_3min_enable_intr __P ((u_int slotno, int (*handler) __P((intr_arg_t sc)), intr_arg_t sc, int onoff)); -int dec_3min_intr __P((u_int mask, u_int pc, +int dec_3min_intr __P((u_int mask, u_int pc, u_int statusReg, u_int causeReg)); void dec_3min_device_register __P((struct device *, void *)); @@ -133,7 +133,7 @@ u_long kmin_tc3_imask; /* - * Fill in platform struct. + * Fill in platform struct. */ void dec_3min_init() @@ -171,7 +171,7 @@ dec_3min_bus_reset() } - + void dec_3min_os_init() { @@ -221,7 +221,7 @@ dec_3min_os_init() physmem_boardmax = MIPS_PHYS_TO_KSEG1(physmem_boardmax); * (volatile u_int *)MIPS_PHYS_TO_KSEG1(KMIN_REG_IMSK) = - kmin_tc3_imask | + kmin_tc3_imask | (KMIN_IM0 & ~(KN03_INTR_TC_0|KN03_INTR_TC_1|KN03_INTR_TC_2)); } @@ -312,7 +312,7 @@ dec_3min_enable_intr(slotno, handler, sc, on) } } else { /* Clear the relevant mask... */ - if (slotno <= 2) { + if (slotno <= 2) { /* it's an option slot */ int s = splhigh(); printf("kmin_intr: cannot disable option slot %d\n", @@ -342,7 +342,7 @@ dec_3min_intr(mask, pc, statusReg, causeReg) unsigned causeReg; { register u_int intr; - register volatile struct chiptime *c = + register volatile struct chiptime *c = (volatile struct chiptime *) MIPS_PHYS_TO_KSEG1(KMIN_SYS_CLOCK); volatile u_int * const imaskp = (volatile u_int *)MIPS_PHYS_TO_KSEG1(KMIN_REG_IMSK); @@ -372,7 +372,7 @@ dec_3min_intr(mask, pc, statusReg, causeReg) asc_dma_intr(); #endif } - + if (intr & (IOASIC_INTR_SCSI_OVRUN | IOASIC_INTR_SCSI_READ_E)) *intrp &= ~(IOASIC_INTR_SCSI_OVRUN | IOASIC_INTR_SCSI_READ_E); @@ -381,7 +381,7 @@ dec_3min_intr(mask, pc, statusReg, causeReg) if (intr & KMIN_INTR_TIMEOUT) kn02ba_errintr(); - + if (intr & KMIN_INTR_CLOCK) { extern u_int32_t mips3_cycle_count __P((void)); @@ -400,7 +400,7 @@ dec_3min_intr(mask, pc, statusReg, causeReg) /* If clock interrups were enabled, re-enable them ASAP. */ if (old_mask & KMIN_INTR_CLOCK) { /* ioctl interrupt mask to splclock and higher */ - *imaskp = old_mask & + *imaskp = old_mask & ~(KMIN_INTR_SCC_0|KMIN_INTR_SCC_1 | IOASIC_INTR_LANCE|IOASIC_INTR_SCSI); wbflush(); @@ -428,7 +428,7 @@ dec_3min_intr(mask, pc, statusReg, causeReg) /* If tty interrupts were enabled, re-enable them ASAP. */ if ((old_mask & (KMIN_INTR_SCC_1|KMIN_INTR_SCC_0)) == (KMIN_INTR_SCC_1|KMIN_INTR_SCC_0)) { - *imaskp = old_mask & + *imaskp = old_mask & ~(KMIN_INTR_SCC_0|KMIN_INTR_SCC_1 | IOASIC_INTR_LANCE|IOASIC_INTR_SCSI); wbflush(); @@ -465,7 +465,7 @@ dec_3min_intr(mask, pc, statusReg, causeReg) (*tc_slot_info[0].intr)(tc_slot_info[0].sc); intrcnt[SLOT0_INTR]++; } - + if ((mask & MIPS_INT_MASK_1) && tc_slot_info[1].intr) { (*tc_slot_info[1].intr)(tc_slot_info[1].sc); intrcnt[SLOT1_INTR]++; @@ -499,9 +499,9 @@ done: /* * Count instructions between 4ms mcclock interrupt requests, * using the ioasic clock-interrupt-pending bit to determine - * when clock ticks occur. + * when clock ticks occur. * Set up iosiac to allow only clock interrupts, then - * call + * call */ void dec_3min_mcclock_cpuspeed(mcclock_addr, clockmask) @@ -516,7 +516,7 @@ dec_3min_mcclock_cpuspeed(mcclock_addr, clockmask) /* Allow only clock interrupts through ioasic. */ *ioasic_intrmaskp = KMIN_INTR_CLOCK; wbflush(); - + mc_cpuspeed(mcclock_addr, clockmask); *ioasic_intrmaskp = saved_imask; diff --git a/sys/arch/pmax/pmax/dec_kn02_subr.c b/sys/arch/pmax/pmax/dec_kn02_subr.c index 5b9799aac98a..2f5dcb77dff4 100644 --- a/sys/arch/pmax/pmax/dec_kn02_subr.c +++ b/sys/arch/pmax/pmax/dec_kn02_subr.c @@ -1,4 +1,4 @@ -/* $NetBSD: dec_kn02_subr.c,v 1.1 1998/03/25 03:57:54 jonathan Exp $ */ +/* $NetBSD: dec_kn02_subr.c,v 1.2 1999/03/25 01:17:52 simonb Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -45,7 +45,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: dec_kn02_subr.c,v 1.1 1998/03/25 03:57:54 jonathan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dec_kn02_subr.c,v 1.2 1999/03/25 01:17:52 simonb Exp $"); /* * Motherboard memory error contoller used in both @@ -85,7 +85,7 @@ kn02ba_recover_erradr(phys, mer) -/* +/* * Handle error * All we can do with parity is panic. * XXX check for clean user pages, replace frame, and reload ? diff --git a/sys/arch/pmax/pmax/dec_maxine.c b/sys/arch/pmax/pmax/dec_maxine.c index 00eba6030e24..19869409382f 100644 --- a/sys/arch/pmax/pmax/dec_maxine.c +++ b/sys/arch/pmax/pmax/dec_maxine.c @@ -1,4 +1,4 @@ -/* $NetBSD: dec_maxine.c,v 1.7 1999/03/02 09:24:17 jonathan Exp $ */ +/* $NetBSD: dec_maxine.c,v 1.8 1999/03/25 01:17:52 simonb Exp $ */ /* * Copyright (c) 1998 Jonathan Stone. All rights reserved. @@ -73,7 +73,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: dec_maxine.c,v 1.7 1999/03/02 09:24:17 jonathan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dec_maxine.c,v 1.8 1999/03/25 01:17:52 simonb Exp $"); #include #include @@ -96,8 +96,8 @@ __KERNEL_RCSID(0, "$NetBSD: dec_maxine.c,v 1.7 1999/03/02 09:24:17 jonathan Exp #include /* ioasic_base */ #include -#include -#include +#include +#include #include /* XXXjrs replace with vectors */ #include /* baseboard addresses (constants) */ @@ -111,10 +111,10 @@ void dec_maxine_os_init __P((void)); void dec_maxine_bus_reset __P((void)); void dec_maxine_mach_init __P((void)); -void dec_maxine_enable_intr +void dec_maxine_enable_intr __P ((u_int slotno, int (*handler) __P((intr_arg_t sc)), intr_arg_t sc, int onoff)); -int dec_maxine_intr __P((u_int mask, u_int pc, +int dec_maxine_intr __P((u_int mask, u_int pc, u_int statusReg, u_int causeReg)); void dec_maxine_device_register __P((struct device *, void *)); @@ -127,7 +127,7 @@ void dec_maxine_cons_init __P((void)); u_long xine_tc3_imask; /* - * Fill in platform struct. + * Fill in platform struct. */ void dec_maxine_init() @@ -299,7 +299,7 @@ dec_maxine_intr(mask, pc, statusReg, causeReg) unsigned causeReg; { register u_int intr; - register volatile struct chiptime *c = + register volatile struct chiptime *c = (volatile struct chiptime *) MIPS_PHYS_TO_KSEG1(XINE_SYS_CLOCK); volatile u_int *imaskp = (volatile u_int *) MIPS_PHYS_TO_KSEG1(XINE_REG_IMSK); @@ -344,14 +344,14 @@ dec_maxine_intr(mask, pc, statusReg, causeReg) printf ("can't handle scc interrupt\n"); intrcnt[SERIAL0_INTR]++; } - + if (intr & IOASIC_INTR_SCSI_PTR_LOAD) { *intrp &= ~IOASIC_INTR_SCSI_PTR_LOAD; #ifdef notdef asc_dma_intr(); #endif } - + if (intr & (IOASIC_INTR_SCSI_OVRUN | IOASIC_INTR_SCSI_READ_E)) *intrp &= ~(IOASIC_INTR_SCSI_OVRUN | IOASIC_INTR_SCSI_READ_E); @@ -366,7 +366,7 @@ dec_maxine_intr(mask, pc, statusReg, causeReg) printf ("can't handle dtop interrupt\n"); intrcnt[DTOP_INTR]++; } - + if (intr & XINE_INTR_FLOPPY) { if (tc_slot_info[XINE_FLOPPY_SLOT].intr) (*(tc_slot_info[XINE_FLOPPY_SLOT].intr)) @@ -375,7 +375,7 @@ dec_maxine_intr(mask, pc, statusReg, causeReg) printf ("can't handle floppy interrupt\n"); intrcnt[FLOPPY_INTR]++; } - + if (intr & XINE_INTR_TC_0) { if (tc_slot_info[0].intr) (*(tc_slot_info[0].intr)) @@ -384,7 +384,7 @@ dec_maxine_intr(mask, pc, statusReg, causeReg) printf ("can't handle tc0 interrupt\n"); intrcnt[SLOT0_INTR]++; } - + if (intr & XINE_INTR_TC_1) { if (tc_slot_info[1].intr) (*(tc_slot_info[1].intr)) @@ -393,7 +393,7 @@ dec_maxine_intr(mask, pc, statusReg, causeReg) printf ("can't handle tc1 interrupt\n"); intrcnt[SLOT1_INTR]++; } - + if (intr & XINE_INTR_ISDN) { if (tc_slot_info[XINE_ISDN_SLOT].intr) (*(tc_slot_info[XINE_ISDN_SLOT].intr)) @@ -409,7 +409,7 @@ dec_maxine_intr(mask, pc, statusReg, causeReg) (tc_slot_info[XINE_LANCE_SLOT].sc); else printf ("can't handle lance interrupt\n"); - + intrcnt[LANCE_INTR]++; } diff --git a/sys/arch/pmax/pmax/disksubr.c b/sys/arch/pmax/pmax/disksubr.c index e4b8c021bed6..a6001197e316 100644 --- a/sys/arch/pmax/pmax/disksubr.c +++ b/sys/arch/pmax/pmax/disksubr.c @@ -1,4 +1,4 @@ -/* $NetBSD: disksubr.c,v 1.18 1999/01/29 05:37:46 simonb Exp $ */ +/* $NetBSD: disksubr.c,v 1.19 1999/03/25 01:17:52 simonb Exp $ */ /* * Copyright (c) 1982, 1986, 1988 Regents of the University of California. @@ -178,7 +178,7 @@ compat_label(dev, strat, lp, osdep) DISKUNIT(dev), "abcdefgh"[part], lp->d_partitions[part].p_offset, lp->d_partitions[part].p_size); -#endif +#endif } break; } @@ -300,7 +300,7 @@ dk_establish(dk, dev) return; } -/* +/* * UNTESTED !! * * Determine the size of the transfer, and make sure it is @@ -320,14 +320,14 @@ bounds_check_with_label(bp, lp, wlabel) int sz = (bp->b_bcount + DEV_BSIZE - 1) >> DEV_BSHIFT; /* overwriting disk label ? */ - /* XXX should also protect bootstrap in first 8K */ + /* XXX should also protect bootstrap in first 8K */ if (bp->b_blkno + p->p_offset <= LABELSECTOR + labelsect && (bp->b_flags & B_READ) == 0 && wlabel == 0) { bp->b_error = EROFS; goto bad; } - /* beyond partition? */ + /* beyond partition? */ if (bp->b_blkno < 0 || bp->b_blkno + sz > maxsz) { /* if exactly at end of disk, return an EOF */ if (bp->b_blkno == maxsz) { @@ -341,7 +341,7 @@ bounds_check_with_label(bp, lp, wlabel) goto bad; } bp->b_bcount = sz << DEV_BSHIFT; - } + } /* calculate cylinder for disksort to order transfers with */ bp->b_resid = (bp->b_blkno + p->p_offset) / lp->d_secpercyl; diff --git a/sys/arch/pmax/pmax/kmin.h b/sys/arch/pmax/pmax/kmin.h index c123f7d14c47..0f95b9a5bb0a 100644 --- a/sys/arch/pmax/pmax/kmin.h +++ b/sys/arch/pmax/pmax/kmin.h @@ -1,4 +1,4 @@ -/* $NetBSD: kmin.h,v 1.6 1998/06/22 09:37:41 jonathan Exp $ */ +/* $NetBSD: kmin.h,v 1.7 1999/03/25 01:17:52 simonb Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -39,21 +39,21 @@ * @(#)kmin.h 8.1 (Berkeley) 6/10/93 */ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989 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 + * + * 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 @@ -71,18 +71,18 @@ * Split out the ASIC defns into separate file, which is * in common with MAXine. Added some nitwits defines. * [92/03/02 02:28:27 af] - * + * * Revision 2.2 91/08/24 12:21:08 af * Documented new SCSI registers, which were missing in the 3min prototype. * [91/08/22 11:14:57 af] - * + * * Created, from the DEC specs: * "3MIN System Module Functional Specification" Revision 1.7 * Workstation Systems Engineering, Palo Alto, CA. Sept 14, 1990. * "KN02BA Daughter Card Functional Specification" Revision 1.0 * Workstation Systems Engineering, Palo Alto, CA. Aug 14, 1990. * [91/06/21 af] - * + * */ /* * File: kmin.h diff --git a/sys/arch/pmax/pmax/kn01.h b/sys/arch/pmax/pmax/kn01.h index efd22948c3f6..6c41058d0aa4 100644 --- a/sys/arch/pmax/pmax/kn01.h +++ b/sys/arch/pmax/pmax/kn01.h @@ -1,4 +1,4 @@ -/* $NetBSD: kn01.h,v 1.4 1994/10/26 21:10:27 cgd Exp $ */ +/* $NetBSD: kn01.h,v 1.5 1999/03/25 01:17:52 simonb Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -39,21 +39,21 @@ * @(#)kn01.h 8.1 (Berkeley) 6/10/93 */ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989 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 + * + * 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 @@ -69,18 +69,18 @@ * Log: kn01.h,v * Revision 2.5 91/05/14 17:23:14 mrt * Correcting copyright - * + * * Revision 2.4 91/02/05 17:41:54 mrt * Added author notices * [91/02/04 11:14:12 mrt] - * + * * Changed to use new Mach copyright * [91/02/02 12:12:45 mrt] - * + * * Revision 2.3 90/12/05 23:31:50 af * Cleanups. * [90/12/04 16:38:21 af] - * + * * Created, from the DEC specs: * "DECstation 3100 Desktop Workstation Functional Specification" * Workstation Systems Engineering, Palo Alto, CA. Aug 28, 1990. @@ -185,7 +185,7 @@ #define KN01_CSR_CRSRTST 0x1000 /* ro */ /* Cursor test output */ #define KN01_CSR_PARDIS 0x2000 /* rw */ - /* Disable mem parity chks */ + /* Disable mem parity chks */ #define KN01_CSR_SELFTEST 0x4000 /* rw */ /* Self-test ok pinout */ #define KN01_CSR_MNFMOD 0x8000 /* ro */ diff --git a/sys/arch/pmax/pmax/kn02.h b/sys/arch/pmax/pmax/kn02.h index f9309c99e103..63fc4c79d50f 100644 --- a/sys/arch/pmax/pmax/kn02.h +++ b/sys/arch/pmax/pmax/kn02.h @@ -1,4 +1,4 @@ -/* $NetBSD: kn02.h,v 1.5 1998/08/29 16:24:03 mrg Exp $ */ +/* $NetBSD: kn02.h,v 1.6 1999/03/25 01:17:52 simonb Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -39,21 +39,21 @@ * @(#)kn02.h 8.1 (Berkeley) 6/10/93 */ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989 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 + * + * 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 @@ -69,20 +69,20 @@ * Log: kn02.h,v * Revision 2.5 91/05/14 17:23:30 mrt * Correcting copyright - * + * * Revision 2.4 91/02/05 17:42:03 mrt * Added author notices * [91/02/04 11:14:23 mrt] - * + * * Changed to use new Mach copyright * [91/02/02 12:12:58 mrt] - * + * * Revision 2.3 90/12/05 23:32:04 af - * - * + * + * * Revision 2.1.1.2 90/11/01 02:48:10 af * Reworked a bit, made reentrant. - * + * * Revision 2.1.1.1 90/10/03 11:48:22 af * Created, from the DEC specs: * "DECstation 5000/200 KN02 System Module Functional Specification" diff --git a/sys/arch/pmax/pmax/kn03.h b/sys/arch/pmax/pmax/kn03.h index a4339eb612bd..572189365686 100644 --- a/sys/arch/pmax/pmax/kn03.h +++ b/sys/arch/pmax/pmax/kn03.h @@ -1,4 +1,4 @@ -/* $NetBSD: kn03.h,v 1.6 1998/06/22 09:37:40 jonathan Exp $ */ +/* $NetBSD: kn03.h,v 1.7 1999/03/25 01:17:52 simonb Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -39,21 +39,21 @@ * @(#)kn03.h 8.1 (Berkeley) 6/10/93 */ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989 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 + * + * 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 diff --git a/sys/arch/pmax/pmax/kn230.h b/sys/arch/pmax/pmax/kn230.h index fc41747c0e49..739ed1177904 100644 --- a/sys/arch/pmax/pmax/kn230.h +++ b/sys/arch/pmax/pmax/kn230.h @@ -1,9 +1,9 @@ -/* $NetBSD: kn230.h,v 1.1 1998/04/19 01:27:03 jonathan Exp $ */ +/* $NetBSD: kn230.h,v 1.2 1999/03/25 01:17:52 simonb Exp $ */ /* * Copyright (c) 1997,1998 Jonathan Stone. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -35,7 +35,7 @@ /* * Physical addresses of baseboard devices and registers on the - * the DECstation 5100 motherboard (also known as the kn230). + * the DECstation 5100 motherboard (also known as the kn230). * * The only options on the kn230 are two slots for daughterboards. * Each slot can contain an extra four-port dc708x DZ11 clone chip. @@ -88,7 +88,7 @@ #define KN230_CSR_INTR_DZ0 0x00000100 /* baseboard DZ */ /* - * kn230 LED control register. + * kn230 LED control register. * Writing a 1 bit to any bit turns off the corresponding LED. * low bits are or'ed to control registers which have side effects. * @@ -109,7 +109,7 @@ #define KN230_LED2 0x00000400 /* Turns off led 2. * 0: forces DZ to run at - * 38.4 when 19.2 is selected + * 38.4 when 19.2 is selected * 1: is 19.2 means 19.2. */ @@ -133,7 +133,7 @@ */ #define KN230_SYS_WEAR 0x17000000 /* Write-error address reg */ #define KN230_WEAR_OPTIONMASK 0x00000001 /* 1 if no card present */ -#define KN230_WEAR_OPTION_FALSE KN230_WEAR_OPTIONMASK +#define KN230_WEAR_OPTION_FALSE KN230_WEAR_OPTIONMASK #define KN230_WEAR_OPTION_TRUE 0 #define KN230_WEAR_SECUREMASK 0x00000002 /* "1": system is insecure */ @@ -155,7 +155,7 @@ #define KN230_SYS_PASSWD 0x1f000244 /* password location */ /* - * NVRAM state defintions. + * NVRAM state defintions. * Used under Ultrix for PrestoServe. */ #define KN230_SYS_NVRAM_DIAG 0x1f000300 /* NVRAM diagnostic register */ @@ -182,6 +182,6 @@ /* * To enable the battery, write 0x00 to each nvram control reg. * To disable the battery, write the sequence - * 0x01, 0x01, 0x00, 0x00, 0x01 + * 0x01, 0x01, 0x00, 0x00, 0x01 * to both per-bank control registers (do banks in parallel, not in sequence). */ diff --git a/sys/arch/pmax/pmax/locore_machdep.S b/sys/arch/pmax/pmax/locore_machdep.S index 37670bbfafc1..c9af18e5626c 100644 --- a/sys/arch/pmax/pmax/locore_machdep.S +++ b/sys/arch/pmax/pmax/locore_machdep.S @@ -1,4 +1,4 @@ -/* $NetBSD: locore_machdep.S,v 1.8 1998/09/11 16:46:34 jonathan Exp $ */ +/* $NetBSD: locore_machdep.S,v 1.9 1999/03/25 01:17:53 simonb Exp $ */ /* * Copyright (c) 1992, 1993 @@ -156,7 +156,7 @@ LEAF(dec_mips1_wbflush) nop /* two more cycles to complete */ nop -1: # spin +1: # spin bc3f 1b # until write buffer drained nop # (branch delay slot) @@ -334,7 +334,7 @@ END(cpu_spl5) /* * hardware-level spls for hardware where the interrupt priorites - * DO NOT map onto levels. + * DO NOT map onto levels. * * For now, that means DECstations that use only two distinct CPU * levels, one for TOD clock interrupts, and a second for all other diff --git a/sys/arch/pmax/pmax/machdep.c b/sys/arch/pmax/pmax/machdep.c index aa268e7a872b..3ad7283aa634 100644 --- a/sys/arch/pmax/pmax/machdep.c +++ b/sys/arch/pmax/pmax/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.129 1999/03/24 12:59:15 simonb Exp $ */ +/* $NetBSD: machdep.c,v 1.130 1999/03/25 01:17:53 simonb Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -43,7 +43,7 @@ #include /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.129 1999/03/24 12:59:15 simonb Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.130 1999/03/25 01:17:53 simonb Exp $"); /* from: Utah Hdr: machdep.c 1.63 91/04/24 */ @@ -118,11 +118,11 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.129 1999/03/24 12:59:15 simonb Exp $") /* Motherboard or system-specific initialization vector */ void unimpl_os_init __P((void)); void unimpl_bus_reset __P((void)); -void unimpl_enable_intr +void unimpl_enable_intr __P ((u_int slotno, int (*handler) __P((intr_arg_t sc)), intr_arg_t sc, int onoff)); -int unimpl_intr __P((u_int mask, u_int pc, +int unimpl_intr __P((u_int mask, u_int pc, u_int statusReg, u_int causeReg)); void unimpl_cons_init __P((void)); @@ -144,12 +144,10 @@ struct platform platform = { }; - - /* the following is used externally (sysctl_hw) */ char machine[] = MACHINE; /* from */ char machine_arch[] = MACHINE_ARCH; /* from */ -char cpu_model[40]; +char cpu_model[40]; char *bootinfo = NULL; /* pointer to bootinfo structure */ @@ -173,7 +171,7 @@ int mem_cluster_cnt; void (*tc_enable_interrupt) __P ((u_int slotno, int (*handler) __P((void *sc)), - void *sc, int onoff)); + void *sc, int onoff)); /* @@ -196,7 +194,6 @@ volatile struct chiptime *mcclock_addr; const struct callback *callv; /* pointer to PROM entry points */ - /* * Local functions. */ @@ -204,7 +201,6 @@ extern int atoi __P((const char *cp)); int initcpu __P((void)); - /* initialize bss, etc. from kernel start, before main() is called. */ extern void mach_init __P((int argc, char *argv[], u_int code, @@ -448,7 +444,7 @@ mach_init(argc, argv, code, cv, bim, bip) * Be careful to save and restore the original contents for msgbuf. */ physmem = btoc((vaddr_t)kernend - MIPS_KSEG0_START); - cp = (char *)MIPS_PHYS_TO_KSEG1(physmem << PGSHIFT); + cp = (char *)MIPS_PHYS_TO_KSEG1(physmem << PGSHIFT); while (cp < (char *)physmem_boardmax) { int j; if (badaddr(cp, 4)) @@ -500,7 +496,7 @@ mach_init(argc, argv, code, cv, bim, bip) * virtual address space. */ size = (unsigned)allocsys(0); - v = (caddr_t)pmap_steal_memory(size, NULL, NULL); + v = (caddr_t)pmap_steal_memory(size, NULL, NULL); if ((allocsys(v) - v) != size) panic("mach_init: table size inconsistency"); @@ -743,12 +739,12 @@ prom_halt(howto, bootstr) (*callv->_rex)('b'); } } else if (howto & RB_HALT) { - volatile void (*f) __P((void)) = + volatile void (*f) __P((void)) = (volatile void (*) __P((void))) DEC_PROM_REINIT; (*f)(); /* jump back to prom monitor */ } else { - volatile void (*f) __P((void)) = + volatile void (*f) __P((void)) = (volatile void (*) __P((void)))DEC_PROM_AUTOBOOT; (*f)(); /* jump back to prom monitor and do 'auto' cmd */ } @@ -904,7 +900,7 @@ clkread() /* * Scale from 40ns to microseconds. - * Avoid a kernel FP divide (by 25) using the approximation + * Avoid a kernel FP divide (by 25) using the approximation * 1/25 = 40/1000 =~ 41/ 1024, which is good to 0.0975 % */ usec = cycles + (cycles << 3) + (cycles << 5); @@ -1060,7 +1056,7 @@ atoi(s) if (neg) val = -val; out: - return val; + return val; } /* @@ -1068,7 +1064,7 @@ out: */ void -unimpl_os_init() +unimpl_os_init() { panic("sysconf.init didnt set os_init\n"); } @@ -1086,9 +1082,9 @@ unimpl_enable_intr(slotno, handler, sc, onoff) intr_arg_t sc; int onoff; { - panic("sysconf.init didnt set enable_intr\n"); + panic("sysconf.init didnt set enable_intr\n"); } - + int unimpl_intr (mask, pc, statusreg, causereg) @@ -1097,13 +1093,13 @@ unimpl_intr (mask, pc, statusreg, causereg) u_int statusreg; u_int causereg; { - panic("sysconf.init didnt set intr\n"); + panic("sysconf.init didnt set intr\n"); } void unimpl_cons_init() { - panic("sysconf.init didnt set cons_init\n"); + panic("sysconf.init didnt set cons_init\n"); } void @@ -1111,14 +1107,14 @@ unimpl_device_register(sc, arg) struct device *sc; void *arg; { - panic("sysconf.init didnt set device_register\n"); + panic("sysconf.init didnt set device_register\n"); } const char* unimpl_model_name() { - panic("sysconf.init didnt set model_name\n"); + panic("sysconf.init didnt set model_name\n"); } void @@ -1139,5 +1135,5 @@ unimpl_iointr(arg, arg2) void unimpl_errintr() { - panic("sysconf.init didnt set errintr_name\n"); + panic("sysconf.init didnt set errintr_name\n"); } diff --git a/sys/arch/pmax/pmax/mainbus.c b/sys/arch/pmax/pmax/mainbus.c index 4ccc3b541a72..8c5a3eaec05a 100644 --- a/sys/arch/pmax/pmax/mainbus.c +++ b/sys/arch/pmax/pmax/mainbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.c,v 1.29 1999/03/15 12:03:50 nisimura Exp $ */ +/* $NetBSD: mainbus.c,v 1.30 1999/03/25 01:17:53 simonb Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -6,17 +6,17 @@ * * Author: Chris G. Demetriou * DECstation port: Jonathan Stone - * + * * 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 + * + * 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 @@ -56,7 +56,7 @@ mbmatch(parent, cf, aux) /* * Only one mainbus, but some people are stupid... - */ + */ if (cf->cf_unit > 0) return (0); diff --git a/sys/arch/pmax/pmax/maxine.h b/sys/arch/pmax/pmax/maxine.h index df2ccfd80a9a..08a86c3b1125 100644 --- a/sys/arch/pmax/pmax/maxine.h +++ b/sys/arch/pmax/pmax/maxine.h @@ -1,4 +1,4 @@ -/* $NetBSD: maxine.h,v 1.6 1998/06/22 09:37:41 jonathan Exp $ */ +/* $NetBSD: maxine.h,v 1.7 1999/03/25 01:17:53 simonb Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -39,21 +39,21 @@ * @(#)maxine.h 8.1 (Berkeley) 6/10/93 */ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989 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 + * + * 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 @@ -70,13 +70,13 @@ * Revision 2.3 92/04/01 15:14:52 rpd * Defined pseudo slot for mappable timer. * [92/03/11 02:37:41 af] - * + * * Revision 2.2 92/03/02 18:34:28 rpd * Created, from the DEC specs: * "MAXine System Module Functional Specification" Revision 1.2 * Workstation Systems Engineering, Palo Alto, CA. July 15, 1991. * [92/01/17 af] - * + * */ /* * File: maxine.h diff --git a/sys/arch/pmax/pmax/nameglue.h b/sys/arch/pmax/pmax/nameglue.h index 89fa02ef507f..5252f05a5527 100644 --- a/sys/arch/pmax/pmax/nameglue.h +++ b/sys/arch/pmax/pmax/nameglue.h @@ -1,7 +1,7 @@ -/* $NetBSD: nameglue.h,v 1.4 1997/06/22 07:42:41 jonathan Exp $ */ +/* $NetBSD: nameglue.h,v 1.5 1999/03/25 01:17:53 simonb Exp $ */ /* - * Use macros to glue names for "machine-independent" functions + * Use macros to glue names for "machine-independent" functions * (e.g., from new-config code modelled after DEC Alpha drivers) * to old-style pmax names. * @@ -17,7 +17,7 @@ #define MAGIC_READ \ MachEmptyWriteBuffer() /*XXX*/ /*FIXME*/ -/* +/* * memory barrier */ #define MB() \ diff --git a/sys/arch/pmax/pmax/sysconf.c b/sys/arch/pmax/pmax/sysconf.c index d51ad1f243ed..2b6d4c1ff7d1 100644 --- a/sys/arch/pmax/pmax/sysconf.c +++ b/sys/arch/pmax/pmax/sysconf.c @@ -1,4 +1,4 @@ -/* $NetBSD: sysconf.c,v 1.3 1999/03/15 11:41:25 nisimura Exp $ */ +/* $NetBSD: sysconf.c,v 1.4 1999/03/25 01:17:53 simonb Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -131,7 +131,7 @@ platform_not_configured() systype); printf("Please build a kernel with \"options %s\" and reboot.\n", sysinit[systype].option); - printf("\n"); + printf("\n"); panic("platform not configured\n"); } diff --git a/sys/arch/pmax/pmax/turbochannel.h b/sys/arch/pmax/pmax/turbochannel.h index 0f95982607c7..a7b1bb51e03e 100644 --- a/sys/arch/pmax/pmax/turbochannel.h +++ b/sys/arch/pmax/pmax/turbochannel.h @@ -1,4 +1,4 @@ -/* $NetBSD: turbochannel.h,v 1.8 1996/05/19 01:44:45 jonathan Exp $ */ +/* $NetBSD: turbochannel.h,v 1.9 1999/03/25 01:17:53 simonb Exp $ */ /*- @@ -40,21 +40,21 @@ * @(#)turbochannel.h 8.1 (Berkeley) 6/10/93 */ -/* +/* * Mach Operating System * Copyright (c) 1991,1990,1989 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 + * + * 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 @@ -137,5 +137,5 @@ extern tc_option_t tc_slot_info[]; extern void (*tc_slot_hand_fill) __P((tc_option_t *)); extern void (*tc_enable_interrupt) __P ((u_int slotno, int (*handler) __P ((void *)), - void *sc, int onoff)); + void *sc, int onoff)); #endif /* _KERNEL */