diff --git a/sys/arch/sparc/sparc/amd7930intr.s b/sys/arch/sparc/sparc/amd7930intr.s index a17aeb527430..001695ab6cf0 100644 --- a/sys/arch/sparc/sparc/amd7930intr.s +++ b/sys/arch/sparc/sparc/amd7930intr.s @@ -92,14 +92,14 @@ _amd7930_trap: cmp R_data, R_end bgu 1f nop - + ldub [R_amd + AMD_BBRB], %l6 ! *d = amd->bbrb stb %l6, [ R_data ] cmp R_data, R_end inc R_data ! au->au_rdata++ bne 1f ! if (d == e) st R_data, [%l7 + AU_RDATA] - + sethi %hi(INTREG_ADDR), %l5 ldub [%l5 + %lo(INTREG_ADDR)], %l6 or %l6, IE_L4, %l6 @@ -115,7 +115,7 @@ _amd7930_trap: cmp R_data, R_end bgu 2f nop - + ldub [ R_data ], %l6 ! amd->bbtb = *d stb %l6, [ R_amd + AMD_BBTB ] @@ -123,7 +123,7 @@ _amd7930_trap: inc R_data ! au->au_pdata++ bne 2f ! if (d == e) st R_data, [%l7 + AU_PDATA] - + sethi %hi(INTREG_ADDR), %l5 ldub [%l5 + %lo(INTREG_ADDR)], %l6 or %l6, IE_L4, %l6 diff --git a/sys/arch/sparc/sparc/bsd_fdintr.s b/sys/arch/sparc/sparc/bsd_fdintr.s index 9bfe00337380..e0e52a690e85 100644 --- a/sys/arch/sparc/sparc/bsd_fdintr.s +++ b/sys/arch/sparc/sparc/bsd_fdintr.s @@ -1,4 +1,4 @@ -/* $NetBSD: bsd_fdintr.s,v 1.7 1996/02/02 20:05:35 mycroft Exp $ */ +/* $NetBSD: bsd_fdintr.s,v 1.8 1996/03/31 23:45:00 pk Exp $ */ /* * Copyright (c) 1995 Paul Kranenburg @@ -100,7 +100,7 @@ _fdchwintr: !!ld [R_fdc + FDC_REG_DOR], R_dor ! get chip DOR reg addr ! find out what we are supposed to do - ld [R_fdc + FDC_ISTATE], %l7 ! examine flags + ld [R_fdc + FDC_ISTATE], %l7 ! examine flags cmp %l7, ISTATE_SENSEI be sensei nop diff --git a/sys/arch/sparc/sparc/db_disasm.c b/sys/arch/sparc/sparc/db_disasm.c index f6e118c23575..901597194d32 100644 --- a/sys/arch/sparc/sparc/db_disasm.c +++ b/sys/arch/sparc/sparc/db_disasm.c @@ -1,4 +1,4 @@ -/* $NetBSD: db_disasm.c,v 1.8 1996/03/30 21:13:02 christos Exp $ */ +/* $NetBSD: db_disasm.c,v 1.9 1996/03/31 23:45:07 pk Exp $ */ /* * Copyright (c) 1994 David S. Miller, davem@nadzieja.rutgers.edu @@ -33,12 +33,12 @@ #include #include +#include #include #include #include #include #include -#include /* * All Sparc instructions are 32-bits, with the one exception being @@ -46,8 +46,8 @@ * two instructions... * * There are 5 different fields that can be used to identify which - * operation is encoded into a particular 32-bit insn. There are 3 - * formats for instuctions, which one being used is determined by + * operation is encoded into a particular 32-bit insn. There are 3 + * formats for instuctions, which one being used is determined by * bits 30-31 of the insn. Here are the bit fields and their names: * * 1100 0000 0000 0000 0000 0000 0000 0000 op field, determines format @@ -64,14 +64,13 @@ /* various other fields */ -#define A(x) (((x) & 0x1) << 29) -#define P(x) (((x) & 0x1) << 19) -#define X(x) (((x) & 0x1) << 12) +#define A(x) (((x) & 0x1) << 29) +#define P(x) (((x) & 0x1) << 19) +#define X(x) (((x) & 0x1) << 12) #define FCN(x) (((x) & 0x1f) << 25) -#define OPF(x) (((x) & 0x1ff) << 5) #define RCOND2(x) (((x) & 0x7) << 25) -#define RCOND34(x) (((x) & 0x7) << 10) -#define COND(x) (((x) & 0xf) << 25) +#define RCOND34(x) (((x) & 0x7) << 10) +#define COND(x) (((x) & 0xf) << 25) #define SW_TRAP(x) ((x) & 0x7f) #define SHCNT32(x) ((x) & 0x1f) #define SHCNT64(x) ((x) & 0x3f) @@ -83,7 +82,7 @@ /* Register Operand Fields */ #define RS1(x) (((x) & 0x1f) << 14) -#define RS2(x) ((x) & 0x1f) +#define RS2(x) ((x) & 0x1f) #define RD(x) (((x) & 0x1f) << 25) /* FORMAT macros used in sparc_i table to decode each opcode */ diff --git a/sys/arch/sparc/sparc/db_trace.c b/sys/arch/sparc/sparc/db_trace.c index 172eae9ffef7..e9114952d048 100644 --- a/sys/arch/sparc/sparc/db_trace.c +++ b/sys/arch/sparc/sparc/db_trace.c @@ -1,27 +1,27 @@ -/* $NetBSD: db_trace.c,v 1.6 1996/03/14 21:09:06 christos Exp $ */ +/* $NetBSD: db_trace.c,v 1.7 1996/03/31 23:45:14 pk Exp $ */ -/* +/* * Mach Operating System * Copyright (c) 1991,1990 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 + * + * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS * 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 the * rights to redistribute these changes. */ @@ -34,7 +34,7 @@ #include #include #include - + #define INKERNEL(va) (((vm_offset_t)(va)) >= USRSTACK) void diff --git a/sys/arch/sparc/sparc/disksubr.c b/sys/arch/sparc/sparc/disksubr.c index eb938b9e4fc0..55913d87b795 100644 --- a/sys/arch/sparc/sparc/disksubr.c +++ b/sys/arch/sparc/sparc/disksubr.c @@ -1,4 +1,4 @@ -/* $NetBSD: disksubr.c,v 1.12 1996/03/14 21:09:07 christos Exp $ */ +/* $NetBSD: disksubr.c,v 1.13 1996/03/31 23:45:20 pk Exp $ */ /* * Copyright (c) 1994, 1995 Gordon W. Ross @@ -60,7 +60,7 @@ static int disklabel_bsd_to_sun __P((struct disklabel *, char *)); extern struct device *bootdv; -/* +/* * find the boot device (if it was a disk). we must check to see if * unit info in saved bootpath structure matches unit info in our softc. * note that knowing the device name (e.g. "xd0") is not useful... we @@ -83,14 +83,14 @@ dk_establish(dk, dev) /* * scsi: sd,cd */ - if (strncmp("sd", dev->dv_xname, 2) == 0 || + if (strncmp("sd", dev->dv_xname, 2) == 0 || strncmp("cd", dev->dv_xname, 2) == 0) { sbsc = (struct scsibus_softc *)dev->dv_parent; targ = lun = 0; #if defined(SUN4) if (cputyp == CPU_SUN4) { - if (dev->dv_xname[0] == 's' && bp->val[0] == 0) { + if (dev->dv_xname[0] == 's' && bp->val[0] == 0) { /* disk unit 0 is magic */ if (sbsc->sc_link[0][0] == NULL) { targ = 3; /* remap to 3 */ @@ -125,10 +125,10 @@ dk_establish(dk, dev) return -1; } -/* +/* * Attempt to read a disk label from a device * using the indicated stategy routine. - * The label must be partly set up before this: + * The label must be partly set up before this: * secpercyl, secsize and anything required for a block i/o read * operation in the driver's strategy/start routines * must be filled in before calling us. @@ -139,7 +139,7 @@ dk_establish(dk, dev) */ char * readdisklabel(dev, strat, lp, clp) - dev_t dev; + dev_t dev; void (*strat) __P((struct buf *)); struct disklabel *lp; struct cpu_disklabel *clp; @@ -166,7 +166,7 @@ readdisklabel(dev, strat, lp, clp) bp->b_cylin = 0; bp->b_bcount = lp->d_secsize; bp->b_flags = B_BUSY | B_READ; - (*strat)(bp); + (*strat)(bp); /* if successful, locate disk label within block and validate */ error = biowait(bp); @@ -216,7 +216,7 @@ setdisklabel(olp, nlp, openmask, clp) return(EINVAL); /* special case to allow disklabel to be invalidated */ - if (nlp->d_magic == 0xffffffff) { + if (nlp->d_magic == 0xffffffff) { *olp = *nlp; return (0); } @@ -236,8 +236,8 @@ setdisklabel(olp, nlp, openmask, clp) return (EBUSY); } - *olp = *nlp; - return (0); + *olp = *nlp; + return (0); } /* @@ -283,7 +283,7 @@ writedisklabel(dev, strat, lp, clp) return (error); } -/* +/* * Determine the size of the transfer, and make sure it is * within the boundaries of the partition. Adjust transfer * if needed, and signal errors or early completion. @@ -302,14 +302,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) { @@ -323,7 +323,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/sparc/sparc/in_cksum.c b/sys/arch/sparc/sparc/in_cksum.c index a31a4027754f..38554d395691 100644 --- a/sys/arch/sparc/sparc/in_cksum.c +++ b/sys/arch/sparc/sparc/in_cksum.c @@ -1,4 +1,4 @@ -/* $NetBSD: in_cksum.c,v 1.4 1996/03/14 21:09:11 christos Exp $ */ +/* $NetBSD: in_cksum.c,v 1.5 1996/03/31 23:45:24 pk Exp $ */ /* * Copyright (c) 1995 Matthew Green. @@ -119,7 +119,7 @@ in_cksum(m, len) if (len < mlen) mlen = len; len -= mlen; - + /* * Ensure that we're aligned on a word boundary here so * that we can do 32 bit operations below. diff --git a/sys/arch/sparc/sparc/intersil7170.h b/sys/arch/sparc/sparc/intersil7170.h index 9b2be6b35a92..db29d69b1c37 100644 --- a/sys/arch/sparc/sparc/intersil7170.h +++ b/sys/arch/sparc/sparc/intersil7170.h @@ -1,4 +1,4 @@ -/* $NetBSD: intersil7170.h,v 1.1 1994/12/16 22:17:00 deraadt Exp $ */ +/* $NetBSD: intersil7170.h,v 1.2 1996/03/31 23:45:28 pk Exp $ */ /* * Copyright (c) 1993 Adam Glass @@ -34,7 +34,7 @@ /* * Driver support for the intersil7170 used in sun[34]s to provide * real time clock and time-of-day support. - * + * * Derived from: datasheet "ICM7170 a uP-Compatible Real-Time Clock" * document #301680-005, Dec 85 */ @@ -58,7 +58,7 @@ struct intersil7170 { }; /* bit assignments for command register, p. 6 of 10, write-only */ -#define INTERSIL_CMD_FREQ_32K 0x0 +#define INTERSIL_CMD_FREQ_32K 0x0 #define INTERSIL_CMD_FREQ_1M 0x1 #define INTERSIL_CMD_FREQ_2M 0x2 #define INTERSIL_CMD_FREQ_4M 0x3 diff --git a/sys/arch/sparc/sparc/openprom.c b/sys/arch/sparc/sparc/openprom.c index 7f3e025408fc..15c9ac1293f6 100644 --- a/sys/arch/sparc/sparc/openprom.c +++ b/sys/arch/sparc/sparc/openprom.c @@ -1,4 +1,4 @@ -/* $NetBSD: openprom.c,v 1.7 1996/03/30 21:11:33 christos Exp $ */ +/* $NetBSD: openprom.c,v 1.8 1996/03/31 23:45:34 pk Exp $ */ /* * Copyright (c) 1992, 1993 @@ -73,7 +73,7 @@ openpromopen(dev, flags, mode, p) #if defined(SUN4) if (cputyp==CPU_SUN4) return (ENODEV); -#endif +#endif return (0); } diff --git a/sys/arch/sparc/sparc/svr4_machdep.c b/sys/arch/sparc/sparc/svr4_machdep.c index d5ffb3c41627..cc8ec79560e1 100644 --- a/sys/arch/sparc/sparc/svr4_machdep.c +++ b/sys/arch/sparc/sparc/svr4_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_machdep.c,v 1.16 1996/03/26 19:09:31 christos Exp $ */ +/* $NetBSD: svr4_machdep.c,v 1.17 1996/03/31 23:45:39 pk Exp $ */ /* * Copyright (c) 1994 Christos Zoulas @@ -492,7 +492,7 @@ svr4_sendsig(catcher, sig, mask, code) */ fp = (struct svr4_sigframe *) ((int) (fp - 1) & ~7); - /* + /* * Build the argument list for the signal handler. */ svr4_getsiginfo(&frame.sf_si, sig, code, (caddr_t) tf->tf_pc); diff --git a/sys/arch/sparc/sparc/vm_machdep.c b/sys/arch/sparc/sparc/vm_machdep.c index 13c642358df8..639a6bacc0cf 100644 --- a/sys/arch/sparc/sparc/vm_machdep.c +++ b/sys/arch/sparc/sparc/vm_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: vm_machdep.c,v 1.23 1996/03/15 00:00:39 christos Exp $ */ +/* $NetBSD: vm_machdep.c,v 1.24 1996/03/31 23:45:46 pk Exp $ */ /* * Copyright (c) 1992, 1993 @@ -359,7 +359,8 @@ cpu_fork(p1, p2) /* * Setup (kernel) stack frame that will by-pass the child - * out of the kernel. + * out of the kernel. (The trap frame invariably resides at + * the tippity-top of the u. area.) */ tf2 = p2->p_md.md_tf = (struct trapframe *) ((int)npcb + USPACE - sizeof(*tf2));