Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/pci No functional change to reduce diff against {Fre...



details:   https://anonhg.NetBSD.org/src/rev/0a4e86e40d56
branches:  trunk
changeset: 965163:0a4e86e40d56
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Tue Sep 03 14:29:26 2019 +0000

description:
No functional change to reduce diff against {Free,Open}BSD:
- Fix typo in comment.
- Modify white spaces.

diffstat:

 sys/dev/pci/if_alcreg.h |  24 ++++++++++++------------
 sys/dev/pci/if_alereg.h |   8 ++++----
 2 files changed, 16 insertions(+), 16 deletions(-)

diffs (107 lines):

diff -r b085bfbae731 -r 0a4e86e40d56 sys/dev/pci/if_alcreg.h
--- a/sys/dev/pci/if_alcreg.h   Tue Sep 03 14:26:55 2019 +0000
+++ b/sys/dev/pci/if_alcreg.h   Tue Sep 03 14:29:26 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_alcreg.h,v 1.6 2016/12/29 19:22:51 leot Exp $       */
+/*     $NetBSD: if_alcreg.h,v 1.7 2019/09/03 14:29:26 msaitoh Exp $    */
 /*     $OpenBSD: if_alcreg.h,v 1.1 2009/08/08 09:31:13 kevlo Exp $     */
 /*-
  * Copyright (c) 2009, Pyun YongHyeon <yongari%FreeBSD.org@localhost>
@@ -19,12 +19,12 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMATES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * 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 DAMATE.
+ * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/alc/if_alcreg.h,v 1.1 2009/06/10 02:07:58 yongari Exp $
  */
@@ -32,10 +32,10 @@
 #ifndef        _IF_ALCREG_H
 #define        _IF_ALCREG_H
 
-#define ALC_PCIR_BAR                   0x10
+#define        ALC_PCIR_BAR                    0x10
 
-#define ATHEROS_AR8152_B_V10           0xC0
-#define ATHEROS_AR8152_B_V11           0xC1
+#define        ATHEROS_AR8152_B_V10            0xC0
+#define        ATHEROS_AR8152_B_V11            0xC1
 
 /*
  * Atheros AR816x/AR817x revisions
@@ -100,12 +100,12 @@
 #define        PCIE_PHYMISC2_SERDES_CDR_SHIFT  16
 #define        PCIE_PHYMISC2_SERDES_TH_SHIFT   18
 
+#define        ALC_PDLL_TRNS1                  0x1104
+#define        PDLL_TRNS1_D3PLLOFF_ENB         0x00000800
+
 #define        ALC_TWSI_DEBUG                  0x1108
 #define        TWSI_DEBUG_DEV_EXIST            0x20000000
 
-#define        ALC_PDLL_TRNS1                  0x1104
-#define        PDLL_TRNS1_D3PLLOFF_ENB         0x00000800
-
 #define        ALC_EEPROM_CFG                  0x12C0
 #define        EEPROM_CFG_DATA_HI_MASK         0x0000FFFF
 #define        EEPROM_CFG_ADDR_MASK            0x03FF0000
@@ -148,7 +148,7 @@
 #define        PM_CFG_PM_REQ_TIMER_SHIFT       20
 #define        PM_CFG_LCKDET_TIMER_SHIFT       24
 
-#define PM_CFG_L0S_ENTRY_TIMER_DEFAULT 6
+#define        PM_CFG_L0S_ENTRY_TIMER_DEFAULT  6
 #define        PM_CFG_L1_ENTRY_TIMER_DEFAULT   1
 #define        PM_CFG_L1_ENTRY_TIMER_816X_DEFAULT      4
 #define        PM_CFG_LCKDET_TIMER_DEFAULT     12
@@ -480,7 +480,7 @@
 #define        ALC_SRAM_RX_FIFO_LEN            0x1524
 #define        SRAM_RX_FIFO_LEN_MASK           0x00000FFF
 #define        SRAM_RX_FIFO_LEN_SHIFT          0
- 
+
 #define        ALC_SRAM_TX_FIFO_ADDR           0x1528
 
 #define        ALC_SRAM_TX_FIFO_LEN            0x152C
@@ -639,7 +639,7 @@
  *     = 3212.
  */
 #define        RX_FIFO_PAUSE_816X_RSVD         3212
- 
+
 #define        ALC_RD_DMA_CFG                  0x15AC
 #define        RD_DMA_CFG_THRESH_MASK          0x00000FFF      /* 8 bytes unit */
 #define        RD_DMA_CFG_TIMER_MASK           0xFFFF0000
diff -r b085bfbae731 -r 0a4e86e40d56 sys/dev/pci/if_alereg.h
--- a/sys/dev/pci/if_alereg.h   Tue Sep 03 14:26:55 2019 +0000
+++ b/sys/dev/pci/if_alereg.h   Tue Sep 03 14:29:26 2019 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: if_alereg.h,v 1.2 2009/04/25 17:04:40 tsutsui Exp $    */
-/*     $OpenBSD: if_alereg.h,v 1.1 2009/02/25 03:05:32 kevlo Exp $     */
+/*     $NetBSD: if_alereg.h,v 1.3 2019/09/03 14:29:26 msaitoh Exp $    */
+/*     $OpenBSD: if_alereg.h,v 1.2 2011/05/20 08:36:55 kevlo Exp $     */
 
 /*-
  * Copyright (c) 2008, Pyun YongHyeon <yongari%FreeBSD.org@localhost>
@@ -20,12 +20,12 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMATES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * 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 DAMATE.
+ * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ale/if_alereg.h,v 1.1 2008/11/12 09:52:06 yongari Exp $
  */



Home | Main Index | Thread Index | Old Index