English

Diff: core/driver/ethernet/lpc17xx/EtherDev_DP83848C.c

Revision:

69:8c5f220441f5

Parent:

68:f7def7eb5504

Child:

92:4f77028cce64

--- a/core/driver/ethernet/lpc17xx/EtherDev_DP83848C.c	Thu May 22 12:59:50 2014 +0000
+++ b/core/driver/ethernet/lpc17xx/EtherDev_DP83848C.c	Thu May 29 14:29:15 2014 +0000
@@ -100,7 +100,7 @@
 #define PHY_HALFD_10M       0x0000      /* Half Duplex 10MBit                */
 #define PHY_AUTO_NEG        0x3000      /* Select Auto Negotiation           */
 #define PHY_AUTO_NEG_COMPLETE 0x0020    /* Auto negotiation have finished.   */
-#define ETHDEV_PHY_DEF_ADR    0x0100      /* Default PHY device address        */
+//#define ETHDEV_PHY_DEF_ADR    0x0100      /* Default PHY device address        */
 
 
 #ifndef configEMAC_INTERRUPT_PRIORITY
@@ -116,16 +116,7 @@
 /* Hardware specific bit definitions. */
 #define emacPINSEL2_VALUE           ( 0x50150105 )
 
-/* If no buffers are available, then wait this long before looking again.... */
-#define emacBUFFER_WAIT_DELAY_MS 3
-#define emacBUFFER_WAIT_EMPTY_MS 10
 
-/* ...and don't look more than this many times. */
-#define emacBUFFER_WAIT_ATTEMPTS    ( 30 )
-
-/* Index to the Tx descriptor that is always used first for every Tx.  The second
-descriptor is then used to re-send in order to speed up the uIP Tx process. */
-#define emacTX_DESC_INDEX           ( 0 )
 
 /*-----------------------------------------------------------*/
 
@@ -138,15 +129,8 @@
  * parameters.
  */
 static NyLPC_TBool prvSetupLinkStatus( void );
-/*
- * Send lValue to the lPhyReg within the PHY.
- */
-static NyLPC_TBool prvWritePHY( long lPhyReg, long lValue );
-/*
- * Read a value from ucPhyReg within the PHY.  *plStatus will be set to
- * pdFALSE if there is an error.
- */
-static unsigned short prvReadPHY( unsigned int ucPhyReg, long *plStatus );
+
+
 
 
 
@@ -189,8 +173,8 @@
     //Reset MCU Interface. and wait for reset.
     prvSetupEMACHardware();
     //Check peripheral name
-    ulID1 = prvReadPHY( PHY_REG_IDR1, &lReturn );
-    ulID2 = prvReadPHY( PHY_REG_IDR2, &lReturn );
+    ulID1 = EthDev_LPC17xx_prvReadPHY( PHY_REG_IDR1, &lReturn );
+    ulID2 = EthDev_LPC17xx_prvReadPHY( PHY_REG_IDR2, &lReturn );
     if( ( (ulID1 << 16UL ) | ( ulID2 & 0xFFF0UL ) ) != DP83848C_ID)
     {
         return NyLPC_TBool_FALSE;
@@ -332,14 +316,14 @@
     LPC_EMAC->SUPP = SUPP_SPEED;
 
     /* Put the PHY in reset mode */
-    prvWritePHY( PHY_REG_BMCR, MCFG_RES_MII );
+    EthDev_LPC17xx_prvWritePHY( PHY_REG_BMCR, MCFG_RES_MII );
     NyLPC_cThread_sleep( emacSHORT_DELAY_MS * 5);
 
     /* Wait for hardware reset to end. */
     for( x = 0; x < 100; x++ )
     {
         NyLPC_cThread_sleep( emacSHORT_DELAY_MS * 5 );
-        us = prvReadPHY( PHY_REG_BMCR, &lDummy );
+        us = EthDev_LPC17xx_prvReadPHY( PHY_REG_BMCR, &lDummy );
         if( !( us & MCFG_RES_MII ) )
         {
             /* Reset complete */
@@ -347,70 +331,6 @@
         }
     }
 }
-/*-----------------------------------------------------------*/
-
-
-/*-----------------------------------------------------------*/
-
-static NyLPC_TBool prvWritePHY( long lPhyReg, long lValue )
-{
-    const long lMaxTime = 10;
-    long x;
-
-    LPC_EMAC->MCMD = 0;
-    LPC_EMAC->MADR = ETHDEV_PHY_DEF_ADR | lPhyReg;
-    LPC_EMAC->MWTD = lValue;
-
-    for( x = 0; x < lMaxTime; x++ )
-    {
-        if( ( LPC_EMAC->MIND & MIND_BUSY ) == 0 )
-        {
-            /* Operation has finished. */
-            break;
-        }
-
-        NyLPC_cThread_sleep( emacSHORT_DELAY_MS );
-    }
-
-    if( x < lMaxTime )
-    {
-        return NyLPC_TBool_TRUE;
-    }
-    else
-    {
-        return NyLPC_TBool_FALSE;
-    }
-}
-/*-----------------------------------------------------------*/
-
-static unsigned short prvReadPHY( unsigned int ucPhyReg, NyLPC_TBool* plStatus )
-{
-    long x;
-    const long lMaxTime = 10;
-
-    LPC_EMAC->MCMD = 1;
-    LPC_EMAC->MADR = ETHDEV_PHY_DEF_ADR | ucPhyReg;
-    LPC_EMAC->MCMD = MCMD_READ;
-
-    for( x = 0; x < lMaxTime; x++ )
-    {
-        /* Operation has finished. */
-        if( ( LPC_EMAC->MIND & MIND_BUSY ) == 0 )
-        {
-            break;
-        }
-        NyLPC_cThread_sleep( emacSHORT_DELAY_MS );
-    }
-
-    LPC_EMAC->MCMD = 0;
-
-    if( x >= lMaxTime )
-    {
-        *plStatus = NyLPC_TBool_FALSE;
-    }
-
-    return( LPC_EMAC->MRDD );
-}
 /*------------------------------------------------
  * Private function depend on device.
  * デバイス依存部分
@@ -431,13 +351,13 @@
     NyLPC_TBool lDummy;
 
     /* Auto negotiate the configuration. */
-    if( prvWritePHY( PHY_REG_BMCR, PHY_AUTO_NEG ) )
+    if( EthDev_LPC17xx_prvWritePHY( PHY_REG_BMCR, PHY_AUTO_NEG ) )
     {
         NyLPC_cThread_sleep( emacSHORT_DELAY_MS * 5 );
 
         for( x = 0; x < 10; x++ )
         {
-            us = prvReadPHY( PHY_REG_BMSR, &lDummy );
+            us = EthDev_LPC17xx_prvReadPHY( PHY_REG_BMSR, &lDummy );
 
             if( us & PHY_AUTO_NEG_COMPLETE )
             {
@@ -458,7 +378,7 @@
     /* Wait with timeout for the link to be established. */
     for( x = 0; x < 10; x++ )
     {
-        usLinkStatus = prvReadPHY( PHY_REG_STS, &lReturn );
+        usLinkStatus = EthDev_LPC17xx_prvReadPHY( PHY_REG_STS, &lReturn );
         if( usLinkStatus & emacLINK_ESTABLISHED )
         {
             /* Link is established. */
@@ -517,4 +437,3 @@
 }
 
 #endif
-