You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2021/11/30 16:44:50 UTC

[incubator-nuttx] branch master updated (7f11255 -> 46c36e2)

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.


    from 7f11255  fix overflow checks in mtdpart
     new 0e327b1  added special registers of KSZ8061 ethernet phy
     new 46c36e2  c++ style comment

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 include/nuttx/net/mii.h | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

[incubator-nuttx] 02/02: c++ style comment

Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit 46c36e260366340d3f6809d7e6a998e18f1955a4
Author: Simon Filgis <si...@ingenieurbuero-filgis.de>
AuthorDate: Tue Nov 30 16:31:12 2021 +0100

    c++ style comment
---
 include/nuttx/net/mii.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/nuttx/net/mii.h b/include/nuttx/net/mii.h
index 50294e1..dd07c07 100644
--- a/include/nuttx/net/mii.h
+++ b/include/nuttx/net/mii.h
@@ -128,7 +128,6 @@
 #define MII_KSZ8061_OP_MODE            0x16   /* Operation Mode */
 #define MII_KSZ8061_OP_MODE_STRAP_STAT 0x17   /* Operation Mode Strap Status */
 #define MII_KSZ8061_EXP_CTRL           0x18   /* Expanded Control */
-//#define MII_KSZ8061_RESERVED         0x19   /* - 1Ah Reserved */
 #define MII_KSZ8061_INTR_CTRL_STAT     0x1B   /* Interrupt Control/Status */
 #define MII_KSZ8061_FUNC_CTRL          0x1C   /* Function Control */
 #define MII_KSZ8061_LINKMD_CTRL_STAT   0x1D   /* LinkMD® Control/Status */

[incubator-nuttx] 01/02: added special registers of KSZ8061 ethernet phy

Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit 0e327b18c0dceb0a0320c67bad4fa3b81eec543c
Author: Simon Filgis <si...@ingenieurbuero-filgis.de>
AuthorDate: Tue Nov 30 16:14:15 2021 +0100

    added special registers of KSZ8061 ethernet phy
---
 include/nuttx/net/mii.h | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/include/nuttx/net/mii.h b/include/nuttx/net/mii.h
index 64ab1f2..50294e1 100644
--- a/include/nuttx/net/mii.h
+++ b/include/nuttx/net/mii.h
@@ -118,6 +118,23 @@
 #define MII_KSZ8051_PHYCTRL1         0x1e      /* PHY Control 1 */
 #define MII_KSZ8051_PHYCTRL2         0x1f      /* PHY Control 2 */
 
+/* Micrel KSZ8061:  0x10-0x18, 0x1b, 0x1c-0x1f */
+#define MII_KSZ8061_DIG_CTRL           0x10   /* Digital Control */
+#define MII_KSZ8061_AFE_CTRL_0         0x11   /* AFE Control 0 */
+#define MII_KSZ8061_AFE_CTRL_1         0x12   /* AFE Control 1 */
+#define MII_KSZ8061_AFE_CTRL_2         0x13   /* AFE Control 2 */
+#define MII_KSZ8061_AFE_CTRL_3         0x14   /* AFE Control 3 */
+#define MII_KSZ8061_RXER_CNTR          0x15   /* RXER Counter */
+#define MII_KSZ8061_OP_MODE            0x16   /* Operation Mode */
+#define MII_KSZ8061_OP_MODE_STRAP_STAT 0x17   /* Operation Mode Strap Status */
+#define MII_KSZ8061_EXP_CTRL           0x18   /* Expanded Control */
+//#define MII_KSZ8061_RESERVED         0x19   /* - 1Ah Reserved */
+#define MII_KSZ8061_INTR_CTRL_STAT     0x1B   /* Interrupt Control/Status */
+#define MII_KSZ8061_FUNC_CTRL          0x1C   /* Function Control */
+#define MII_KSZ8061_LINKMD_CTRL_STAT   0x1D   /* LinkMD® Control/Status */
+#define MII_KSZ8061_PHY_CTRL_1         0x1E   /* PHY Control 1 */
+#define MII_KSZ8061_PHY_CTRL_2         0x1F   /* PHY Control 2 */
+
 /* Micrel KSZ8081:  0x10-0x11, 0x15-0x18, 0x1b, 0x1d-0x1f */
 
 #define MII_KSZ8081_DRCTRL           0x10      /* Digital Reserve Control */