Module Name: src
Committed By: tsutsui
Date: Sun Jan 15 06:19:46 UTC 2023
Modified Files:
src/sys/arch/hp300/dev: dcm.c dcmreg.h diofbreg.h diofbvar.h dma.c
dnkbd.c dvbox.c frodoreg.h hpib.c mcclock_frodo.c rbox.c rboxreg.h
rtc.c sti_sgc.c topcatreg.h
src/sys/arch/hp300/hp300: autoconf.c machdep.c trap.c
src/sys/arch/hp300/include: bus.h cpu.h
src/sys/arch/hp300/stand/common: clock.c devopen.c hil.c ite_dumb.c
ite_sti.c machdep.c netio.c prf.c rd.c scsi.c scsireg.h sd.c
src/sys/arch/hp300/stand/inst: inst.c
Log Message:
TAB/space cleanup.
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/sys/arch/hp300/dev/dcm.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hp300/dev/dcmreg.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hp300/dev/diofbreg.h \
src/sys/arch/hp300/dev/diofbvar.h src/sys/arch/hp300/dev/dvbox.c \
src/sys/arch/hp300/dev/rbox.c
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/hp300/dev/dma.c \
src/sys/arch/hp300/dev/hpib.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hp300/dev/dnkbd.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hp300/dev/frodoreg.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hp300/dev/mcclock_frodo.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hp300/dev/rboxreg.h \
src/sys/arch/hp300/dev/topcatreg.h
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/hp300/dev/rtc.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hp300/dev/sti_sgc.c
cvs rdiff -u -r1.110 -r1.111 src/sys/arch/hp300/hp300/autoconf.c
cvs rdiff -u -r1.237 -r1.238 src/sys/arch/hp300/hp300/machdep.c
cvs rdiff -u -r1.155 -r1.156 src/sys/arch/hp300/hp300/trap.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/hp300/include/bus.h
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/hp300/include/cpu.h
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hp300/stand/common/clock.c \
src/sys/arch/hp300/stand/common/devopen.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hp300/stand/common/hil.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hp300/stand/common/ite_dumb.c \
src/sys/arch/hp300/stand/common/ite_sti.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hp300/stand/common/machdep.c \
src/sys/arch/hp300/stand/common/rd.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hp300/stand/common/netio.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hp300/stand/common/prf.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hp300/stand/common/scsi.c \
src/sys/arch/hp300/stand/common/sd.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hp300/stand/common/scsireg.h
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/hp300/stand/inst/inst.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/hp300/dev/dcm.c
diff -u src/sys/arch/hp300/dev/dcm.c:1.90 src/sys/arch/hp300/dev/dcm.c:1.91
--- src/sys/arch/hp300/dev/dcm.c:1.90 Sun Apr 10 09:50:45 2022
+++ src/sys/arch/hp300/dev/dcm.c Sun Jan 15 06:19:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: dcm.c,v 1.90 2022/04/10 09:50:45 andvar Exp $ */
+/* $NetBSD: dcm.c,v 1.91 2023/01/15 06:19:45 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dcm.c,v 1.90 2022/04/10 09:50:45 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dcm.c,v 1.91 2023/01/15 06:19:45 tsutsui Exp $");
#include "opt_kgdb.h"
@@ -302,7 +302,7 @@ CFATTACH_DECL_NEW(dcm, sizeof(struct dcm
static struct dcmdevice *dcm_cn = NULL; /* pointer to hardware */
static int dcmconsinit; /* has been initialized */
#if 0
-static int dcm_lastcnpri = CN_DEAD; /* XXX last priority */
+static int dcm_lastcnpri = CN_DEAD; /* XXX last priority */
#endif
static struct consdev dcm_cons = {
Index: src/sys/arch/hp300/dev/dcmreg.h
diff -u src/sys/arch/hp300/dev/dcmreg.h:1.10 src/sys/arch/hp300/dev/dcmreg.h:1.11
--- src/sys/arch/hp300/dev/dcmreg.h:1.10 Thu May 22 16:30:40 2014
+++ src/sys/arch/hp300/dev/dcmreg.h Sun Jan 15 06:19:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: dcmreg.h,v 1.10 2014/05/22 16:30:40 dholland Exp $ */
+/* $NetBSD: dcmreg.h,v 1.11 2023/01/15 06:19:45 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -196,7 +196,7 @@ struct dcmpreg {
#define BR_50 0x01
#define BR_75 0x02
#define BR_110 0x03
-#define BR_134 0x04
+#define BR_134 0x04
#define BR_150 0x05
#define BR_300 0x06
#define BR_600 0x07
Index: src/sys/arch/hp300/dev/diofbreg.h
diff -u src/sys/arch/hp300/dev/diofbreg.h:1.3 src/sys/arch/hp300/dev/diofbreg.h:1.4
--- src/sys/arch/hp300/dev/diofbreg.h:1.3 Sat Feb 12 16:40:29 2011
+++ src/sys/arch/hp300/dev/diofbreg.h Sun Jan 15 06:19:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: diofbreg.h,v 1.3 2011/02/12 16:40:29 tsutsui Exp $ */
+/* $NetBSD: diofbreg.h,v 1.4 2023/01/15 06:19:45 tsutsui Exp $ */
/* $OpenBSD: diofbreg.h,v 1.3 2007/01/07 15:13:52 miod Exp $ */
/*
@@ -65,7 +65,7 @@
struct diofbreg {
uint8_t :8;
uint8_t id; /* id and reset register 0x01 */
- uint8_t sec_interrupt; /* secondary interrupt register 0x02 */
+ uint8_t sec_interrupt; /* secondary interrupt register 0x02 */
uint8_t interrupt; /* interrupt register 0x03 */
uint8_t :8;
uint8_t fbwmsb; /* frame buffer width MSB 0x05 */
Index: src/sys/arch/hp300/dev/diofbvar.h
diff -u src/sys/arch/hp300/dev/diofbvar.h:1.3 src/sys/arch/hp300/dev/diofbvar.h:1.4
--- src/sys/arch/hp300/dev/diofbvar.h:1.3 Sat Feb 12 16:40:29 2011
+++ src/sys/arch/hp300/dev/diofbvar.h Sun Jan 15 06:19:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: diofbvar.h,v 1.3 2011/02/12 16:40:29 tsutsui Exp $ */
+/* $NetBSD: diofbvar.h,v 1.4 2023/01/15 06:19:45 tsutsui Exp $ */
/* $OpenBSD: diofbvar.h,v 1.10 2006/08/11 18:33:13 miod Exp $ */
/*
@@ -112,7 +112,7 @@ struct diofb {
#define RR_COPY 0x3
#define RR_XOR 0x6
#define RR_INVERT 0xa
-#define RR_COPYINVERTED 0xc
+#define RR_COPYINVERTED 0xc
void diofb_cnattach(struct diofb *);
void diofb_end_attach(device_t, struct wsdisplay_accessops *, struct diofb *,
Index: src/sys/arch/hp300/dev/dvbox.c
diff -u src/sys/arch/hp300/dev/dvbox.c:1.3 src/sys/arch/hp300/dev/dvbox.c:1.4
--- src/sys/arch/hp300/dev/dvbox.c:1.3 Fri Feb 18 19:15:43 2011
+++ src/sys/arch/hp300/dev/dvbox.c Sun Jan 15 06:19:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: dvbox.c,v 1.3 2011/02/18 19:15:43 tsutsui Exp $ */
+/* $NetBSD: dvbox.c,v 1.4 2023/01/15 06:19:45 tsutsui Exp $ */
/* $OpenBSD: dvbox.c,v 1.13 2006/08/11 18:33:13 miod Exp $ */
/*
@@ -278,7 +278,7 @@ dvbox_restore(struct diofb *fb)
volatile struct dvboxfb *db = (struct dvboxfb *)fb->regkva;
u_int i;
- db->regs.id = 0x80;
+ db->regs.id = 0x80;
DELAY(100);
db->regs.interrupt = 0x04;
@@ -329,7 +329,7 @@ dvbox_restore(struct diofb *fb)
*/
db->regs.interrupt = 0x04;
db->drive = 0x10;
- db->rep_rule = DVBOX_DUALROP(RR_COPY);
+ db->rep_rule = DVBOX_DUALROP(RR_COPY);
db->opwen = 0x01;
db->fbwen = 0x0;
db->fold = 0x01;
Index: src/sys/arch/hp300/dev/rbox.c
diff -u src/sys/arch/hp300/dev/rbox.c:1.3 src/sys/arch/hp300/dev/rbox.c:1.4
--- src/sys/arch/hp300/dev/rbox.c:1.3 Fri Feb 18 19:15:43 2011
+++ src/sys/arch/hp300/dev/rbox.c Sun Jan 15 06:19:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: rbox.c,v 1.3 2011/02/18 19:15:43 tsutsui Exp $ */
+/* $NetBSD: rbox.c,v 1.4 2023/01/15 06:19:45 tsutsui Exp $ */
/* $OpenBSD: rbox.c,v 1.14 2006/08/11 18:33:13 miod Exp $ */
/*
@@ -323,7 +323,7 @@ rbox_restore(struct diofb *fb)
CM2GRN(fb)[0x01].value = 0xFF;
CM2BLU(fb)[0x01].value = 0xFF;
- rb->blink = 0x00;
+ rb->blink = 0x00;
rb->write_enable = 0x01;
rb->opwen = 0x00;
Index: src/sys/arch/hp300/dev/dma.c
diff -u src/sys/arch/hp300/dev/dma.c:1.44 src/sys/arch/hp300/dev/dma.c:1.45
--- src/sys/arch/hp300/dev/dma.c:1.44 Mon Sep 6 20:55:08 2021
+++ src/sys/arch/hp300/dev/dma.c Sun Jan 15 06:19:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: dma.c,v 1.44 2021/09/06 20:55:08 andvar Exp $ */
+/* $NetBSD: dma.c,v 1.45 2023/01/15 06:19:45 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
#include "opt_m68k_arch.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dma.c,v 1.44 2021/09/06 20:55:08 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dma.c,v 1.45 2023/01/15 06:19:45 tsutsui Exp $");
#include <machine/hp300spu.h> /* XXX param.h includes cpu.h */
@@ -601,7 +601,7 @@ dmaintr(void *arg)
if (dmadebug & DDB_IO) {
if (((dmadebug&DDB_WORD) && (dc->dm_cmd&DMA_WORD)) ||
((dmadebug&DDB_LWORD) && (dc->dm_cmd&DMA_LWORD)))
- printf("dmaintr: flags %x unit %d stat %x "
+ printf("dmaintr: flags %x unit %d stat %x "
"next %d\n",
dc->dm_flags, i, stat, dc->dm_cur + 1);
}
Index: src/sys/arch/hp300/dev/hpib.c
diff -u src/sys/arch/hp300/dev/hpib.c:1.44 src/sys/arch/hp300/dev/hpib.c:1.45
--- src/sys/arch/hp300/dev/hpib.c:1.44 Sat Aug 7 16:18:53 2021
+++ src/sys/arch/hp300/dev/hpib.c Sun Jan 15 06:19:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: hpib.c,v 1.44 2021/08/07 16:18:53 thorpej Exp $ */
+/* $NetBSD: hpib.c,v 1.45 2023/01/15 06:19:45 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpib.c,v 1.44 2021/08/07 16:18:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpib.c,v 1.45 2023/01/15 06:19:45 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -117,7 +117,7 @@ int hpibdmathresh = 3; /* byte count bey
* a device is attached to the system!
*
* * We nevertheless probe the whole (slave, punit) tuple space, since
- * drivers for devices with a unique ID know exactly where to attach;
+ * drivers for devices with a unique ID know exactly where to attach;
* and we disallow ``star'' locators for other drivers.
*/
Index: src/sys/arch/hp300/dev/dnkbd.c
diff -u src/sys/arch/hp300/dev/dnkbd.c:1.13 src/sys/arch/hp300/dev/dnkbd.c:1.14
--- src/sys/arch/hp300/dev/dnkbd.c:1.13 Sat Aug 7 16:18:53 2021
+++ src/sys/arch/hp300/dev/dnkbd.c Sun Jan 15 06:19:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: dnkbd.c,v 1.13 2021/08/07 16:18:53 thorpej Exp $ */
+/* $NetBSD: dnkbd.c,v 1.14 2023/01/15 06:19:45 tsutsui Exp $ */
/* $OpenBSD: dnkbd.c,v 1.17 2009/07/23 21:05:56 blambert Exp $ */
/*
@@ -51,7 +51,7 @@
*
* 0x00 go to cooked mode.
* 0x01 go to 'raw' (scancode) mode.
- * 0x12,0x21 status report as <id1>\r<id2>\r<model>\r followed by 0xff
+ * 0x12,0x21 status report as <id1>\r<id2>\r<model>\r followed by 0xff
* and then the cooked/raw status.
* 0x21,0x81 beep on
* 0x21,0x82 beep off
Index: src/sys/arch/hp300/dev/frodoreg.h
diff -u src/sys/arch/hp300/dev/frodoreg.h:1.5 src/sys/arch/hp300/dev/frodoreg.h:1.6
--- src/sys/arch/hp300/dev/frodoreg.h:1.5 Sat Apr 19 05:37:54 2014
+++ src/sys/arch/hp300/dev/frodoreg.h Sun Jan 15 06:19:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: frodoreg.h,v 1.5 2014/04/19 05:37:54 tsutsui Exp $ */
+/* $NetBSD: frodoreg.h,v 1.6 2023/01/15 06:19:45 tsutsui Exp $ */
/*
* Copyright (c) 1997 Michael Smith. All rights reserved.
@@ -81,7 +81,7 @@
/* manipulate interrupt registers */
#define FRODO_GETMASK(sc) \
- ((FRODO_READ((sc), FRODO_PIC_MU) << 8) | \
+ ((FRODO_READ((sc), FRODO_PIC_MU) << 8) | \
FRODO_READ((sc), FRODO_PIC_ML))
#define FRODO_SETMASK(sc, val) do { \
FRODO_WRITE((sc), FRODO_PIC_MU, ((val) >> 8) & 0xff); \
Index: src/sys/arch/hp300/dev/mcclock_frodo.c
diff -u src/sys/arch/hp300/dev/mcclock_frodo.c:1.1 src/sys/arch/hp300/dev/mcclock_frodo.c:1.2
--- src/sys/arch/hp300/dev/mcclock_frodo.c:1.1 Sat Apr 19 05:37:54 2014
+++ src/sys/arch/hp300/dev/mcclock_frodo.c Sun Jan 15 06:19:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mcclock_frodo.c,v 1.1 2014/04/19 05:37:54 tsutsui Exp $ */
+/* $NetBSD: mcclock_frodo.c,v 1.2 2023/01/15 06:19:45 tsutsui Exp $ */
/*-
* Copyright (c) 2014 Izumi Tsutsui. All rights reserved.
*
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mcclock_frodo.c,v 1.1 2014/04/19 05:37:54 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mcclock_frodo.c,v 1.2 2023/01/15 06:19:45 tsutsui Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -97,7 +97,7 @@ mcclock_frodo_attach(device_t parent, de
mcclock_frodo_write(sc, MC_REGB, MC_REGB_BINARY | MC_REGB_24HR);
/* make sure to start the 32.768kHz OSC */
- mcclock_frodo_write(sc, MC_REGA,
+ mcclock_frodo_write(sc, MC_REGA,
(mcclock_frodo_read(sc, MC_REGA) & ~MC_REGA_DVMASK) |
MC_BASE_32_KHz);
}
Index: src/sys/arch/hp300/dev/rboxreg.h
diff -u src/sys/arch/hp300/dev/rboxreg.h:1.2 src/sys/arch/hp300/dev/rboxreg.h:1.3
--- src/sys/arch/hp300/dev/rboxreg.h:1.2 Sat Feb 12 16:40:29 2011
+++ src/sys/arch/hp300/dev/rboxreg.h Sun Jan 15 06:19:45 2023
@@ -1,5 +1,5 @@
/* $OpenBSD: rboxreg.h,v 1.2 2005/01/24 21:36:39 miod Exp $ */
-/* $NetBSD: rboxreg.h,v 1.2 2011/02/12 16:40:29 tsutsui Exp $ */
+/* $NetBSD: rboxreg.h,v 1.3 2023/01/15 06:19:45 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -70,7 +70,7 @@ struct rboxfb {
uint8_t filler3[0x405b - 0x4048];
uint8_t scanbusy; /* scan converteris active 0x405B */
uint8_t filler3b[0x4083 - 0x405c];
- uint8_t video_enable; /* drive vid. refresh bus 0x4083 */
+ uint8_t video_enable; /* drive vid. refresh bus 0x4083 */
uint8_t filler4[3];
uint8_t display_enable; /* enable the display 0x4087 */
uint8_t filler5[8];
Index: src/sys/arch/hp300/dev/topcatreg.h
diff -u src/sys/arch/hp300/dev/topcatreg.h:1.2 src/sys/arch/hp300/dev/topcatreg.h:1.3
--- src/sys/arch/hp300/dev/topcatreg.h:1.2 Sat Feb 12 16:40:29 2011
+++ src/sys/arch/hp300/dev/topcatreg.h Sun Jan 15 06:19:45 2023
@@ -1,5 +1,5 @@
/* $OpenBSD: topcatreg.h,v 1.2 2005/01/24 21:36:39 miod Exp $ */
-/* $NetBSD: topcatreg.h,v 1.2 2011/02/12 16:40:29 tsutsui Exp $ */
+/* $NetBSD: topcatreg.h,v 1.3 2023/01/15 06:19:45 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -64,15 +64,15 @@ struct tcboxfb {
uint8_t f3[0x4080-0x404c-1];
uint8_t nblank; /* display enable planes 0x4080 */
uint8_t f4[0x4088-0x4080-1];
- uint8_t wen; /* write enable plane 0x4088 */
+ uint8_t wen; /* write enable plane 0x4088 */
uint8_t f5[0x408c-0x4088-1];
uint8_t ren; /* read enable plane 0x408c */
uint8_t f6[0x4090-0x408c-1];
uint8_t fben; /* frame buffer write enable 0x4090 */
uint8_t f7[0x409c-0x4090-1];
- uint8_t wmove; /* start window move 0x409c */
+ uint8_t wmove; /* start window move 0x409c */
uint8_t f8[0x40a0-0x409c-1];
- uint8_t blink; /* enable blink planes 0x40a0 */
+ uint8_t blink; /* enable blink planes 0x40a0 */
uint8_t f9[0x40a8-0x40a0-1];
uint8_t altframe; /* enable alternate frame 0x40a8 */
uint8_t f10[0x40ac-0x40a8-1];
@@ -82,13 +82,13 @@ struct tcboxfb {
uint8_t f12[0x40ef-0x40ea-1];
uint8_t wmrr; /* move replacement rule 0x40ef */
uint8_t f13[0x40f2-0x40ef-1];
- uint16_t source_x; /* source x pixel # 0x40f2 */
+ uint16_t source_x; /* source x pixel # 0x40f2 */
uint8_t f14[0x40f6-0x40f2-2];
- uint16_t source_y; /* source y pixel # 0x40f6 */
+ uint16_t source_y; /* source y pixel # 0x40f6 */
uint8_t f15[0x40fa-0x40f6-2];
- uint16_t dest_x; /* dest x pixel # 0x40fa */
+ uint16_t dest_x; /* dest x pixel # 0x40fa */
uint8_t f16[0x40fe -0x40fa-2];
- uint16_t dest_y; /* dest y pixel # 0x40fe */
+ uint16_t dest_y; /* dest y pixel # 0x40fe */
uint8_t f17[0x4102-0x40fe -2];
uint16_t wwidth; /* block mover pixel width 0x4102 */
uint8_t f18[0x4106-0x4102-2];
@@ -107,11 +107,11 @@ struct tcboxfb {
uint8_t f22[0x6002-0x4800-2];
uint16_t cmap_busy; /* Color Ram busy 0x6002 */
uint8_t f23[0x60b2-0x6002-2];
- uint16_t rdata; /* color map red data 0x60b2 */
+ uint16_t rdata; /* color map red data 0x60b2 */
uint16_t gdata; /* color map green data 0x60b4 */
- uint16_t bdata; /* color map blue data 0x60b6 */
- uint16_t cindex; /* color map index 0x60b8 */
+ uint16_t bdata; /* color map blue data 0x60b6 */
+ uint16_t cindex; /* color map index 0x60b8 */
uint16_t plane_mask; /* plane mask select 0x60ba */
uint8_t f24[0x60f0-0x60ba-2];
- uint16_t strobe; /* color map trigger 0x60f0 */
+ uint16_t strobe; /* color map trigger 0x60f0 */
};
Index: src/sys/arch/hp300/dev/rtc.c
diff -u src/sys/arch/hp300/dev/rtc.c:1.21 src/sys/arch/hp300/dev/rtc.c:1.22
--- src/sys/arch/hp300/dev/rtc.c:1.21 Sat Apr 19 05:37:54 2014
+++ src/sys/arch/hp300/dev/rtc.c Sun Jan 15 06:19:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: rtc.c,v 1.21 2014/04/19 05:37:54 tsutsui Exp $ */
+/* $NetBSD: rtc.c,v 1.22 2023/01/15 06:19:45 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.21 2014/04/19 05:37:54 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtc.c,v 1.22 2023/01/15 06:19:45 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -140,7 +140,7 @@ rtc_gettime_ymdhms(todr_chip_handle_t ha
read_okay = false;
}
-#define rtc_to_decimal(a,b) (rtc_registers[a] * 10 + rtc_registers[b])
+#define rtc_to_decimal(a,b) (rtc_registers[a] * 10 + rtc_registers[b])
dt->dt_sec = rtc_to_decimal(1, 0);
dt->dt_min = rtc_to_decimal(3, 2);
Index: src/sys/arch/hp300/dev/sti_sgc.c
diff -u src/sys/arch/hp300/dev/sti_sgc.c:1.7 src/sys/arch/hp300/dev/sti_sgc.c:1.8
--- src/sys/arch/hp300/dev/sti_sgc.c:1.7 Sun Jul 3 11:30:48 2022
+++ src/sys/arch/hp300/dev/sti_sgc.c Sun Jan 15 06:19:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: sti_sgc.c,v 1.7 2022/07/03 11:30:48 andvar Exp $ */
+/* $NetBSD: sti_sgc.c,v 1.8 2023/01/15 06:19:45 tsutsui Exp $ */
/* $OpenBSD: sti_sgc.c,v 1.14 2007/05/26 00:36:03 krw Exp $ */
/*
@@ -27,7 +27,7 @@
*
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sti_sgc.c,v 1.7 2022/07/03 11:30:48 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sti_sgc.c,v 1.8 2023/01/15 06:19:45 tsutsui Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -55,7 +55,7 @@ struct sti_sgc_softc {
* 425e EVRX specific hardware
*/
/*
- * EVRX RAMDAC (Bt458) is found at offset 0x060000 from SGC bus PA and
+ * EVRX RAMDAC (Bt458) is found at offset 0x060000 from SGC bus PA and
* offset 0x040000 length 0x1c0000 is mapped in MI sti via ROM region 2
*/
#define STI_EVRX_REGNO2OFFSET 0x020000
Index: src/sys/arch/hp300/hp300/autoconf.c
diff -u src/sys/arch/hp300/hp300/autoconf.c:1.110 src/sys/arch/hp300/hp300/autoconf.c:1.111
--- src/sys/arch/hp300/hp300/autoconf.c:1.110 Sat Aug 7 16:18:53 2021
+++ src/sys/arch/hp300/hp300/autoconf.c Sun Jan 15 06:19:46 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.110 2021/08/07 16:18:53 thorpej Exp $ */
+/* $NetBSD: autoconf.c,v 1.111 2023/01/15 06:19:46 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997, 2002 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.110 2021/08/07 16:18:53 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.111 2023/01/15 06:19:46 tsutsui Exp $");
#include "dvbox.h"
#include "gbox.h"
@@ -222,7 +222,7 @@ struct dev_data {
int dd_punit; /* and punit... */
};
typedef LIST_HEAD(, dev_data) ddlist_t;
-static ddlist_t dev_data_list; /* all dev_datas */
+static ddlist_t dev_data_list; /* all dev_datas */
static ddlist_t dev_data_list_hpib; /* hpib controller dev_datas */
static ddlist_t dev_data_list_scsi; /* scsi controller dev_datas */
Index: src/sys/arch/hp300/hp300/machdep.c
diff -u src/sys/arch/hp300/hp300/machdep.c:1.237 src/sys/arch/hp300/hp300/machdep.c:1.238
--- src/sys/arch/hp300/hp300/machdep.c:1.237 Sun Oct 16 15:20:59 2022
+++ src/sys/arch/hp300/hp300/machdep.c Sun Jan 15 06:19:46 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.237 2022/10/16 15:20:59 tsutsui Exp $ */
+/* $NetBSD: machdep.c,v 1.238 2023/01/15 06:19:46 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.237 2022/10/16 15:20:59 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.238 2023/01/15 06:19:46 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -371,7 +371,7 @@ static void
identifycpu(void)
{
const char *t, *cpu, *s, *mmu;
- int i;
+ int i;
char fpu[64], cache[64];
/*
Index: src/sys/arch/hp300/hp300/trap.c
diff -u src/sys/arch/hp300/hp300/trap.c:1.155 src/sys/arch/hp300/hp300/trap.c:1.156
--- src/sys/arch/hp300/hp300/trap.c:1.155 Sat Sep 25 19:16:31 2021
+++ src/sys/arch/hp300/hp300/trap.c Sun Jan 15 06:19:46 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.155 2021/09/25 19:16:31 tsutsui Exp $ */
+/* $NetBSD: trap.c,v 1.156 2023/01/15 06:19:46 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.155 2021/09/25 19:16:31 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.156 2023/01/15 06:19:46 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_execfmt.h"
@@ -548,8 +548,8 @@ trap(struct frame *fp, int type, u_int c
#endif
/*
* It is only a kernel address space fault iff:
- * 1. (type & T_USER) == 0 and
- * 2. pcb_onfault not set or
+ * 1. (type & T_USER) == 0 and
+ * 2. pcb_onfault not set or
* 3. pcb_onfault set but supervisor space data fault
* The last can occur during an exec() copyin where the
* argument space is lazy-allocated.
Index: src/sys/arch/hp300/include/bus.h
diff -u src/sys/arch/hp300/include/bus.h:1.22 src/sys/arch/hp300/include/bus.h:1.23
--- src/sys/arch/hp300/include/bus.h:1.22 Sun Mar 7 10:01:08 2021
+++ src/sys/arch/hp300/include/bus.h Sun Jan 15 06:19:46 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.22 2021/03/07 10:01:08 skrll Exp $ */
+/* $NetBSD: bus.h,v 1.23 2023/01/15 06:19:46 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -756,5 +756,5 @@ __HP300_copy_region_N(4)
* There is no bus_dma(9)'fied bus drivers on this port.
*/
#define __HAVE_NO_BUS_DMA
-
+
#endif /* _HP300_BUS_H_ */
Index: src/sys/arch/hp300/include/cpu.h
diff -u src/sys/arch/hp300/include/cpu.h:1.72 src/sys/arch/hp300/include/cpu.h:1.73
--- src/sys/arch/hp300/include/cpu.h:1.72 Sat Nov 23 19:40:35 2019
+++ src/sys/arch/hp300/include/cpu.h Sun Jan 15 06:19:46 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.72 2019/11/23 19:40:35 ad Exp $ */
+/* $NetBSD: cpu.h,v 1.73 2023/01/15 06:19:46 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -89,7 +89,7 @@ struct clockframe {
* or after the current trap/syscall if in system mode.
*/
#define cpu_need_resched(ci,l,flags) do { \
- __USE(flags); \
+ __USE(flags); \
aston(); \
} while (/*CONSTCOND*/0)
Index: src/sys/arch/hp300/stand/common/clock.c
diff -u src/sys/arch/hp300/stand/common/clock.c:1.13 src/sys/arch/hp300/stand/common/clock.c:1.14
--- src/sys/arch/hp300/stand/common/clock.c:1.13 Mon Nov 17 02:15:48 2014
+++ src/sys/arch/hp300/stand/common/clock.c Sun Jan 15 06:19:46 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.13 2014/11/17 02:15:48 christos Exp $ */
+/* $NetBSD: clock.c,v 1.14 2023/01/15 06:19:46 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -145,7 +145,7 @@ clock_to_gmt(satime_t *timbuf)
for (i = 1; i < month; i++)
tmp += days_in_month(i);
-
+
tmp += (day - 1);
tmp = ((tmp * 24 + hour) * 60 + min) * 60 + sec;
Index: src/sys/arch/hp300/stand/common/devopen.c
diff -u src/sys/arch/hp300/stand/common/devopen.c:1.13 src/sys/arch/hp300/stand/common/devopen.c:1.14
--- src/sys/arch/hp300/stand/common/devopen.c:1.13 Sun Dec 11 07:39:30 2022
+++ src/sys/arch/hp300/stand/common/devopen.c Sun Jan 15 06:19:46 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: devopen.c,v 1.13 2022/12/11 07:39:30 tsutsui Exp $ */
+/* $NetBSD: devopen.c,v 1.14 2023/01/15 06:19:46 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
/*-
* Copyright (c) 1993 John Brezak
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -43,7 +43,7 @@
* documentation and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -87,7 +87,7 @@ devlookup(const char *d, int len)
{
struct devsw *dp = devsw;
int i;
-
+
for (i = 0; i < ndevs; i++, dp++) {
if (dp->dv_name && strncmp(dp->dv_name, d, len) == 0) {
/*
@@ -194,7 +194,7 @@ devparse(const char *fname, int *dev, in
/* isolate device */
for (s = (char *)fname; *s != ':' && !isdigit(*s); s++)
continue;
-
+
/* lookup device and get index */
if ((*dev = devlookup(fname, s - fname)) < 0)
goto baddev;
@@ -206,11 +206,11 @@ devparse(const char *fname, int *dev, in
*ctlr = temp % 8;
for (; isdigit(*s); s++)
continue;
-
+
/* translate partition */
if (!ispart(*s))
goto bad;
-
+
*part = *s++ - 'a';
if (*s != ':')
goto bad;
@@ -220,16 +220,16 @@ devparse(const char *fname, int *dev, in
/* no device present */
else
*file = (char *)fname;
-
+
/* return the remaining unparsed part as the file to boot */
return 0;
-
+
bad:
usage();
baddev:
return -1;
-}
+}
int
@@ -264,7 +264,7 @@ devopen(struct open_file *f, const char
memcpy(file_system, file_system_ufs,
sizeof(file_system_ufs));
nfsys = NFSYS_UFS;
- break;
+ break;
case 6: /* le */
memcpy(file_system, file_system_nfs,
@@ -279,7 +279,7 @@ devopen(struct open_file *f, const char
}
dp = &devsw[dev];
-
+
if (!dp->dv_open)
return ENODEV;
Index: src/sys/arch/hp300/stand/common/hil.c
diff -u src/sys/arch/hp300/stand/common/hil.c:1.14 src/sys/arch/hp300/stand/common/hil.c:1.15
--- src/sys/arch/hp300/stand/common/hil.c:1.14 Tue Feb 8 20:20:14 2011
+++ src/sys/arch/hp300/stand/common/hil.c Sun Jan 15 06:19:46 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: hil.c,v 1.14 2011/02/08 20:20:14 rmind Exp $ */
+/* $NetBSD: hil.c,v 1.15 2023/01/15 06:19:46 tsutsui Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -89,9 +89,9 @@
* Supports only unshifted, shifted and control keys.
*/
char hil_us_keymap[] = {
- '\0', '`', '\\', ESC, '\0', DEL, '\0', '\0',
- '\n', '\t', '\0', '\0', '\0', '\0', '\0', '\0',
- '\0', '\n', '\0', '\0', '\0', '\0', '\0', '\0',
+ '\0', '`', '\\', ESC, '\0', DEL, '\0', '\0',
+ '\n', '\t', '\0', '\0', '\0', '\0', '\0', '\0',
+ '\0', '\n', '\0', '\0', '\0', '\0', '\0', '\0',
'\0', '\t', '\0', '\0', '\0', '\0', '\0', '\0',
'\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',
'\0', '\0', '\0', '\0', '\0', '\0', '\b', '\0',
@@ -147,9 +147,9 @@ char hil_us_ctrlmap[] = {
#ifdef UK_KEYBOARD
char hil_uk_keymap[] = {
- '\0', '`', '<', ESC, '\0', DEL, '\0', '\0',
- '\n', '\t', '\0', '\0', '\0', '\0', '\0', '\0',
- '\0', '\n', '\0', '\0', '\0', '\0', '\0', '\0',
+ '\0', '`', '<', ESC, '\0', DEL, '\0', '\0',
+ '\n', '\t', '\0', '\0', '\0', '\0', '\0', '\0',
+ '\0', '\n', '\0', '\0', '\0', '\0', '\0', '\0',
'\0', '\t', '\0', '\0', '\0', '\0', '\0', '\0',
'\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',
'\0', '\0', '\0', '\0', '\0', '\0', '\b', '\0',
Index: src/sys/arch/hp300/stand/common/ite_dumb.c
diff -u src/sys/arch/hp300/stand/common/ite_dumb.c:1.1 src/sys/arch/hp300/stand/common/ite_dumb.c:1.2
--- src/sys/arch/hp300/stand/common/ite_dumb.c:1.1 Sat Feb 12 05:08:41 2011
+++ src/sys/arch/hp300/stand/common/ite_dumb.c Sun Jan 15 06:19:46 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ite_dumb.c,v 1.1 2011/02/12 05:08:41 tsutsui Exp $ */
+/* $NetBSD: ite_dumb.c,v 1.2 2023/01/15 06:19:46 tsutsui Exp $ */
/*-
* Copyright (c) 2011 Izumi Tsutsui. All rights reserved.
@@ -187,7 +187,7 @@ dumb_putc(struct ite_data *ip, int c, in
uint8_t *pc;
uint32_t *pc32;
uint32_t *fontp;
-
+
pc = (uint8_t *)ip->fbbase +
((ip->ftheight * ip->cursory) * ip->fbwidth) +
ip->ftwidth * ip->cursorx;
Index: src/sys/arch/hp300/stand/common/ite_sti.c
diff -u src/sys/arch/hp300/stand/common/ite_sti.c:1.1 src/sys/arch/hp300/stand/common/ite_sti.c:1.2
--- src/sys/arch/hp300/stand/common/ite_sti.c:1.1 Sun Apr 13 15:45:27 2014
+++ src/sys/arch/hp300/stand/common/ite_sti.c Sun Jan 15 06:19:46 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ite_sti.c,v 1.1 2014/04/13 15:45:27 tsutsui Exp $ */
+/* $NetBSD: ite_sti.c,v 1.2 2023/01/15 06:19:46 tsutsui Exp $ */
/* $OpenBSD: ite_sti.c,v 1.2 2011/08/18 20:02:58 miod Exp $ */
/*
* Copyright (c) 2006, 2011, Miodrag Vallat
@@ -66,7 +66,7 @@ void sti_init(int);
void sti_inqcfg(struct sti_inqconfout *);
void sti_iteinit_common(struct ite_data *);
-#if 0 /* not yet */
+#if 0 /* not yet */
/* kinda similar to sti_dio_probe() */
int
sti_dio_probe(struct ite_data *ip)
Index: src/sys/arch/hp300/stand/common/machdep.c
diff -u src/sys/arch/hp300/stand/common/machdep.c:1.15 src/sys/arch/hp300/stand/common/machdep.c:1.16
--- src/sys/arch/hp300/stand/common/machdep.c:1.15 Tue Feb 8 20:20:14 2011
+++ src/sys/arch/hp300/stand/common/machdep.c Sun Jan 15 06:19:46 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.15 2011/02/08 20:20:14 rmind Exp $ */
+/* $NetBSD: machdep.c,v 1.16 2023/01/15 06:19:46 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -122,12 +122,12 @@ trap(struct trapframe *fp)
fp->tf_format, fp->tf_format, fp->tf_sr, fp->tf_pc);
printf("dregs: %x %x %x %x %x %x %x %x\n",
fp->tf_regs[0], fp->tf_regs[1],
- fp->tf_regs[2], fp->tf_regs[3],
+ fp->tf_regs[2], fp->tf_regs[3],
fp->tf_regs[4], fp->tf_regs[5],
fp->tf_regs[6], fp->tf_regs[7]);
printf("aregs: %x %x %x %x %x %x %x %x\n",
fp->tf_regs[8], fp->tf_regs[9],
- fp->tf_regs[10], fp->tf_regs[11],
+ fp->tf_regs[10], fp->tf_regs[11],
fp->tf_regs[12], fp->tf_regs[13],
fp->tf_regs[14], fp->tf_regs[15]);
Index: src/sys/arch/hp300/stand/common/rd.c
diff -u src/sys/arch/hp300/stand/common/rd.c:1.15 src/sys/arch/hp300/stand/common/rd.c:1.16
--- src/sys/arch/hp300/stand/common/rd.c:1.15 Fri Nov 25 13:06:27 2022
+++ src/sys/arch/hp300/stand/common/rd.c Sun Jan 15 06:19:46 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: rd.c,v 1.15 2022/11/25 13:06:27 tsutsui Exp $ */
+/* $NetBSD: rd.c,v 1.16 2023/01/15 06:19:46 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -235,7 +235,7 @@ rdgetinfo(struct rd_softc *rs)
printf("rdgetinfo: rdstrategy error %d\n", err);
return 0;
}
-
+
msg = getdisklabel(io_buf, lp);
if (msg) {
printf("rd(%d,%d,%d): WARNING: %s\n",
Index: src/sys/arch/hp300/stand/common/netio.c
diff -u src/sys/arch/hp300/stand/common/netio.c:1.18 src/sys/arch/hp300/stand/common/netio.c:1.19
--- src/sys/arch/hp300/stand/common/netio.c:1.18 Mon Apr 12 03:55:40 2021
+++ src/sys/arch/hp300/stand/common/netio.c Sun Jan 15 06:19:46 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: netio.c,v 1.18 2021/04/12 03:55:40 mrg Exp $ */
+/* $NetBSD: netio.c,v 1.19 2023/01/15 06:19:46 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -112,7 +112,7 @@ netopen(struct open_file *f, ...)
va_list ap;
char *devname;
int error = 0;
-
+
va_start(ap, f);
devname = va_arg(ap, char *);
va_end(ap);
@@ -173,7 +173,7 @@ netmountroot(struct open_file *f, char *
get_my_netmask:
printf("My netmask? ");
- memset(input_line, 0, sizeof(input_line));
+ memset(input_line, 0, sizeof(input_line));
kgets(input_line, sizeof(input_line));
if ((netmask = inet_addr(input_line)) ==
htonl(INADDR_NONE)) {
@@ -183,7 +183,7 @@ netmountroot(struct open_file *f, char *
get_my_gateway:
printf("My gateway? ");
- memset(input_line, 0, sizeof(input_line));
+ memset(input_line, 0, sizeof(input_line));
kgets(input_line, sizeof(input_line));
if ((gateip.s_addr = inet_addr(input_line)) ==
htonl(INADDR_NONE)) {
@@ -193,7 +193,7 @@ netmountroot(struct open_file *f, char *
get_server_ip:
printf("Server IP address? ");
- memset(input_line, 0, sizeof(input_line));
+ memset(input_line, 0, sizeof(input_line));
kgets(input_line, sizeof(input_line));
if ((rootip.s_addr = inet_addr(input_line)) ==
htonl(INADDR_NONE)) {
@@ -203,7 +203,7 @@ netmountroot(struct open_file *f, char *
get_server_path:
printf("Server path? ");
- memset(rootpath, 0, sizeof(rootpath));
+ memset(rootpath, 0, sizeof(rootpath));
kgets(rootpath, sizeof(rootpath));
if (rootpath[0] == '\0' || rootpath[0] == '\n')
goto get_server_path;
Index: src/sys/arch/hp300/stand/common/prf.c
diff -u src/sys/arch/hp300/stand/common/prf.c:1.5 src/sys/arch/hp300/stand/common/prf.c:1.6
--- src/sys/arch/hp300/stand/common/prf.c:1.5 Sun Dec 11 12:17:19 2005
+++ src/sys/arch/hp300/stand/common/prf.c Sun Jan 15 06:19:46 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: prf.c,v 1.5 2005/12/11 12:17:19 christos Exp $ */
+/* $NetBSD: prf.c,v 1.6 2023/01/15 06:19:46 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -57,7 +57,7 @@ tgetchar(void)
if ((c = cngetc()) == 0)
return 0;
-
+
if (c == '\r')
c = '\n';
else if (c == ('c'&037)) {
Index: src/sys/arch/hp300/stand/common/scsi.c
diff -u src/sys/arch/hp300/stand/common/scsi.c:1.11 src/sys/arch/hp300/stand/common/scsi.c:1.12
--- src/sys/arch/hp300/stand/common/scsi.c:1.11 Thu Jan 2 17:43:32 2014
+++ src/sys/arch/hp300/stand/common/scsi.c Sun Jan 15 06:19:46 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: scsi.c,v 1.11 2014/01/02 17:43:32 tsutsui Exp $ */
+/* $NetBSD: scsi.c,v 1.12 2023/01/15 06:19:46 tsutsui Exp $ */
/*
* This is reported to fix some odd failures when disklabeling
@@ -82,7 +82,7 @@ scsiinit(void)
struct scsi_softc *hs;
int i;
static int waitset = 0;
-
+
i = 0;
for (hw = sc_table; i < NSCSI && hw < &sc_table[MAXCTLRS]; hw++) {
if (!HW_ISSCSI(hw))
Index: src/sys/arch/hp300/stand/common/sd.c
diff -u src/sys/arch/hp300/stand/common/sd.c:1.11 src/sys/arch/hp300/stand/common/sd.c:1.12
--- src/sys/arch/hp300/stand/common/sd.c:1.11 Sun Jul 17 20:54:40 2011
+++ src/sys/arch/hp300/stand/common/sd.c Sun Jan 15 06:19:46 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.11 2011/07/17 20:54:40 joerg Exp $ */
+/* $NetBSD: sd.c,v 1.12 2023/01/15 06:19:46 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -138,7 +138,7 @@ sdgetinfo(struct sd_softc *ss)
printf("sdgetinfo: sdstrategy error %d\n", err);
return 0;
}
-
+
msg = getdisklabel(io_buf, lp);
if (msg) {
printf("sd(%d,%d,%d): WARNING: %s\n",
@@ -173,7 +173,7 @@ sdopen(struct open_file *f, ...)
printf("sdopen: ctlr=%d unit=%d part=%d\n",
ctlr, unit, part);
#endif
-
+
if (ctlr >= NSCSI || scsialive(ctlr) == 0)
return EADAPT;
if (unit >= NSD)
@@ -252,6 +252,6 @@ retry:
goto retry;
}
*rsize = size;
-
+
return 0;
}
Index: src/sys/arch/hp300/stand/common/scsireg.h
diff -u src/sys/arch/hp300/stand/common/scsireg.h:1.4 src/sys/arch/hp300/stand/common/scsireg.h:1.5
--- src/sys/arch/hp300/stand/common/scsireg.h:1.4 Mon Sep 7 03:49:45 2015
+++ src/sys/arch/hp300/stand/common/scsireg.h Sun Jan 15 06:19:46 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: scsireg.h,v 1.4 2015/09/07 03:49:45 dholland Exp $ */
+/* $NetBSD: scsireg.h,v 1.5 2023/01/15 06:19:46 tsutsui Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -319,7 +319,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;
@@ -331,14 +331,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 */
@@ -406,7 +406,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/hp300/stand/inst/inst.c
diff -u src/sys/arch/hp300/stand/inst/inst.c:1.24 src/sys/arch/hp300/stand/inst/inst.c:1.25
--- src/sys/arch/hp300/stand/inst/inst.c:1.24 Sun Dec 11 06:20:07 2022
+++ src/sys/arch/hp300/stand/inst/inst.c Sun Jan 15 06:19:46 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: inst.c,v 1.24 2022/12/11 06:20:07 tsutsui Exp $ */
+/* $NetBSD: inst.c,v 1.25 2023/01/15 06:19:46 tsutsui Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -46,7 +46,7 @@
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
+ * must display the following acknowledgement:
* This product includes software developed at Ludd, University of
* Lule}, Sweden and its contributors.
* 4. The name of the author may not be used to endorse or promote products
