Module Name: src
Committed By: msaitoh
Date: Wed Dec 11 07:33:55 UTC 2019
Modified Files:
src/sys/dev/mii: ikphyreg.h inbmphyreg.h
src/sys/dev/pci: pci_subr.c pcireg.h
Log Message:
s/enalbe/enable/
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/mii/ikphyreg.h
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/mii/inbmphyreg.h
cvs rdiff -u -r1.217 -r1.218 src/sys/dev/pci/pci_subr.c
cvs rdiff -u -r1.147 -r1.148 src/sys/dev/pci/pcireg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/mii/ikphyreg.h
diff -u src/sys/dev/mii/ikphyreg.h:1.3 src/sys/dev/mii/ikphyreg.h:1.4
--- src/sys/dev/mii/ikphyreg.h:1.3 Fri Oct 28 05:50:18 2016
+++ src/sys/dev/mii/ikphyreg.h Wed Dec 11 07:33:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ikphyreg.h,v 1.3 2016/10/28 05:50:18 msaitoh Exp $ */
+/* $NetBSD: ikphyreg.h,v 1.4 2019/12/11 07:33:55 msaitoh Exp $ */
/*******************************************************************************
Copyright (c) 2001-2005, Intel Corporation
All rights reserved.
@@ -57,7 +57,7 @@ POSSIBILITY OF SUCH DAMAGE.
#define GG82563_PSCR_CROSSOVER_MODE_MDI 0x0000 /* 00=Manual MDI configuration */
#define GG82563_PSCR_CROSSOVER_MODE_MDIX 0x0020 /* 01=Manual MDIX configuration */
#define GG82563_PSCR_CROSSOVER_MODE_AUTO 0x0060 /* 11=Automatic crossover */
-#define GG82563_PSCR_ENALBE_EXTENDED_DISTANCE 0x0080 /* 1=Enable Extended Distance */
+#define GG82563_PSCR_ENABLE_EXTENDED_DISTANCE 0x0080 /* 1=Enable Extended Distance */
#define GG82563_PSCR_ENERGY_DETECT_MASK 0x0300
#define GG82563_PSCR_ENERGY_DETECT_OFF 0x0000 /* 00,01=Off */
#define GG82563_PSCR_ENERGY_DETECT_RX 0x0200 /* 10=Sense on Rx only (Energy Detect) */
Index: src/sys/dev/mii/inbmphyreg.h
diff -u src/sys/dev/mii/inbmphyreg.h:1.18 src/sys/dev/mii/inbmphyreg.h:1.19
--- src/sys/dev/mii/inbmphyreg.h:1.18 Thu Jan 31 15:30:23 2019
+++ src/sys/dev/mii/inbmphyreg.h Wed Dec 11 07:33:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: inbmphyreg.h,v 1.18 2019/01/31 15:30:23 msaitoh Exp $ */
+/* $NetBSD: inbmphyreg.h,v 1.19 2019/12/11 07:33:55 msaitoh Exp $ */
/*******************************************************************************
Copyright (c) 2001-2015, Intel Corporation
All rights reserved.
@@ -68,7 +68,7 @@ POSSIBILITY OF SUCH DAMAGE.
#define BME1000_PSCR_CROSSOVER_MODE_MDI 0x0000 /* 00=Manual MDI configuration */
#define BME1000_PSCR_CROSSOVER_MODE_MDIX 0x0020 /* 01=Manual MDIX configuration */
#define BME1000_PSCR_CROSSOVER_MODE_AUTO 0x0060 /* 11=Automatic crossover */
-#define BME1000_PSCR_ENALBE_EXTENDED_DISTANCE 0x0080 /* 1=Enable Extended Distance */
+#define BME1000_PSCR_ENABLE_EXTENDED_DISTANCE 0x0080 /* 1=Enable Extended Distance */
#define BME1000_PSCR_ENERGY_DETECT_MASK 0x0300
#define BME1000_PSCR_ENERGY_DETECT_OFF 0x0000 /* 00,01=Off */
#define BME1000_PSCR_ENERGY_DETECT_RX 0x0200 /* 10=Sense on Rx only (Energy Detect) */
Index: src/sys/dev/pci/pci_subr.c
diff -u src/sys/dev/pci/pci_subr.c:1.217 src/sys/dev/pci/pci_subr.c:1.218
--- src/sys/dev/pci/pci_subr.c:1.217 Fri Sep 20 10:04:45 2019
+++ src/sys/dev/pci/pci_subr.c Wed Dec 11 07:33:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_subr.c,v 1.217 2019/09/20 10:04:45 msaitoh Exp $ */
+/* $NetBSD: pci_subr.c,v 1.218 2019/12/11 07:33:55 msaitoh Exp $ */
/*
* Copyright (c) 1997 Zubin D. Dittia. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.217 2019/09/20 10:04:45 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.218 2019/12/11 07:33:55 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@@ -3531,7 +3531,7 @@ pci_conf_print_page_req_cap(const pcireg
ctl = reg & 0xffff;
sta = reg >> 16;
printf(" Control Register: 0x%04x\n", ctl);
- onoff("Enalbe", reg, PCI_PAGE_REQ_CTL_E);
+ onoff("Enable", reg, PCI_PAGE_REQ_CTL_E);
onoff("Reset", reg, PCI_PAGE_REQ_CTL_R);
printf(" Status Register: 0x%04x\n", sta);
Index: src/sys/dev/pci/pcireg.h
diff -u src/sys/dev/pci/pcireg.h:1.147 src/sys/dev/pci/pcireg.h:1.148
--- src/sys/dev/pci/pcireg.h:1.147 Fri Mar 1 09:26:00 2019
+++ src/sys/dev/pci/pcireg.h Wed Dec 11 07:33:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pcireg.h,v 1.147 2019/03/01 09:26:00 msaitoh Exp $ */
+/* $NetBSD: pcireg.h,v 1.148 2019/12/11 07:33:55 msaitoh Exp $ */
/*
* Copyright (c) 1995, 1996, 1999, 2000
@@ -1886,7 +1886,7 @@ struct pci_rom {
* Page Request
*/
#define PCI_PAGE_REQ_CTL 0x04 /* Control Register */
-#define PCI_PAGE_REQ_CTL_E __BIT(0) /* Enalbe */
+#define PCI_PAGE_REQ_CTL_E __BIT(0) /* Enable */
#define PCI_PAGE_REQ_CTL_R __BIT(1) /* Reset */
#define PCI_PAGE_REQ_STA 0x04 /* Status Register */
#define PCI_PAGE_REQ_STA_RF __BIT(0+16) /* Response Failure */
