CVS commit: src/sys/dev/mii

[SAITOH Masanobu]

Module Name:    src
Committed By:   msaitoh
Date:           Mon Feb 25 07:36:16 UTC 2019

Modified Files:
        src/sys/dev/mii: mii.h rgephy.c

Log Message:
 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}.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/mii/mii.h
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/mii/rgephy.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/dev/mii/mii.h
diff -u src/sys/dev/mii/mii.h:1.25 src/sys/dev/mii/mii.h:1.26
--- src/sys/dev/mii/mii.h:1.25	Wed Jan 16 08:32:24 2019
+++ src/sys/dev/mii/mii.h	Mon Feb 25 07:36:16 2019
@@ -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 */
 

Index: src/sys/dev/mii/rgephy.c
diff -u src/sys/dev/mii/rgephy.c:1.49 src/sys/dev/mii/rgephy.c:1.50
--- src/sys/dev/mii/rgephy.c:1.49	Mon Feb 25 06:59:37 2019
+++ src/sys/dev/mii/rgephy.c	Mon Feb 25 07:36:16 2019
@@ -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 @@ rgephy_reset(struct mii_softc *sc)
 		/* 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);
 	}
 }