Module Name: src
Committed By: andvar
Date: Fri Jul 5 20:19:43 UTC 2024
Modified Files:
src/sys/arch/luna68k/stand/boot: scsi.c
src/sys/arch/newsmips/dev: scsi_1185.c
src/sys/dev/ic: dm9000reg.h
src/sys/dev/ieee1394: fwohcireg.h
src/usr.sbin/moused: moused.c
Log Message:
s/vender/vendor/ in comments, log message and fw ohci register property.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/luna68k/stand/boot/scsi.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/newsmips/dev/scsi_1185.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/ic/dm9000reg.h
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/ieee1394/fwohcireg.h
cvs rdiff -u -r1.31 -r1.32 src/usr.sbin/moused/moused.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/scsi.c
diff -u src/sys/arch/luna68k/stand/boot/scsi.c:1.7 src/sys/arch/luna68k/stand/boot/scsi.c:1.8
--- src/sys/arch/luna68k/stand/boot/scsi.c:1.7 Sat Feb 14 05:58:02 2015
+++ src/sys/arch/luna68k/stand/boot/scsi.c Fri Jul 5 20:19:43 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: scsi.c,v 1.7 2015/02/14 05:58:02 tsutsui Exp $ */
+/* $NetBSD: scsi.c,v 1.8 2024/07/05 20:19:43 andvar Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -137,7 +137,7 @@ scsi(int argc, char *argv[])
printf("Version:\t0x%x\n", inquirybuf.version);
printf("RDF:\t0x%x\n", inquirybuf.rsvd);
- printf("Vender ID:\t");
+ printf("Vendor ID:\t");
for (i = 0; i < 8; i++)
printf("%c", inquirybuf.vendor_id[i]);
printf("\n");
Index: src/sys/arch/newsmips/dev/scsi_1185.c
diff -u src/sys/arch/newsmips/dev/scsi_1185.c:1.26 src/sys/arch/newsmips/dev/scsi_1185.c:1.27
--- src/sys/arch/newsmips/dev/scsi_1185.c:1.26 Fri Feb 9 22:08:32 2024
+++ src/sys/arch/newsmips/dev/scsi_1185.c Fri Jul 5 20:19:43 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: scsi_1185.c,v 1.26 2024/02/09 22:08:32 andvar Exp $ */
+/* $NetBSD: scsi_1185.c,v 1.27 2024/07/05 20:19:43 andvar Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsi_1185.c,v 1.26 2024/02/09 22:08:32 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsi_1185.c,v 1.27 2024/07/05 20:19:43 andvar Exp $");
#define __INTR_PRIVATE
#include <sys/param.h>
@@ -287,7 +287,7 @@ sc_send(struct sc_scb *scb, int chan, in
if (p[0] == SCOP_RESET && p[1] == SCOP_RESET) {
/*
* SCSI bus reset command procedure
- * (vender unique by Sony Corp.)
+ * (vendor unique by Sony Corp.)
*/
#ifdef SCSI_1185AQ
if (sc_idenr & 0x08)
Index: src/sys/dev/ic/dm9000reg.h
diff -u src/sys/dev/ic/dm9000reg.h:1.11 src/sys/dev/ic/dm9000reg.h:1.12
--- src/sys/dev/ic/dm9000reg.h:1.11 Sat Mar 25 21:33:46 2023
+++ src/sys/dev/ic/dm9000reg.h Fri Jul 5 20:19:42 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dm9000reg.h,v 1.11 2023/03/25 21:33:46 andvar Exp $ */
+/* $NetBSD: dm9000reg.h,v 1.12 2024/07/05 20:19:42 andvar Exp $ */
/*
* Copyright (c) 2009 Paul Fleischer
@@ -161,8 +161,8 @@
#define DM9000_RWPAH 0x25 /* Rx SRAM read pointer 15:8 */
/* VID 0x0a46, PID 0x9000 */
-#define DM9000_VID0 0x28 /* vender ID 7:0 */
-#define DM9000_VID1 0x29 /* vender ID 15:8 */
+#define DM9000_VID0 0x28 /* vendor ID 7:0 */
+#define DM9000_VID1 0x29 /* vendor ID 15:8 */
#define DM9000_PID0 0x2A /* product ID 7:0 */
#define DM9000_PID1 0x2B /* product ID 15:8 */
#define DM9000_CHIPR 0x2C /* chip revision */
Index: src/sys/dev/ieee1394/fwohcireg.h
diff -u src/sys/dev/ieee1394/fwohcireg.h:1.20 src/sys/dev/ieee1394/fwohcireg.h:1.21
--- src/sys/dev/ieee1394/fwohcireg.h:1.20 Tue Oct 15 18:21:47 2019
+++ src/sys/dev/ieee1394/fwohcireg.h Fri Jul 5 20:19:43 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: fwohcireg.h,v 1.20 2019/10/15 18:21:47 msaitoh Exp $ */
+/* $NetBSD: fwohcireg.h,v 1.21 2024/07/05 20:19:43 andvar Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
@@ -242,7 +242,7 @@ struct ohci_registers {
fwohcireg_t config_rom; /* config ROM map 0x34 */
fwohcireg_t post_wr_lo; /* post write addr lo 0x38 */
fwohcireg_t post_wr_hi; /* post write addr hi 0x3c */
- fwohcireg_t vender; /* vender ID 0x40 */
+ fwohcireg_t vendor; /* vendor ID 0x40 */
fwohcireg_t dummy1[3]; /* dummy 0x44-0x4c */
fwohcireg_t hcc_cntl_set; /* HCC control set 0x50 */
fwohcireg_t hcc_cntl_clr; /* HCC control clr 0x54 */
Index: src/usr.sbin/moused/moused.c
diff -u src/usr.sbin/moused/moused.c:1.31 src/usr.sbin/moused/moused.c:1.32
--- src/usr.sbin/moused/moused.c:1.31 Fri Mar 29 06:13:40 2024
+++ src/usr.sbin/moused/moused.c Fri Jul 5 20:19:43 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: moused.c,v 1.31 2024/03/29 06:13:40 rillig Exp $ */
+/* $NetBSD: moused.c,v 1.32 2024/07/05 20:19:43 andvar Exp $ */
/**
** Copyright (c) 1995 Michael Smith, All rights reserved.
**
@@ -48,7 +48,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: moused.c,v 1.31 2024/03/29 06:13:40 rillig Exp $");
+__RCSID("$NetBSD: moused.c,v 1.32 2024/07/05 20:19:43 andvar Exp $");
#endif /* not lint */
#include <ctype.h>
@@ -2580,7 +2580,7 @@ pnpparse(pnpid_t *id, char *buf, int len
id->revision = ((buf[1] & 0x3f) << 6) | (buf[2] & 0x3f);
debug("PnP rev %d.%02d", id->revision / 100, id->revision % 100);
- /* EISA vender and product ID */
+ /* EISA vendor and product ID */
id->eisaid = &buf[3];
id->neisaid = 7;
