Revision 204:92d082577917, committed 2014-05-21

Comitter:

mbed_official

Date:

Wed May 21 23:15:06 2014 +0100

Parent:

203:0f54f988aa69

Child:

205:c41fc65bcfb4

Commit message:

Synchronized with git revision 3c2119fab6f21f7d8fdce8bd96665bbaf8e5beec

Full URL: https://github.com/mbedmicro/mbed/commit/3c2119fab6f21f7d8fdce8bd96665bbaf8e5beec/

Signed-off-by: Sergio Scaglia <sergio.scaglia@arm.com>

Changed in this revision

--- a/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_KPSDK_CODE/hal/enet/fsl_enet_hal.c	Wed May 21 15:15:06 2014 +0100
+++ b/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_KPSDK_CODE/hal/enet/fsl_enet_hal.c	Wed May 21 23:15:06 2014 +0100
@@ -144,12 +144,12 @@
 {
     assert(instance < HW_ENET_INSTANCE_COUNT);
     assert(thresholdCfg);
-    assert(thresholdCfg->txFifoWrite <= BM_ENET_TFWR_TFWR);
 
     BW_ENET_TFWR_STRFWD(instance, thresholdCfg->isStoreForwardEnabled);   /* Set store and forward mode*/
     if(!thresholdCfg->isStoreForwardEnabled)
     {
         BW_ENET_TFWR_TFWR(instance, thresholdCfg->txFifoWrite);  /* Set transmit FIFO write bytes*/
+        assert(thresholdCfg->txFifoWrite <= BM_ENET_TFWR_TFWR);
     }
     BW_ENET_TSEM_TX_SECTION_EMPTY(instance,thresholdCfg->txEmpty);       /* Set transmit FIFO empty threshold*/
     BW_ENET_TAEM_TX_ALMOST_EMPTY(instance,thresholdCfg->txAlmostEmpty);  /* Set transmit FIFO almost empty threshold*/

--- a/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_KPSDK_CODE/hal/enet/fsl_enet_hal.h	Wed May 21 15:15:06 2014 +0100
+++ b/targets/hal/TARGET_Freescale/TARGET_KPSDK_MCUS/TARGET_KPSDK_CODE/hal/enet/fsl_enet_hal.h	Wed May 21 23:15:06 2014 +0100
@@ -345,7 +345,7 @@
     uint16_t  reserved3;
     uint16_t  reserved4;
 } enet_bd_struct_t;
-
+#define TX_DESC_UPDATED_MASK  (0x8000)
 #else
 /*! @brief Defines the buffer descriptors structure for the Big-Endian system.*/
 typedef struct ENETBdStruct
@@ -366,6 +366,7 @@
     uint16_t  reserved3;
     uint16_t  reserved4;
 } enet_bd_struct_t;
+#define TX_DESC_UPDATED_MASK  (0x0080)
 #endif
 
 /*! @brief Defines the configuration structure for the 1588 PTP timer.*/