 @@ -1,14 +1,14 @@
-#	$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
 .include <bsd.own.mk>
 .include <bsd.sys.mk>
 S= ${.CURDIR}/../../../..
 LIBSADIR=	${S}/lib/libsa
 CPPFLAGS+=	-nostdinc -D_STANDALONE
 CPPFLAGS+=	-I${.CURDIR} -I${.OBJDIR} -I${S} -I${S}/arch
 @@ -27,27 +27,27 @@ CFLAGS+=	-Wall -Werror
 CFLAGS+=	-Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith
 CFLAGS+=	-Wno-pointer-sign
 TEXTADDR=	700000
 LDSCRIPT=	${.CURDIR}/boot.ldscript
 LINKFORMAT=	-static -N -Ttext ${TEXTADDR} -T ${LDSCRIPT}
 SRCS=	locore.S
 SRCS+=	init_main.c autoconf.c ioconf.c
 SRCS+=	trap.c
 SRCS+=	devopen.c
 SRCS+=	conf.c
 SRCS+=	machdep.c
 SRCS+=	getline.c parse.c
 SRCS+=	boot.c
 SRCS+=	cons.c prf.c awaitkey.c
 SRCS+=	romcons.c
 SRCS+=	sio.c
 SRCS+=	bmc.c bmd.c screen.c font.c kbd.c
 SRCS+=	scsi.c sc.c sd.c
 #SRCS+=	st.c tape.c
 SRCS+=	disklabel.c
 #SRCS+=	fsdump.c
 SRCS+=	ufs_disksubr.c
 SRCS+=	ls.c
 # netboot support

 @@ -1,14 +1,14 @@
-/*	$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.
+ *
  * This code is derived from software contributed to Berkeley by
  * OMRON Corporation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -277,27 +277,27 @@ Lstart0:
 	ROM_VBR = 0
 ENTRY_NOPROFILE(exit)
 GLOBAL(_rtt)
 	movw	#PSL_HIGHIPL,%sr	| no interrupts
 	movl	#ROM_VBR,%a0
 	movec	%a0,%vbr
 	movl	#_ASM_LABEL(gotoROM),%a0
 	movl	%a0@,%a1
 	jmp	%a1@
 /*
  * Trap/interrupt vector routines
  */
 ENTRY_NOPROFILE(buserr)
 	tstl	_C_LABEL(nofault)	| device probe?
 	jeq	_C_LABEL(addrerr)	| no, handle as usual
 	movl	_C_LABEL(nofault),%sp@-	| yes,
 	jbsr	_C_LABEL(longjmp)	|  longjmp(nofault)
 ENTRY_NOPROFILE(addrerr)
 	clrw	%sp@-			| pad SR to longword
 	moveml	#0xFFFF,%sp@-		| save user registers
 	movl	%usp,%a0		| save the user SP
 	movl	%a0,%sp@(60)		|   in the savearea
 	lea	%sp@(64),%a1		| grab base of HW berr frame
 	movw	%a1@(12),%d0		| grab SSW for fault processing

 @@ -1,14 +1,14 @@
-/*	$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
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -117,27 +117,27 @@ extern int hz;
 extern int nplane;
 extern int machtype;
 /* kbd.c */
 int kbd_decode(u_char);
 /* lance.c */
 void *lance_attach(int, void *, void *, uint8_t *);
 void *lance_cookie(int);
 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 *);
 int lance_intr(void);
 /* locore.S */
 extern	u_int bootdev;
 extern int dipsw1, dipsw2;
 extern int cputype;
 extern volatile uint32_t tick;
 int setjmp(label_t *);
 int splhigh(void);
 void splx(int);
 int getsfc(void);
 int getdfc(void);
 int spl0(void);

 @@ -1,14 +1,14 @@
-/*	$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.
+ *
  * This code is derived from software contributed to Berkeley by
  * OMRON Corporation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -60,27 +60,27 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY 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.
+ *
  *	@(#)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
+ *
  * Modified by A.Fujita, FEB-04-1992
  */
 #include <sys/param.h>
 #include <sys/dkstat.h>
 #include <machine/cpu.h>
 #include <lib/libkern/libkern.h>
 #include <luna68k/stand/boot/samachdep.h>
 #include <luna68k/stand/boot/device.h>

 @@ -1,14 +1,14 @@
-/*	$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.
+ *
  * This code is derived from software contributed to Berkeley by
  * OMRON Corporation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -381,22 +381,22 @@ display(struct disklabel *lp)
 				break;
 			default:
 				printf("%s", "");
 				break;
+			}
 			printf("\t# (Cyl. %d",
 			    pp->p_offset / lp->d_secpercyl);
 			if (pp->p_offset % lp->d_secpercyl)
 			    cnputc('*');
 			else
 			    cnputc(' ');
 			printf("- %d",
 			    (pp->p_offset +
 			    pp->p_size + lp->d_secpercyl - 1) /
 			    lp->d_secpercyl - 1);
 			if (pp->p_size % lp->d_secpercyl)
 			    cnputc('*');
 			printf(")\n");
+		}
+	}
+}

 @@ -1,14 +1,14 @@
-/* $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.
  * Copyright (c) 2003 Tetsuya Isaki. All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -206,33 +206,33 @@ le_get(struct iodesc *desc, void *pkt, s
+	}
 	return len;
+}
 static int
 le_put(struct iodesc *desc, void *pkt, size_t len)
+{
 	struct netif *nif = desc->io_netif;
 	struct netif_dif *dif = &nif->nif_driver->netif_ifs[nif->nif_unit];
 	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;
+}
 static void
 le_end(struct netif *nif)
+{
 	struct netif_dif *dif = &nif->nif_driver->netif_ifs[nif->nif_unit];
 	void *cookie = dif->dif_private;
 #ifdef DEBUG
 	printf("%s\n", __func__);
 #endif
 	lance_end(cookie);
 @@ -245,27 +245,27 @@ myetheraddr(uint8_t *ether)
 	uint8_t *ea;
 	volatile struct { uint32_t ctl; } *ds1220;
 	switch (machtype) {
 	case LUNA_I:
 		ea = (uint8_t *)0x4101FFE0;
 		for (i = 0; i < ETHER_ADDR_LEN; i++) {
 			int u, l;
 			u = ea[0];
 			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;
+		}
 		break;
 	case LUNA_II:
 		ds1220 = (void *)0xF1000004;
 		loc = 12;
 		for (i = 0; i < ETHER_ADDR_LEN; i++) {
 			unsigned int u, l, hex;
 			ds1220->ctl = (loc) << 16;
 			u = 0xf0 & (ds1220->ctl >> 12);
 			ds1220->ctl = (loc + 1) << 16;

 @@ -1,14 +1,14 @@
-/*	$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.
+ *
  * This code is derived from software contributed to Berkeley by
  * OMRON Corporation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -65,27 +65,27 @@
  * HOWEVER CAUSED AND ON ANY 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.
+ *
  *	@(#)omron_disklabel.h	8.1 (Berkeley) 6/10/93
  */
 /* omron_dislabel.h from UniOS-B */
 /*    by A.Fujita, JAN-30-1992   */
 #define DKL_MAGIC	0xDABE 			/* Disk label Magic number */
 #define NLPART		8			/* # of logical partition */
 struct scd_dk_label {
 	char	dkl_asciilabel[128];		/* for compatibility */
 	char	dkl_pad[512-(128+8*8+11*2+4)];
 	uint16_t	dkl_badchk;		/* checksum of bad track */
 	uint32_t	dkl_maxblk;		/* # of total logical block */
 	uint16_t	dkl_dtype;		/* disk drive type */
 	uint16_t	dkl_ndisk;		/* # of disk drives */
 	uint16_t	dkl_ncyl;		/* # of data cylinders */
 	uint16_t	dkl_acyl;		/* # of alternate cylinders */
 	uint16_t	dkl_nhead;		/* # of heads in this partition */
 	uint16_t	dkl_nsect;		/* # of 512 byte sectors per track */
 	uint16_t	dkl_bhead;		/* identifies proper label locations */

 @@ -1,14 +1,14 @@
-/*	$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
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -46,28 +46,28 @@ getchar(void)
 	else if (c == ('c'&037)) {
 		panic("^C");
 		/* NOTREACHED */
+	}
 	return c;
+}
 int
 tgetchar(void)
+{
 	int c;
 	if ((c = cngetc()) == 0)
-        	return 0;
+		return 0;
 	if (c == '\r')
 		c = '\n';
 	else if (c == ('c'&037)) {
 		panic("^C");
 		/* NOTREACHED */
+	}
 	return c;
+}
 void
 putchar(int c)
+{
 	cnputc(c);

 @@ -1,14 +1,14 @@
-/*	$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.
+ *
  * This code is derived from software contributed to Berkeley by
  * OMRON Corporation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -142,27 +142,27 @@ struct command_entry entries[] = {
 	{ "howto",	how_to_boot  },
 	{ "ls",		cmd_ls       },
 	{ "screen",	screen	     },
 #ifdef notyet
 	{ "tape",	tape	     },
 	{ "tp",		tape	     },
 #endif
 	{ "scsi",	scsi         },
 	{ "quit",	exit_program },
 	{ 0, 0 }
 };
 int
 parse(int argc, char *argv[])
+{
 	int i, status = ST_NOTFOUND;
 	for (i = 0; entries[i].name != (char *) 0; i++) {
 		if (!strcmp(argv[0], entries[i].name)) {
 			status = (*entries[i].func)(argc, argv);
 			break;
+		}
+	}
 	return(status);
+}

 @@ -1,14 +1,14 @@
-/*	$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.
+ *
  * This code is derived from software contributed to Berkeley by
  * OMRON Corporation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -559,33 +559,33 @@ scintr(void)
 #ifdef DEBUG
 	printf("scintr: INTS 0x%x, SSTS 0x%x,  PCTL 0x%x,  PSNS 0x%x    0x%x\n",
 	        ints, hd->scsi_ssts, hd->scsi_pctl, hd->scsi_psns,
 	        hs->sc_phase);
 #endif
 	if (ints & INTS_RESEL) {
 		if (hs->sc_phase == BUS_FREE_PHASE) {
 			temp = hd->scsi_temp & ~(1 << SCSI_ID);
 			for (i = 0; temp != 1; i++) {
 				temp >>= 1;
+			}
 			hs->sc_target = i;
 			*(hs->sc_lock) = SC_IN_PROGRESS;
 		} 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)
 				/* SCSI IO complete */
 				*(hs->sc_lock) = SC_IO_COMPLETE;
 			else
 				/* Cisconnected from Target */
 				*(hs->sc_lock) = SC_DISCONNECTED;
 			hd->scsi_ints = ints;
 			return 0;
 		} else
 			goto abort;
 	} else if (ints & INTS_CMD_DONE) {
 		if (hs->sc_phase == BUS_FREE_PHASE)
 			goto abort;
 		else if (hs->sc_phase == MESG_IN_PHASE) {

 @@ -1,14 +1,14 @@
-/*	$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
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Van Jacobson of Lawrence Berkeley Laboratory.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -276,46 +276,46 @@ struct scsi_reassign_parms {
 		unsigned lba;	/* logical block address */
 	} new_defect[2];
 } reassign_parms;
 struct scsi_modesel_hdr {
 	u_char	rsvd1;
 	u_char	media_type;
 	u_char 	rsvd2;
 	u_char	block_desc_len;
 	u_int	density		: 8;
 	u_int	number_blocks	:24;
 	u_int	rsvd3		: 8;
 	u_int	block_length	:24;
 };
 struct scsi_modesense_hdr {
 	u_char	len;
 	u_char	media_type;
 	u_char 	wp    : 1;
 	u_char 	rsvd1 : 7;
 	u_char	block_desc_len;
 	u_int	density		: 8;
 	u_int	number_blocks	:24;
 	u_int	rsvd2		: 8;
 	u_int	block_length	:24;
 };
 /*
  * Mode Select / Mode sense "pages"
  */
 /*
  * Page One - Error Recovery Parameters
  */
 struct scsi_err_recovery {
 	u_char	page_savable	: 1;	/* save parameters */
 	u_char	reserved	: 1;
 	u_char	page_code	: 6;	/* = 0x01 */
 	u_char	page_length;		/* = 6 */
 	u_char	awre		: 1;	/* auto write realloc enabled */
 	u_char	arre		: 1;	/* auto read realloc enabled */
 	u_char	tb		: 1;	/* transfer block */
 	u_char 	rc		: 1;	/* read continuous */
 	u_char	eec		: 1;	/* enable early correction */
 	u_char	per		: 1;	/* post error */
 	u_char	dte		: 1;	/* disable transfer on error */
 @@ -363,27 +363,27 @@ struct scsi_format {
 	u_short	cyl_skew_factor;
 	u_char	ssec		: 1;	/* Drive Type Field */
 	u_char	hsec		: 1;
 	u_char	rmb		: 1;
 	u_char	surf		: 1;
 	u_char	ins		: 1;
 	u_char	reserved_1	: 3;
 	u_char	reserved_2;
 	u_char	reserved_3;
 	u_char	reserved_4;
 };
 /*
  * Page Four - Rigid Disk Drive Geometry Parameters
  */
 struct scsi_geometry {
 	u_char	page_savable	: 1;	/* save parameters */
 	u_char	rsvd		: 1;
 	u_char	page_code	: 6;	/* = 0x04 */
 	u_char	page_length;		/* = 18 */
 	u_char	cyl_ub;			/* number of cylinders */
 	u_char	cyl_mb;
 	u_char	cyl_lb;
 	u_char	heads;			/* number of heads */
 	u_char	precomp_cyl_ub;		/* cylinder to start precomp */
 	u_char	precomp_cyl_mb;
 	u_char	precomp_cyl_lb;

 @@ -1,14 +1,14 @@
-/*	$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.
+ *
  * This code is derived from software contributed to Berkeley by
  * OMRON Corporation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -94,27 +94,27 @@ struct	sd_softc {
 	short	sc_flags;
 	short	sc_type;	/* drive type */
 	short	sc_punit;	/* physical unit (scsi lun) */
 	u_short	sc_bshift;	/* convert device blocks to DEV_BSIZE blks */
 	u_int	sc_blks;	/* number of blocks on device */
 	int	sc_blksize;	/* device block size in bytes */
 	u_int	sc_wpms;	/* average xfer rate in 16 bit wds/sec. */
 };
 struct sd_devdata {
 	int	unit;		/* drive number */
 	int	part;		/* partition */
 };
 static int sdinit(void *);
 static int sdident(struct sd_softc *, struct hp_device *);
 struct	driver sddriver = {
 	sdinit, "sd", NULL,
 };
 struct sd_softc sd_softc[NSD];
 struct sd_devdata sd_devdata[NSD];
 /* sc_flags values */
 #define	SDF_ALIVE	0x1