ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix astyle format issue

pull/13142/head
Rajkumar Kanagaraj 2020-06-18 12:40:44 +01:00
parent 28e44ac6f8
commit 31bc95a742
4 changed files with 109 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
features/netsocket/emac-drivers/TARGET_Freescale_EMAC/kinetis_emac.cpp
View File

@ -134,10 +134,11 @@ void Kinetis_EMAC::tx_reclaim()
while ((tx_consume_index != tx_produce_index) && while ((tx_consume_index != tx_produce_index) &&
(!(g_handle.txBdDirty->control & ENET_BUFFDESCRIPTOR_TX_READY_MASK))) { (!(g_handle.txBdDirty->control & ENET_BUFFDESCRIPTOR_TX_READY_MASK))) {
memory_manager->free(tx_buff[tx_consume_index % ENET_TX_RING_LEN]); memory_manager->free(tx_buff[tx_consume_index % ENET_TX_RING_LEN]);
if (g_handle.txBdDirty->control & ENET_BUFFDESCRIPTOR_TX_WRAP_MASK) if (g_handle.txBdDirty->control & ENET_BUFFDESCRIPTOR_TX_WRAP_MASK) {
g_handle.txBdDirty = g_handle.txBdBase; g_handle.txBdDirty = g_handle.txBdBase;
else } else {
g_handle.txBdDirty++; g_handle.txBdDirty++;
}
tx_consume_index += 1; tx_consume_index += 1;
xTXDCountSem.release(); xTXDCountSem.release();
@ -166,8 +167,7 @@ void Kinetis_EMAC::tx_isr()
void Kinetis_EMAC::ethernet_callback(ENET_Type *base, enet_handle_t *handle, enet_event_t event, void *param) void Kinetis_EMAC::ethernet_callback(ENET_Type *base, enet_handle_t *handle, enet_event_t event, void *param)
{ {
Kinetis_EMAC *enet = static_cast<Kinetis_EMAC *>(param); Kinetis_EMAC *enet = static_cast<Kinetis_EMAC *>(param);
switch (event) switch (event) {
{
case kENET_RxEvent: case kENET_RxEvent:
enet->rx_isr(); enet->rx_isr();
break; break;
@ -193,13 +193,15 @@ bool Kinetis_EMAC::low_level_init_successful()
// Allocate RX descriptors // Allocate RX descriptors
rx_desc_start_addr = (uint8_t *)calloc(1, sizeof(enet_rx_bd_struct_t) * ENET_RX_RING_LEN + ENET_BUFF_ALIGNMENT); rx_desc_start_addr = (uint8_t *)calloc(1, sizeof(enet_rx_bd_struct_t) * ENET_RX_RING_LEN + ENET_BUFF_ALIGNMENT);
if(!rx_desc_start_addr) if (!rx_desc_start_addr) {
return false; return false;
}
// Allocate TX descriptors // Allocate TX descriptors
tx_desc_start_addr = (uint8_t *)calloc(1, sizeof(enet_tx_bd_struct_t) * ENET_TX_RING_LEN + ENET_BUFF_ALIGNMENT); tx_desc_start_addr = (uint8_t *)calloc(1, sizeof(enet_tx_bd_struct_t) * ENET_TX_RING_LEN + ENET_BUFF_ALIGNMENT);
if(!tx_desc_start_addr) if (!tx_desc_start_addr) {
return false; return false;
}
rx_desc_start_addr = (uint8_t *)ENET_ALIGN(rx_desc_start_addr, ENET_BUFF_ALIGNMENT); rx_desc_start_addr = (uint8_t *)ENET_ALIGN(rx_desc_start_addr, ENET_BUFF_ALIGNMENT);
tx_desc_start_addr = (uint8_t *)ENET_ALIGN(tx_desc_start_addr, ENET_BUFF_ALIGNMENT); tx_desc_start_addr = (uint8_t *)ENET_ALIGN(tx_desc_start_addr, ENET_BUFF_ALIGNMENT);
@ -207,8 +209,9 @@ bool Kinetis_EMAC::low_level_init_successful()
/* Create buffers for each receive BD */ /* Create buffers for each receive BD */
for (i = 0; i < ENET_RX_RING_LEN; i++) { for (i = 0; i < ENET_RX_RING_LEN; i++) {
rx_buff[i] = memory_manager->alloc_heap(ENET_ETH_MAX_FLEN, ENET_BUFF_ALIGNMENT); rx_buff[i] = memory_manager->alloc_heap(ENET_ETH_MAX_FLEN, ENET_BUFF_ALIGNMENT);
if (NULL == rx_buff[i]) if (NULL == rx_buff[i]) {
return false; return false;
}
rx_ptr[i] = (uint32_t *)memory_manager->get_ptr(rx_buff[i]); rx_ptr[i] = (uint32_t *)memory_manager->get_ptr(rx_buff[i]);
} }
@ -587,13 +590,15 @@ void Kinetis_EMAC::set_memory_manager(EMACMemoryManager &mem_mngr)
} }
Kinetis_EMAC &Kinetis_EMAC::get_instance() { Kinetis_EMAC &Kinetis_EMAC::get_instance()
{
static Kinetis_EMAC emac; static Kinetis_EMAC emac;
return emac; return emac;
} }
// Weak so a module can override // Weak so a module can override
MBED_WEAK EMAC &EMAC::get_default_instance() { MBED_WEAK EMAC &EMAC::get_default_instance()
{
return Kinetis_EMAC::get_instance(); return Kinetis_EMAC::get_instance();
} }

17
features/netsocket/emac-drivers/TARGET_NXP_EMAC/TARGET_IMX/imx_emac.cpp
View File

@ -136,10 +136,11 @@ void Kinetis_EMAC::tx_reclaim()
while ((tx_consume_index != tx_produce_index) && while ((tx_consume_index != tx_produce_index) &&
(!(g_handle.txBdDirty[0]->control & ENET_BUFFDESCRIPTOR_TX_READY_MASK))) { (!(g_handle.txBdDirty[0]->control & ENET_BUFFDESCRIPTOR_TX_READY_MASK))) {
memory_manager->free(tx_buff[tx_consume_index % ENET_TX_RING_LEN]); memory_manager->free(tx_buff[tx_consume_index % ENET_TX_RING_LEN]);
if (g_handle.txBdDirty[0]->control & ENET_BUFFDESCRIPTOR_TX_WRAP_MASK) if (g_handle.txBdDirty[0]->control & ENET_BUFFDESCRIPTOR_TX_WRAP_MASK) {
g_handle.txBdDirty[0] = g_handle.txBdBase[0]; g_handle.txBdDirty[0] = g_handle.txBdBase[0];
else } else {
g_handle.txBdDirty[0]++; g_handle.txBdDirty[0]++;
}
tx_consume_index += 1; tx_consume_index += 1;
xTXDCountSem.release(); xTXDCountSem.release();
@ -168,8 +169,7 @@ void Kinetis_EMAC::tx_isr()
void Kinetis_EMAC::ethernet_callback(ENET_Type *base, enet_handle_t *handle, enet_event_t event, void *param) void Kinetis_EMAC::ethernet_callback(ENET_Type *base, enet_handle_t *handle, enet_event_t event, void *param)
{ {
Kinetis_EMAC *enet = static_cast<Kinetis_EMAC *>(param); Kinetis_EMAC *enet = static_cast<Kinetis_EMAC *>(param);
switch (event) switch (event) {
{
case kENET_RxEvent: case kENET_RxEvent:
enet->rx_isr(); enet->rx_isr();
break; break;
@ -200,8 +200,9 @@ bool Kinetis_EMAC::low_level_init_successful()
for (i = 0; i < ENET_RX_RING_LEN; i++) { for (i = 0; i < ENET_RX_RING_LEN; i++) {
rx_buff[i] = memory_manager->alloc_heap(ENET_ALIGN(ENET_ETH_MAX_FLEN, ENET_BUFF_ALIGNMENT), rx_buff[i] = memory_manager->alloc_heap(ENET_ALIGN(ENET_ETH_MAX_FLEN, ENET_BUFF_ALIGNMENT),
ENET_BUFF_ALIGNMENT); ENET_BUFF_ALIGNMENT);
if (NULL == rx_buff[i]) if (NULL == rx_buff[i]) {
return false; return false;
}
rx_ptr[i] = (uint32_t *)memory_manager->get_ptr(rx_buff[i]); rx_ptr[i] = (uint32_t *)memory_manager->get_ptr(rx_buff[i]);
SCB_InvalidateDCache_by_Addr(rx_ptr[i], ENET_ALIGN(ENET_ETH_MAX_FLEN, ENET_BUFF_ALIGNMENT)); SCB_InvalidateDCache_by_Addr(rx_ptr[i], ENET_ALIGN(ENET_ETH_MAX_FLEN, ENET_BUFF_ALIGNMENT));
@ -591,13 +592,15 @@ void Kinetis_EMAC::set_memory_manager(EMACMemoryManager &mem_mngr)
} }
Kinetis_EMAC &Kinetis_EMAC::get_instance() { Kinetis_EMAC &Kinetis_EMAC::get_instance()
{
static Kinetis_EMAC emac; static Kinetis_EMAC emac;
return emac; return emac;
} }
// Weak so a module can override // Weak so a module can override
MBED_WEAK EMAC &EMAC::get_default_instance() { MBED_WEAK EMAC &EMAC::get_default_instance()
{
return Kinetis_EMAC::get_instance(); return Kinetis_EMAC::get_instance();
} }

18
features/netsocket/emac-drivers/TARGET_NXP_EMAC/TARGET_MCU_LPC546XX/lpc546xx_emac.cpp
View File

@ -145,8 +145,7 @@ void LPC546XX_EMAC::ethernet_callback(ENET_Type *base, enet_handle_t *handle, en
{ {
LPC546XX_EMAC *enet = static_cast<LPC546XX_EMAC *>(param); LPC546XX_EMAC *enet = static_cast<LPC546XX_EMAC *>(param);
switch (event) switch (event) {
{
case kENET_RxIntEvent: case kENET_RxIntEvent:
enet->rx_isr(); enet->rx_isr();
break; break;
@ -219,8 +218,9 @@ bool LPC546XX_EMAC::low_level_init_successful()
/* Create buffers for each receive BD */ /* Create buffers for each receive BD */
for (i = 0; i < ENET_RX_RING_LEN; i++) { for (i = 0; i < ENET_RX_RING_LEN; i++) {
rx_buff[i] = memory_manager->alloc_heap(buffCfg.rxBuffSizeAlign, ENET_BUFF_ALIGNMENT); rx_buff[i] = memory_manager->alloc_heap(buffCfg.rxBuffSizeAlign, ENET_BUFF_ALIGNMENT);
if (NULL == rx_buff[i]) if (NULL == rx_buff[i]) {
return false; return false;
}
rx_ptr[i] = (uint32_t)memory_manager->get_ptr(rx_buff[i]); rx_ptr[i] = (uint32_t)memory_manager->get_ptr(rx_buff[i]);
} }
@ -366,8 +366,7 @@ void LPC546XX_EMAC::packet_rx()
} }
/* Set command for rx when it is suspend. */ /* Set command for rx when it is suspend. */
if (suspend) if (suspend) {
{
ENET->DMA_CH[0].DMA_CHX_RXDESC_TAIL_PTR = ENET->DMA_CH[0].DMA_CHX_RXDESC_TAIL_PTR; ENET->DMA_CH[0].DMA_CHX_RXDESC_TAIL_PTR = ENET->DMA_CH[0].DMA_CHX_RXDESC_TAIL_PTR;
} }
} }
@ -440,7 +439,8 @@ bool LPC546XX_EMAC::link_out(emac_mem_buf_t *buf)
#define STATE_UNKNOWN (-1) #define STATE_UNKNOWN (-1)
int phy_link_status(void) { int phy_link_status(void)
{
bool connection_status; bool connection_status;
uint32_t phyAddr = 0; uint32_t phyAddr = 0;
@ -585,13 +585,15 @@ void LPC546XX_EMAC::set_memory_manager(EMACMemoryManager &mem_mngr)
} }
LPC546XX_EMAC &LPC546XX_EMAC::get_instance() { LPC546XX_EMAC &LPC546XX_EMAC::get_instance()
{
static LPC546XX_EMAC emac; static LPC546XX_EMAC emac;
return emac; return emac;
} }
// Weak so a module can override // Weak so a module can override
MBED_WEAK EMAC &EMAC::get_default_instance() { MBED_WEAK EMAC &EMAC::get_default_instance()
{
return LPC546XX_EMAC::get_instance(); return LPC546XX_EMAC::get_instance();
} }