I2C. Merged code from trunk.

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

1 files changed, 24 insertions, 23 deletions

diff --git a/os/hal/platforms/AT91SAM7/mac_lld.c b/os/hal/platforms/AT91SAM7/mac_lld.c
index ee71b2e23..43055b94d 100644
--- a/os/hal/platforms/AT91SAM7/mac_lld.c
+++ b/os/hal/platforms/AT91SAM7/mac_lld.c
@@ -1,5 +1,6 @@
 /*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010 Giovanni Di Sirio.

+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

+                 2011 Giovanni Di Sirio.

 

     This file is part of ChibiOS/RT.

 

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

     if (rsr & AT91C_EMAC_REC) {

       chSysLockFromIsr();

-      chSemResetI(&ETH1.md_rdsem, 0);

+      chSemResetI(&ETH1.rdsem, 0);

 #if CH_USE_EVENTS

-      chEvtBroadcastI(&ETH1.md_rdevent);

+      chEvtBroadcastI(&ETH1.rdevent);

 #endif

       chSysUnlockFromIsr();

     }

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

     if (tsr & AT91C_EMAC_COMP) {

       chSysLockFromIsr();

-      chSemResetI(&ETH1.md_tdsem, 0);

+      chSemResetI(&ETH1.tdsem, 0);

       chSysUnlockFromIsr();

     }

     AT91C_BASE_EMAC->EMAC_TSR = TSR_BITS;

@@ -291,9 +292,9 @@ msg_t max_lld_get_transmit_descriptor(MACDriver *macp,
   else

     edp->w2 = W2_T_LOCKED | W2_T_USED | W2_T_LAST_BUFFER;

   chSysUnlock();

-  tdp->td_offset = 0;

-  tdp->td_size = EMAC_TRANSMIT_BUFFERS_SIZE;

-  tdp->td_physdesc = edp;

+  tdp->offset = 0;

+  tdp->size = EMAC_TRANSMIT_BUFFERS_SIZE;

+  tdp->physdesc = edp;

   return RDY_OK;

 }

 

@@ -315,13 +316,13 @@ size_t mac_lld_write_transmit_descriptor(MACTransmitDescriptor *tdp,
                                          uint8_t *buf,

                                          size_t size) {

 

-  if (size > tdp->td_size - tdp->td_offset)

-    size = tdp->td_size - tdp->td_offset;

+  if (size > tdp->size - tdp->offset)

+    size = tdp->size - tdp->offset;

   if (size > 0) {

-    memcpy((uint8_t *)(tdp->td_physdesc->w1 & W1_T_ADDRESS_MASK) +

-                      tdp->td_offset,

+    memcpy((uint8_t *)(tdp->physdesc->w1 & W1_T_ADDRESS_MASK) +

+                      tdp->offset,

            buf, size);

-    tdp->td_offset += size;

+    tdp->offset += size;

   }

   return size;

 }

@@ -337,9 +338,9 @@ size_t mac_lld_write_transmit_descriptor(MACTransmitDescriptor *tdp,
 void mac_lld_release_transmit_descriptor(MACTransmitDescriptor *tdp) {

 

   chSysLock();

-  tdp->td_physdesc->w2 = (tdp->td_physdesc->w2 &

+  tdp->physdesc->w2 = (tdp->physdesc->w2 &

                           ~(W2_T_LOCKED | W2_T_USED | W2_T_LENGTH_MASK)) |

-                         tdp->td_offset;

+                         tdp->offset;

   AT91C_BASE_EMAC->EMAC_NCR |= AT91C_EMAC_TSTART;

   chSysUnlock();

 }

@@ -400,9 +401,9 @@ restart:
      * End Of Frame found.

      */

     if (rxptr->w2 & W2_R_FRAME_END) {

-      rdp->rd_offset = 0;

-      rdp->rd_size = rxptr->w2 & W2_T_LENGTH_MASK;

-      rdp->rd_physdesc = edp;

+      rdp->offset = 0;

+      rdp->size = rxptr->w2 & W2_T_LENGTH_MASK;

+      rdp->physdesc = edp;

       return RDY_OK;

     }

 

@@ -435,11 +436,11 @@ restart:
 size_t mac_lld_read_receive_descriptor(MACReceiveDescriptor *rdp,

                                          uint8_t *buf,

                                          size_t size) {

-  if (size > rdp->rd_size - rdp->rd_offset)

-    size = rdp->rd_size - rdp->rd_offset;

+  if (size > rdp->size - rdp->offset)

+    size = rdp->size - rdp->offset;

   if (size > 0) {

-    uint8_t *src = (uint8_t *)(rdp->rd_physdesc->w1 & W1_R_ADDRESS_MASK) +

-                   rdp->rd_offset;

+    uint8_t *src = (uint8_t *)(rdp->physdesc->w1 & W1_R_ADDRESS_MASK) +

+                   rdp->offset;

     uint8_t *limit = &rb[EMAC_RECEIVE_DESCRIPTORS * EMAC_RECEIVE_BUFFERS_SIZE];

     if (src >= limit)

       src -= EMAC_RECEIVE_DESCRIPTORS * EMAC_RECEIVE_BUFFERS_SIZE;

@@ -449,7 +450,7 @@ size_t mac_lld_read_receive_descriptor(MACReceiveDescriptor *rdp,
     }

     else

       memcpy(buf, src, size);

-    rdp->rd_offset += size;

+    rdp->offset += size;

   }

   return size;

 }

@@ -465,7 +466,7 @@ size_t mac_lld_read_receive_descriptor(MACReceiveDescriptor *rdp,
  */

 void mac_lld_release_receive_descriptor(MACReceiveDescriptor *rdp) {

   bool_t done;

-  EMACDescriptor *edp = rdp->rd_physdesc;

+  EMACDescriptor *edp = rdp->physdesc;

 

   unsigned n = EMAC_RECEIVE_DESCRIPTORS;

   do {