[src/trunk]: src/sys/dev/mii MMDACR_FN_{DATANPI, DATAPIRW, DATAPIW} are little ...

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

details:   https://anonhg.NetBSD.org/src/rev/4057c3d73a15
branches:  trunk
changeset: 449186:4057c3d73a15
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon Feb 25 07:36:16 2019 +0000

description:
MMDACR_FN_{DATANPI,DATAPIRW,DATAPIW} are little hard to identify and might be
misread, so rename them to MMDACR_FN_{DATA,DATA_INC_RW,DATA_INC_W}.

diffstat:

 sys/dev/mii/mii.h    |  8 ++++----
 sys/dev/mii/rgephy.c |  6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (49 lines):

diff -r 396f1fce81e3 -r 4057c3d73a15 sys/dev/mii/mii.h
--- a/sys/dev/mii/mii.h Mon Feb 25 07:31:32 2019 +0000
+++ b/sys/dev/mii/mii.h Mon Feb 25 07:36:16 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mii.h,v 1.25 2019/01/16 08:32:24 msaitoh Exp $ */
+/*     $NetBSD: mii.h,v 1.26 2019/02/25 07:36:16 msaitoh Exp $ */
 
 /*
  * Copyright (c) 1997 Manuel Bouyer.  All rights reserved.
@@ -292,9 +292,9 @@
 #define        MMDACR_FUNCMASK 0xc000  /* function */
 #define        MMDACR_DADDRMASK 0x001f /* device address */
 #define        MMDACR_FN_ADDRESS       (0 << 14) /* address */
-#define        MMDACR_FN_DATANPI       (1 << 14) /* data, no post increment */
-#define        MMDACR_FN_DATAPIRW      (2 << 14) /* data, post increment on r/w */
-#define        MMDACR_FN_DATAPIW       (3 << 14) /* data, post increment on wr only */
+#define        MMDACR_FN_DATA          (1 << 14) /* data, no post increment */
+#define        MMDACR_FN_DATA_INC_RW   (2 << 14) /* data, post increment on r/w */
+#define        MMDACR_FN_DATA_INC_W    (3 << 14) /* data, post increment on wr only */
 
 #define        MII_MMDAADR     0x0e    /* MMD access address data register */
 
diff -r 396f1fce81e3 -r 4057c3d73a15 sys/dev/mii/rgephy.c
--- a/sys/dev/mii/rgephy.c      Mon Feb 25 07:31:32 2019 +0000
+++ b/sys/dev/mii/rgephy.c      Mon Feb 25 07:36:16 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rgephy.c,v 1.49 2019/02/25 06:59:37 msaitoh Exp $      */
+/*     $NetBSD: rgephy.c,v 1.50 2019/02/25 07:36:16 msaitoh Exp $      */
 
 /*
  * Copyright (c) 2003
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1.49 2019/02/25 06:59:37 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rgephy.c,v 1.50 2019/02/25 07:36:16 msaitoh Exp $");
 
 
 /*
@@ -702,7 +702,7 @@
                /* disable EEE */
                PHY_WRITE(sc, MII_MMDACR, MMDACR_FN_ADDRESS | MDIO_MMD_AN);
                PHY_WRITE(sc, MII_MMDAADR, MDIO_AN_EEEADVERT);
-               PHY_WRITE(sc, MII_MMDACR, MMDACR_FN_DATANPI | MDIO_MMD_AN);
+               PHY_WRITE(sc, MII_MMDACR, MMDACR_FN_DATA | MDIO_MMD_AN);
                PHY_WRITE(sc, MII_MMDAADR, 0x0000);
        }
 }