[src/trunk]: src/sys/dev Remove the definition of BRGPHY_MII_1000CTL and use ...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f37de4600c0d
branches:  trunk
changeset: 447561:f37de4600c0d
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Jan 16 07:32:13 2019 +0000

description:
Remove the definition of BRGPHY_MII_1000CTL and use MII_GTCR.

diffstat:

 sys/dev/mii/brgphyreg.h |  10 +---------
 sys/dev/pci/if_bge.c    |   6 +++---
 2 files changed, 4 insertions(+), 12 deletions(-)

diffs (51 lines):

diff -r 72601bd54f0b -r f37de4600c0d sys/dev/mii/brgphyreg.h
--- a/sys/dev/mii/brgphyreg.h   Wed Jan 16 07:30:35 2019 +0000
+++ b/sys/dev/mii/brgphyreg.h   Wed Jan 16 07:32:13 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: brgphyreg.h,v 1.9 2014/06/17 21:37:20 msaitoh Exp $    */
+/*     $NetBSD: brgphyreg.h,v 1.10 2019/01/16 07:32:13 msaitoh Exp $   */
 
 /*
  * Copyright (c) 2000
@@ -41,14 +41,6 @@
  * Broadcom BCM5400 registers
  */
 
-#define BRGPHY_MII_1000CTL     0x09    /* 1000baseT control */
-#define        BRGPHY_1000CTL_TST      0xE000  /* Test modes */
-#define        BRGPHY_1000CTL_MSE      0x1000  /* Master/Slave enable */
-#define        BRGPHY_1000CTL_MSC      0x0800  /* Master/Slave configuration */
-#define        BRGPHY_1000CTL_RD       0x0400  /* Repeater/DTE */
-#define        BRGPHY_1000CTL_AFD      0x0200  /* Advertise full duplex */
-#define        BRGPHY_1000CTL_AHD      0x0100  /* Advertise half duplex */
-
 #define BRGPHY_MII_PHY_EXTCTL  0x10    /* PHY extended control */
 #define BRGPHY_PHY_EXTCTL_MAC_PHY      0x8000  /* 10BIT/GMI-interface */
 #define BRGPHY_PHY_EXTCTL_DIS_CROSS    0x4000  /* Disable MDI crossover */
diff -r 72601bd54f0b -r f37de4600c0d sys/dev/pci/if_bge.c
--- a/sys/dev/pci/if_bge.c      Wed Jan 16 07:30:35 2019 +0000
+++ b/sys/dev/pci/if_bge.c      Wed Jan 16 07:32:13 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_bge.c,v 1.320 2018/12/02 17:02:04 bouyer Exp $      */
+/*     $NetBSD: if_bge.c,v 1.321 2019/01/16 07:32:13 msaitoh Exp $     */
 
 /*
  * Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.320 2018/12/02 17:02:04 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.321 2019/01/16 07:32:13 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1393,7 +1393,7 @@
        int i;
 
        if (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5906 &&
-           (reg == BRGPHY_MII_1000CTL || reg == BRGPHY_MII_AUXCTL))
+           (reg == MII_GTCR || reg == BRGPHY_MII_AUXCTL))
                return;
 
        if (bge_ape_lock(sc, sc->bge_phy_ape_lock) != 0)