git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3996 35acf78f-673a-0410-8e92-d51de3d6d3f4

2 files changed, 9 insertions, 9 deletions

diff --git a/os/hal/platforms/AT91SAM7/mac_lld.c b/os/hal/platforms/AT91SAM7/mac_lld.c
index 1e6852ebc..b4555194b 100644
--- a/os/hal/platforms/AT91SAM7/mac_lld.c
+++ b/os/hal/platforms/AT91SAM7/mac_lld.c
@@ -57,7 +57,7 @@
 /**

  * @brief   Ethernet driver 1.

  */

-MACDriver ETH1;

+MACDriver ETHD1;

 

 /*===========================================================================*/

 /* Driver local variables.                                                   */

@@ -100,9 +100,9 @@ static void serve_interrupt(void) {
   if ((isr & AT91C_EMAC_RCOMP) || (rsr & RSR_BITS)) {

     if (rsr & AT91C_EMAC_REC) {

       chSysLockFromIsr();

-      chSemResetI(&ETH1.rdsem, 0);

+      chSemResetI(&ETHD1.rdsem, 0);

 #if MAC_USE_EVENTS

-      chEvtBroadcastI(&ETH1.rdevent);

+      chEvtBroadcastI(&ETHD1.rdevent);

 #endif

       chSysUnlockFromIsr();

     }

@@ -112,7 +112,7 @@ static void serve_interrupt(void) {
   if ((isr & AT91C_EMAC_TCOMP) || (tsr & TSR_BITS)) {

     if (tsr & AT91C_EMAC_COMP) {

       chSysLockFromIsr();

-      chSemResetI(&ETH1.tdsem, 0);

+      chSemResetI(&ETHD1.tdsem, 0);

       chSysUnlockFromIsr();

     }

     AT91C_BASE_EMAC->EMAC_TSR = TSR_BITS;

@@ -177,12 +177,12 @@ CH_IRQ_HANDLER(irq_handler) {
 void mac_lld_init(void) {

 

   miiInit();

-  macObjectInit(&ETH1);

+  macObjectInit(&ETHD1);

 

   /*

    * Associated PHY initialization.

    */

-  miiReset(&ETH1);

+  miiReset(&ETHD1);

 

   /*

    * EMAC pins setup. Note, PB18 is not included because it is

@@ -248,8 +248,8 @@ void mac_lld_start(MACDriver *macp) {
    * PHY device identification.

    */

   AT91C_BASE_EMAC->EMAC_NCR |= AT91C_EMAC_MPE;

-  if ((miiGet(&ETH1, MII_PHYSID1) != (PHY_ID >> 16)) ||

-      ((miiGet(&ETH1, MII_PHYSID2) & 0xFFF0) != (PHY_ID & 0xFFF0)))

+  if ((miiGet(&ETHD1, MII_PHYSID1) != (PHY_ID >> 16)) ||

+      ((miiGet(&ETHD1, MII_PHYSID2) & 0xFFF0) != (PHY_ID & 0xFFF0)))

     chSysHalt();

   AT91C_BASE_EMAC->EMAC_NCR &= ~AT91C_EMAC_MPE;

 

diff --git a/os/hal/platforms/AT91SAM7/mac_lld.h b/os/hal/platforms/AT91SAM7/mac_lld.h
index 897c3cf0f..c89464ffa 100644
--- a/os/hal/platforms/AT91SAM7/mac_lld.h
+++ b/os/hal/platforms/AT91SAM7/mac_lld.h
@@ -218,7 +218,7 @@ typedef struct {
 /*===========================================================================*/

 

 #if !defined(__DOXYGEN__)

-extern MACDriver ETH1;

+extern MACDriver ETHD1;

 #endif

 

 #ifdef __cplusplus