Module Name: src
Committed By: msaitoh
Date: Wed Aug 21 04:51:41 UTC 2019
Modified Files:
src/sys/arch/ews4800mips/include: sbd_tr2.h
src/sys/arch/mips/rmi: rmixl_iobus.c rmixl_iobusvar.h
src/sys/arch/x86/include: smbiosvar.h
src/sys/dev/ata: ata.c
Log Message:
Fix typo (s/controler/controller/).
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ews4800mips/include/sbd_tr2.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/rmi/rmixl_iobus.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mips/rmi/rmixl_iobusvar.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/x86/include/smbiosvar.h
cvs rdiff -u -r1.149 -r1.150 src/sys/dev/ata/ata.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/ews4800mips/include/sbd_tr2.h
diff -u src/sys/arch/ews4800mips/include/sbd_tr2.h:1.2 src/sys/arch/ews4800mips/include/sbd_tr2.h:1.3
--- src/sys/arch/ews4800mips/include/sbd_tr2.h:1.2 Mon Apr 28 20:23:18 2008
+++ src/sys/arch/ews4800mips/include/sbd_tr2.h Wed Aug 21 04:51:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sbd_tr2.h,v 1.2 2008/04/28 20:23:18 martin Exp $ */
+/* $NetBSD: sbd_tr2.h,v 1.3 2019/08/21 04:51:41 msaitoh Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -135,7 +135,7 @@
/* read operation invokes channel attention. */
#define ETHER_SETADDR_REG ((volatile uint32_t *)0xbb060000)
-/* DCC (DMA controler. Parallel port and FDD use this.) */
+/* DCC (DMA controller. Parallel port and FDD use this.) */
struct DCC {
uint32_t addr; /* DMA address */
uint32_t cnt; /* transfer count */
Index: src/sys/arch/mips/rmi/rmixl_iobus.c
diff -u src/sys/arch/mips/rmi/rmixl_iobus.c:1.4 src/sys/arch/mips/rmi/rmixl_iobus.c:1.5
--- src/sys/arch/mips/rmi/rmixl_iobus.c:1.4 Sun Sep 16 09:25:47 2018
+++ src/sys/arch/mips/rmi/rmixl_iobus.c Wed Aug 21 04:51:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_iobus.c,v 1.4 2018/09/16 09:25:47 skrll Exp $ */
+/* $NetBSD: rmixl_iobus.c,v 1.5 2019/08/21 04:51:41 msaitoh Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
/*
* RMI Peripherals IO Bus support
- * - interface to NOR, NAND, PCMCIA Memory controlers, &etc.
+ * - interface to NOR, NAND, PCMCIA Memory controllers, &etc.
* - manages the 10 Chip Selects
* - manages the "Flash" interrupts
* - manages the "Flash" errors
@@ -47,7 +47,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_iobus.c,v 1.4 2018/09/16 09:25:47 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_iobus.c,v 1.5 2019/08/21 04:51:41 msaitoh Exp $");
#include "locators.h"
@@ -73,7 +73,7 @@ typedef struct {
typedef struct rmixl_iobus_softc {
device_t sc_dev;
- bus_space_tag_t sc_obio_bst; /* for iobus device controler access */
+ bus_space_tag_t sc_obio_bst; /* for iobus device controller access */
bus_space_handle_t sc_obio_bsh; /* " " " " " */
bus_addr_t sc_obio_addr;
bus_size_t sc_obio_size;
Index: src/sys/arch/mips/rmi/rmixl_iobusvar.h
diff -u src/sys/arch/mips/rmi/rmixl_iobusvar.h:1.1 src/sys/arch/mips/rmi/rmixl_iobusvar.h:1.2
--- src/sys/arch/mips/rmi/rmixl_iobusvar.h:1.1 Fri Mar 18 01:04:09 2011
+++ src/sys/arch/mips/rmi/rmixl_iobusvar.h Wed Aug 21 04:51:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_iobusvar.h,v 1.1 2011/03/18 01:04:09 cliff Exp $ */
+/* $NetBSD: rmixl_iobusvar.h,v 1.2 2019/08/21 04:51:41 msaitoh Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -32,7 +32,7 @@
#define _RMIXL_IOBUSVAR_H_
struct rmixl_iobus_attach_args {
- bus_space_tag_t ia_obio_bst; /* for iobus controler access */
+ bus_space_tag_t ia_obio_bst; /* for iobus controller access */
bus_space_handle_t ia_obio_bsh; /* " " " " */
bus_space_tag_t ia_iobus_bst; /* for iobus access */
bus_addr_t ia_iobus_addr; /* device iobus address */
Index: src/sys/arch/x86/include/smbiosvar.h
diff -u src/sys/arch/x86/include/smbiosvar.h:1.5 src/sys/arch/x86/include/smbiosvar.h:1.6
--- src/sys/arch/x86/include/smbiosvar.h:1.5 Tue Dec 25 16:45:02 2018
+++ src/sys/arch/x86/include/smbiosvar.h Wed Aug 21 04:51:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: smbiosvar.h,v 1.5 2018/12/25 16:45:02 mlelstv Exp $ */
+/* $NetBSD: smbiosvar.h,v 1.6 2019/08/21 04:51:41 msaitoh Exp $ */
/*
* Copyright (c) 2006 Gordon Willem Klok <[email protected]>
* Copyright (c) 2005 Jordan Hargrave
@@ -153,8 +153,8 @@ struct smbios_struct_bios {
uint32_t charext;
uint8_t major_rel;
uint8_t minor_rel;
- uint8_t ecf_mjr_rel; /* embedded controler firmware */
- uint8_t ecf_min_rel; /* embedded controler firmware */
+ uint8_t ecf_mjr_rel; /* embedded controller firmware */
+ uint8_t ecf_min_rel; /* embedded controller firmware */
} __packed;
/*
Index: src/sys/dev/ata/ata.c
diff -u src/sys/dev/ata/ata.c:1.149 src/sys/dev/ata/ata.c:1.150
--- src/sys/dev/ata/ata.c:1.149 Sat May 25 16:30:18 2019
+++ src/sys/dev/ata/ata.c Wed Aug 21 04:51:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ata.c,v 1.149 2019/05/25 16:30:18 christos Exp $ */
+/* $NetBSD: ata.c,v 1.150 2019/08/21 04:51:41 msaitoh Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.149 2019/05/25 16:30:18 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.150 2019/08/21 04:51:41 msaitoh Exp $");
#include "opt_ata.h"
@@ -2232,7 +2232,7 @@ atabus_resume(device_t dv, const pmf_qua
struct ata_channel *chp = sc->sc_chan;
/*
- * XXX joerg: with wdc, the first channel unfreezes the controler.
+ * XXX joerg: with wdc, the first channel unfreezes the controller.
* Move this the reset and queue idling into wdc.
*/
ata_channel_lock(chp);
