Module Name: src
Committed By: tsutsui
Date: Tue Jan 22 15:48:40 UTC 2013
Modified Files:
src/sys/arch/luna68k/stand/boot: Makefile autoconf.c disklabel.c
if_le.c locore.S omron_disklabel.h parse.c prf.c samachdep.h sc.c
scsireg.h sd.c
Log Message:
Whitespace cleanup.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/luna68k/stand/boot/Makefile \
src/sys/arch/luna68k/stand/boot/locore.S \
src/sys/arch/luna68k/stand/boot/samachdep.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/luna68k/stand/boot/autoconf.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/luna68k/stand/boot/disklabel.c \
src/sys/arch/luna68k/stand/boot/if_le.c \
src/sys/arch/luna68k/stand/boot/omron_disklabel.h \
src/sys/arch/luna68k/stand/boot/prf.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/luna68k/stand/boot/parse.c \
src/sys/arch/luna68k/stand/boot/sc.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/luna68k/stand/boot/scsireg.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/luna68k/stand/boot/sd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/luna68k/stand/boot/Makefile
diff -u src/sys/arch/luna68k/stand/boot/Makefile:1.8 src/sys/arch/luna68k/stand/boot/Makefile:1.9
--- src/sys/arch/luna68k/stand/boot/Makefile:1.8 Mon Jan 21 11:58:12 2013
+++ src/sys/arch/luna68k/stand/boot/Makefile Tue Jan 22 15:48:40 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2013/01/21 11:58:12 tsutsui Exp $
+# $NetBSD: Makefile,v 1.9 2013/01/22 15:48:40 tsutsui Exp $
# @(#)Makefile 8.2 (Berkeley) 8/15/93
NOMAN= # defined
@@ -37,7 +37,7 @@ SRCS+= trap.c
SRCS+= devopen.c
SRCS+= conf.c
SRCS+= machdep.c
-SRCS+= getline.c parse.c
+SRCS+= getline.c parse.c
SRCS+= boot.c
SRCS+= cons.c prf.c awaitkey.c
SRCS+= romcons.c
Index: src/sys/arch/luna68k/stand/boot/locore.S
diff -u src/sys/arch/luna68k/stand/boot/locore.S:1.8 src/sys/arch/luna68k/stand/boot/locore.S:1.9
--- src/sys/arch/luna68k/stand/boot/locore.S:1.8 Mon Jan 21 11:58:12 2013
+++ src/sys/arch/luna68k/stand/boot/locore.S Tue Jan 22 15:48:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.8 2013/01/21 11:58:12 tsutsui Exp $ */
+/* $NetBSD: locore.S,v 1.9 2013/01/22 15:48:40 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -287,7 +287,7 @@ GLOBAL(_rtt)
/*
* Trap/interrupt vector routines
- */
+ */
ENTRY_NOPROFILE(buserr)
tstl _C_LABEL(nofault) | device probe?
Index: src/sys/arch/luna68k/stand/boot/samachdep.h
diff -u src/sys/arch/luna68k/stand/boot/samachdep.h:1.8 src/sys/arch/luna68k/stand/boot/samachdep.h:1.9
--- src/sys/arch/luna68k/stand/boot/samachdep.h:1.8 Mon Jan 21 11:58:12 2013
+++ src/sys/arch/luna68k/stand/boot/samachdep.h Tue Jan 22 15:48:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: samachdep.h,v 1.8 2013/01/21 11:58:12 tsutsui Exp $ */
+/* $NetBSD: samachdep.h,v 1.9 2013/01/22 15:48:40 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1990, 1993
@@ -127,7 +127,7 @@ uint8_t *lance_eaddr(void *);
bool lance_init(void *);
int lance_get(void *, void *, size_t);
bool lance_put(void *, void *, size_t);
-bool lance_end(void *);
+bool lance_end(void *);
int lance_intr(void);
/* locore.S */
Index: src/sys/arch/luna68k/stand/boot/autoconf.c
diff -u src/sys/arch/luna68k/stand/boot/autoconf.c:1.6 src/sys/arch/luna68k/stand/boot/autoconf.c:1.7
--- src/sys/arch/luna68k/stand/boot/autoconf.c:1.6 Mon Jan 14 12:28:11 2013
+++ src/sys/arch/luna68k/stand/boot/autoconf.c Tue Jan 22 15:48:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.6 2013/01/14 12:28:11 tsutsui Exp $ */
+/* $NetBSD: autoconf.c,v 1.7 2013/01/22 15:48:40 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -70,7 +70,7 @@
* @(#)autoconf.c 8.1 (Berkeley) 6/10/93
*/
-/*
+/*
* autoconf.c -- Determine mass storage and memory configuration for a machine.
* by A.Fujita, NOV-30-1991
*
Index: src/sys/arch/luna68k/stand/boot/disklabel.c
diff -u src/sys/arch/luna68k/stand/boot/disklabel.c:1.2 src/sys/arch/luna68k/stand/boot/disklabel.c:1.3
--- src/sys/arch/luna68k/stand/boot/disklabel.c:1.2 Thu Jan 10 16:20:11 2013
+++ src/sys/arch/luna68k/stand/boot/disklabel.c Tue Jan 22 15:48:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.c,v 1.2 2013/01/10 16:20:11 tsutsui Exp $ */
+/* $NetBSD: disklabel.c,v 1.3 2013/01/22 15:48:40 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -391,7 +391,7 @@ display(struct disklabel *lp)
else
cnputc(' ');
printf("- %d",
- (pp->p_offset +
+ (pp->p_offset +
pp->p_size + lp->d_secpercyl - 1) /
lp->d_secpercyl - 1);
if (pp->p_size % lp->d_secpercyl)
Index: src/sys/arch/luna68k/stand/boot/if_le.c
diff -u src/sys/arch/luna68k/stand/boot/if_le.c:1.2 src/sys/arch/luna68k/stand/boot/if_le.c:1.3
--- src/sys/arch/luna68k/stand/boot/if_le.c:1.2 Sun Jan 20 13:35:43 2013
+++ src/sys/arch/luna68k/stand/boot/if_le.c Tue Jan 22 15:48:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_le.c,v 1.2 2013/01/20 13:35:43 tsutsui Exp $ */
+/* $NetBSD: if_le.c,v 1.3 2013/01/22 15:48:40 tsutsui Exp $ */
/*
* Copyright (c) 2013 Izumi Tsutsui. All rights reserved.
@@ -216,13 +216,13 @@ le_put(struct iodesc *desc, void *pkt, s
void *cookie = dif->dif_private;
#ifdef DEBUG
struct ether_header *eh;
-
+
eh = pkt;
printf("dst: %s\n", ether_sprintf(eh->ether_dhost));
printf("src: %s\n", ether_sprintf(eh->ether_shost));
printf("type: 0x%x\n", eh->ether_type & 0xffff);
#endif
-
+
return lance_put(cookie, pkt, len) ? len : -1;
}
@@ -255,7 +255,7 @@ myetheraddr(uint8_t *ether)
u = (u < 'A') ? u & 0xf : u - 'A' + 10;
l = ea[1];
l = (l < 'A') ? l & 0xf : l - 'A' + 10;
-
+
ether[i] = l | (u << 4);
ea += 2;
}
Index: src/sys/arch/luna68k/stand/boot/omron_disklabel.h
diff -u src/sys/arch/luna68k/stand/boot/omron_disklabel.h:1.2 src/sys/arch/luna68k/stand/boot/omron_disklabel.h:1.3
--- src/sys/arch/luna68k/stand/boot/omron_disklabel.h:1.2 Thu Jan 10 16:20:11 2013
+++ src/sys/arch/luna68k/stand/boot/omron_disklabel.h Tue Jan 22 15:48:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: omron_disklabel.h,v 1.2 2013/01/10 16:20:11 tsutsui Exp $ */
+/* $NetBSD: omron_disklabel.h,v 1.3 2013/01/22 15:48:40 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -75,7 +75,7 @@
#define DKL_MAGIC 0xDABE /* Disk label Magic number */
-#define NLPART 8 /* # of logical partition */
+#define NLPART 8 /* # of logical partition */
struct scd_dk_label {
char dkl_asciilabel[128]; /* for compatibility */
Index: src/sys/arch/luna68k/stand/boot/prf.c
diff -u src/sys/arch/luna68k/stand/boot/prf.c:1.2 src/sys/arch/luna68k/stand/boot/prf.c:1.3
--- src/sys/arch/luna68k/stand/boot/prf.c:1.2 Mon Jan 21 11:58:12 2013
+++ src/sys/arch/luna68k/stand/boot/prf.c Tue Jan 22 15:48:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: prf.c,v 1.2 2013/01/21 11:58:12 tsutsui Exp $ */
+/* $NetBSD: prf.c,v 1.3 2013/01/22 15:48:40 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -56,8 +56,8 @@ tgetchar(void)
int c;
if ((c = cngetc()) == 0)
- return 0;
-
+ return 0;
+
if (c == '\r')
c = '\n';
else if (c == ('c'&037)) {
Index: src/sys/arch/luna68k/stand/boot/parse.c
diff -u src/sys/arch/luna68k/stand/boot/parse.c:1.3 src/sys/arch/luna68k/stand/boot/parse.c:1.4
--- src/sys/arch/luna68k/stand/boot/parse.c:1.3 Mon Jan 21 11:58:12 2013
+++ src/sys/arch/luna68k/stand/boot/parse.c Tue Jan 22 15:48:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.3 2013/01/21 11:58:12 tsutsui Exp $ */
+/* $NetBSD: parse.c,v 1.4 2013/01/22 15:48:40 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -152,7 +152,7 @@ struct command_entry entries[] = {
};
-int
+int
parse(int argc, char *argv[])
{
int i, status = ST_NOTFOUND;
Index: src/sys/arch/luna68k/stand/boot/sc.c
diff -u src/sys/arch/luna68k/stand/boot/sc.c:1.3 src/sys/arch/luna68k/stand/boot/sc.c:1.4
--- src/sys/arch/luna68k/stand/boot/sc.c:1.3 Mon Jan 14 01:37:57 2013
+++ src/sys/arch/luna68k/stand/boot/sc.c Tue Jan 22 15:48:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sc.c,v 1.3 2013/01/14 01:37:57 tsutsui Exp $ */
+/* $NetBSD: sc.c,v 1.4 2013/01/22 15:48:40 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -569,13 +569,13 @@ scintr(void)
}
hs->sc_target = i;
*(hs->sc_lock) = SC_IN_PROGRESS;
- } else
+ } else
goto abort;
} else if (ints & INTS_DISCON) {
if ((hs->sc_msg[0] == MSG_CMD_COMPLETE) || (hs->sc_msg[0] == MSG_DISCONNECT)) {
hs->sc_phase = BUS_FREE_PHASE;
hs->sc_target = SCSI_ID;
- if (hs->sc_msg[0] == MSG_CMD_COMPLETE)
+ if (hs->sc_msg[0] == MSG_CMD_COMPLETE)
/* SCSI IO complete */
*(hs->sc_lock) = SC_IO_COMPLETE;
else
Index: src/sys/arch/luna68k/stand/boot/scsireg.h
diff -u src/sys/arch/luna68k/stand/boot/scsireg.h:1.1 src/sys/arch/luna68k/stand/boot/scsireg.h:1.2
--- src/sys/arch/luna68k/stand/boot/scsireg.h:1.1 Sat Jan 5 17:44:24 2013
+++ src/sys/arch/luna68k/stand/boot/scsireg.h Tue Jan 22 15:48:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: scsireg.h,v 1.1 2013/01/05 17:44:24 tsutsui Exp $ */
+/* $NetBSD: scsireg.h,v 1.2 2013/01/22 15:48:40 tsutsui Exp $ */
/*
* Copyright (c) 1990, 1992, 1993
@@ -286,7 +286,7 @@ struct scsi_modesel_hdr {
u_int number_blocks :24;
u_int rsvd3 : 8;
u_int block_length :24;
-};
+};
struct scsi_modesense_hdr {
u_char len;
@@ -298,14 +298,14 @@ struct scsi_modesense_hdr {
u_int number_blocks :24;
u_int rsvd2 : 8;
u_int block_length :24;
-};
+};
/*
* Mode Select / Mode sense "pages"
*/
/*
- * Page One - Error Recovery Parameters
+ * Page One - Error Recovery Parameters
*/
struct scsi_err_recovery {
u_char page_savable : 1; /* save parameters */
@@ -373,7 +373,7 @@ struct scsi_format {
};
/*
- * Page Four - Rigid Disk Drive Geometry Parameters
+ * Page Four - Rigid Disk Drive Geometry Parameters
*/
struct scsi_geometry {
u_char page_savable : 1; /* save parameters */
Index: src/sys/arch/luna68k/stand/boot/sd.c
diff -u src/sys/arch/luna68k/stand/boot/sd.c:1.4 src/sys/arch/luna68k/stand/boot/sd.c:1.5
--- src/sys/arch/luna68k/stand/boot/sd.c:1.4 Mon Jan 21 13:21:04 2013
+++ src/sys/arch/luna68k/stand/boot/sd.c Tue Jan 22 15:48:40 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.4 2013/01/21 13:21:04 tsutsui Exp $ */
+/* $NetBSD: sd.c,v 1.5 2013/01/22 15:48:40 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -104,7 +104,7 @@ struct sd_devdata {
int unit; /* drive number */
int part; /* partition */
};
-
+
static int sdinit(void *);
static int sdident(struct sd_softc *, struct hp_device *);
