Skip to content

Commit 31bc95a

Browse files
rajkan01rajkan01
committed
Fix astyle format issue
1 parent 28e44ac commit 31bc95a

File tree

4 files changed

+115
-105
lines changed

4 files changed

+115
-105
lines changed

‎features/netsocket/emac-drivers/TARGET_Freescale_EMAC/kinetis_emac.cpp

Lines changed: 47 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -127,24 +127,25 @@ static void update_read_buffer(uint8_t *buf)
127127
*/
128128
void Kinetis_EMAC::tx_reclaim()
129129
{
130-
/* Get exclusive access */
131-
TXLockMutex.lock();
132-
133-
// Traverse all descriptors, looking for the ones modified by the uDMA
134-
while((tx_consume_index != tx_produce_index) &&
135-
(!(g_handle.txBdDirty->control & ENET_BUFFDESCRIPTOR_TX_READY_MASK))) {
136-
memory_manager->free(tx_buff[tx_consume_index % ENET_TX_RING_LEN]);
137-
if (g_handle.txBdDirty->control & ENET_BUFFDESCRIPTOR_TX_WRAP_MASK)
138-
g_handle.txBdDirty = g_handle.txBdBase;
139-
else
140-
g_handle.txBdDirty++;
141-
142-
tx_consume_index += 1;
143-
xTXDCountSem.release();
144-
}
145-
146-
/* Restore access */
147-
TXLockMutex.unlock();
130+
/* Get exclusive access */
131+
TXLockMutex.lock();
132+
133+
// Traverse all descriptors, looking for the ones modified by the uDMA
134+
while ((tx_consume_index != tx_produce_index) &&
135+
(!(g_handle.txBdDirty->control & ENET_BUFFDESCRIPTOR_TX_READY_MASK))) {
136+
memory_manager->free(tx_buff[tx_consume_index % ENET_TX_RING_LEN]);
137+
if (g_handle.txBdDirty->control & ENET_BUFFDESCRIPTOR_TX_WRAP_MASK) {
138+
g_handle.txBdDirty = g_handle.txBdBase;
139+
} else {
140+
g_handle.txBdDirty++;
141+
}
142+
143+
tx_consume_index += 1;
144+
xTXDCountSem.release();
145+
}
146+
147+
/* Restore access */
148+
TXLockMutex.unlock();
148149
}
149150

150151
/** \brief Ethernet receive interrupt handler
@@ -166,16 +167,15 @@ void Kinetis_EMAC::tx_isr()
166167
void Kinetis_EMAC::ethernet_callback(ENET_Type *base, enet_handle_t *handle, enet_event_t event, void *param)
167168
{
168169
Kinetis_EMAC *enet = static_cast<Kinetis_EMAC *>(param);
169-
switch (event)
170-
{
171-
case kENET_RxEvent:
172-
enet->rx_isr();
173-
break;
174-
case kENET_TxEvent:
175-
enet->tx_isr();
176-
break;
177-
default:
178-
break;
170+
switch (event) {
171+
case kENET_RxEvent:
172+
enet->rx_isr();
173+
break;
174+
case kENET_TxEvent:
175+
enet->tx_isr();
176+
break;
177+
default:
178+
break;
179179
}
180180
}
181181

@@ -193,24 +193,27 @@ bool Kinetis_EMAC::low_level_init_successful()
193193

194194
// Allocate RX descriptors
195195
rx_desc_start_addr = (uint8_t *)calloc(1, sizeof(enet_rx_bd_struct_t) * ENET_RX_RING_LEN + ENET_BUFF_ALIGNMENT);
196-
if(!rx_desc_start_addr)
196+
if (!rx_desc_start_addr) {
197197
return false;
198+
}
198199

199200
// Allocate TX descriptors
200201
tx_desc_start_addr = (uint8_t *)calloc(1, sizeof(enet_tx_bd_struct_t) * ENET_TX_RING_LEN + ENET_BUFF_ALIGNMENT);
201-
if(!tx_desc_start_addr)
202+
if (!tx_desc_start_addr) {
202203
return false;
204+
}
203205

204206
rx_desc_start_addr = (uint8_t *)ENET_ALIGN(rx_desc_start_addr, ENET_BUFF_ALIGNMENT);
205207
tx_desc_start_addr = (uint8_t *)ENET_ALIGN(tx_desc_start_addr, ENET_BUFF_ALIGNMENT);
206208

207209
/* Create buffers for each receive BD */
208210
for (i = 0; i < ENET_RX_RING_LEN; i++) {
209211
rx_buff[i] = memory_manager->alloc_heap(ENET_ETH_MAX_FLEN, ENET_BUFF_ALIGNMENT);
210-
if (NULL == rx_buff[i])
212+
if (NULL == rx_buff[i]) {
211213
return false;
214+
}
212215

213-
rx_ptr[i] = (uint32_t*)memory_manager->get_ptr(rx_buff[i]);
216+
rx_ptr[i] = (uint32_t *)memory_manager->get_ptr(rx_buff[i]);
214217
}
215218

216219
tx_consume_index = tx_produce_index = 0;
@@ -223,7 +226,7 @@ bool Kinetis_EMAC::low_level_init_successful()
223226
0,
224227
(volatile enet_rx_bd_struct_t *)rx_desc_start_addr,
225228
(volatile enet_tx_bd_struct_t *)tx_desc_start_addr,
226-
(uint8_t *)&rx_ptr,
229+
(uint8_t *) &rx_ptr,
227230
NULL,
228231
};
229232

@@ -293,16 +296,16 @@ emac_mem_buf_t *Kinetis_EMAC::low_level_input(int idx)
293296
update_read_buffer(NULL);
294297

295298
#ifdef LOCK_RX_THREAD
296-
TXLockMutex.unlock();
299+
TXLockMutex.unlock();
297300
#endif
298301

299302
return NULL;
300303
}
301304

302305
rx_buff[idx] = temp_rxbuf;
303-
rx_ptr[idx] = (uint32_t*)memory_manager->get_ptr(rx_buff[idx]);
306+
rx_ptr[idx] = (uint32_t *)memory_manager->get_ptr(rx_buff[idx]);
304307

305-
update_read_buffer((uint8_t*)rx_ptr[idx]);
308+
update_read_buffer((uint8_t *)rx_ptr[idx]);
306309
}
307310

308311
#ifdef LOCK_RX_THREAD
@@ -335,12 +338,12 @@ void Kinetis_EMAC::input(int idx)
335338
*
336339
* \param[in] pvParameters pointer to the interface data
337340
*/
338-
void Kinetis_EMAC::thread_function(void* pvParameters)
341+
void Kinetis_EMAC::thread_function(void *pvParameters)
339342
{
340343
struct Kinetis_EMAC *kinetis_enet = static_cast<Kinetis_EMAC *>(pvParameters);
341344

342345
for (;;) {
343-
uint32_t flags = osThreadFlagsWait(FLAG_RX|FLAG_TX, osFlagsWaitAny, osWaitForever);
346+
uint32_t flags = osThreadFlagsWait(FLAG_RX | FLAG_TX, osFlagsWaitAny, osWaitForever);
344347

345348
MBED_ASSERT(!(flags & osFlagsError));
346349

@@ -391,7 +394,7 @@ bool Kinetis_EMAC::link_out(emac_mem_buf_t *buf)
391394
{
392395
// If buffer is chained or not aligned then make a contiguous aligned copy of it
393396
if (memory_manager->get_next(buf) ||
394-
reinterpret_cast<uint32_t>(memory_manager->get_ptr(buf)) % ENET_BUFF_ALIGNMENT) {
397+
reinterpret_cast<uint32_t>(memory_manager->get_ptr(buf)) % ENET_BUFF_ALIGNMENT) {
395398
emac_mem_buf_t *copy_buf;
396399
copy_buf = memory_manager->alloc_heap(memory_manager->get_total_len(buf), ENET_BUFF_ALIGNMENT);
397400
if (NULL == copy_buf) {
@@ -542,7 +545,7 @@ bool Kinetis_EMAC::get_hwaddr(uint8_t *addr) const
542545
void Kinetis_EMAC::set_hwaddr(const uint8_t *addr)
543546
{
544547
memcpy(hwaddr, addr, sizeof hwaddr);
545-
ENET_SetMacAddr(ENET, const_cast<uint8_t*>(addr));
548+
ENET_SetMacAddr(ENET, const_cast<uint8_t *>(addr));
546549
}
547550

548551
void Kinetis_EMAC::set_link_input_cb(emac_link_input_cb_t input_cb)
@@ -587,13 +590,15 @@ void Kinetis_EMAC::set_memory_manager(EMACMemoryManager &mem_mngr)
587590
}
588591

589592

590-
Kinetis_EMAC &Kinetis_EMAC::get_instance() {
593+
Kinetis_EMAC &Kinetis_EMAC::get_instance()
594+
{
591595
static Kinetis_EMAC emac;
592596
return emac;
593597
}
594598

595599
// Weak so a module can override
596-
MBED_WEAK EMAC &EMAC::get_default_instance() {
600+
MBED_WEAK EMAC &EMAC::get_default_instance()
601+
{
597602
return Kinetis_EMAC::get_instance();
598603
}
599604

‎features/netsocket/emac-drivers/TARGET_NXP_EMAC/TARGET_IMX/imx_emac.cpp

Lines changed: 43 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -129,24 +129,25 @@ static void update_read_buffer(uint8_t *buf)
129129
*/
130130
void Kinetis_EMAC::tx_reclaim()
131131
{
132-
/* Get exclusive access */
133-
TXLockMutex.lock();
134-
135-
// Traverse all descriptors, looking for the ones modified by the uDMA
136-
while((tx_consume_index != tx_produce_index) &&
137-
(!(g_handle.txBdDirty[0]->control & ENET_BUFFDESCRIPTOR_TX_READY_MASK))) {
138-
memory_manager->free(tx_buff[tx_consume_index % ENET_TX_RING_LEN]);
139-
if (g_handle.txBdDirty[0]->control & ENET_BUFFDESCRIPTOR_TX_WRAP_MASK)
140-
g_handle.txBdDirty[0] = g_handle.txBdBase[0];
141-
else
142-
g_handle.txBdDirty[0]++;
143-
144-
tx_consume_index += 1;
145-
xTXDCountSem.release();
146-
}
147-
148-
/* Restore access */
149-
TXLockMutex.unlock();
132+
/* Get exclusive access */
133+
TXLockMutex.lock();
134+
135+
// Traverse all descriptors, looking for the ones modified by the uDMA
136+
while ((tx_consume_index != tx_produce_index) &&
137+
(!(g_handle.txBdDirty[0]->control & ENET_BUFFDESCRIPTOR_TX_READY_MASK))) {
138+
memory_manager->free(tx_buff[tx_consume_index % ENET_TX_RING_LEN]);
139+
if (g_handle.txBdDirty[0]->control & ENET_BUFFDESCRIPTOR_TX_WRAP_MASK) {
140+
g_handle.txBdDirty[0] = g_handle.txBdBase[0];
141+
} else {
142+
g_handle.txBdDirty[0]++;
143+
}
144+
145+
tx_consume_index += 1;
146+
xTXDCountSem.release();
147+
}
148+
149+
/* Restore access */
150+
TXLockMutex.unlock();
150151
}
151152

152153
/** \brief Ethernet receive interrupt handler
@@ -168,16 +169,15 @@ void Kinetis_EMAC::tx_isr()
168169
void Kinetis_EMAC::ethernet_callback(ENET_Type *base, enet_handle_t *handle, enet_event_t event, void *param)
169170
{
170171
Kinetis_EMAC *enet = static_cast<Kinetis_EMAC *>(param);
171-
switch (event)
172-
{
173-
case kENET_RxEvent:
174-
enet->rx_isr();
175-
break;
176-
case kENET_TxEvent:
177-
enet->tx_isr();
178-
break;
179-
default:
180-
break;
172+
switch (event) {
173+
case kENET_RxEvent:
174+
enet->rx_isr();
175+
break;
176+
case kENET_TxEvent:
177+
enet->tx_isr();
178+
break;
179+
default:
180+
break;
181181
}
182182
}
183183

@@ -200,10 +200,11 @@ bool Kinetis_EMAC::low_level_init_successful()
200200
for (i = 0; i < ENET_RX_RING_LEN; i++) {
201201
rx_buff[i] = memory_manager->alloc_heap(ENET_ALIGN(ENET_ETH_MAX_FLEN, ENET_BUFF_ALIGNMENT),
202202
ENET_BUFF_ALIGNMENT);
203-
if (NULL == rx_buff[i])
203+
if (NULL == rx_buff[i]) {
204204
return false;
205+
}
205206

206-
rx_ptr[i] = (uint32_t*)memory_manager->get_ptr(rx_buff[i]);
207+
rx_ptr[i] = (uint32_t *)memory_manager->get_ptr(rx_buff[i]);
207208
SCB_InvalidateDCache_by_Addr(rx_ptr[i], ENET_ALIGN(ENET_ETH_MAX_FLEN, ENET_BUFF_ALIGNMENT));
208209
}
209210

@@ -217,7 +218,7 @@ bool Kinetis_EMAC::low_level_init_successful()
217218
0,
218219
(volatile enet_rx_bd_struct_t *)rx_desc_start_addr,
219220
(volatile enet_tx_bd_struct_t *)tx_desc_start_addr,
220-
(uint8_t *)&rx_ptr,
221+
(uint8_t *) &rx_ptr,
221222
NULL,
222223
};
223224

@@ -289,17 +290,17 @@ emac_mem_buf_t *Kinetis_EMAC::low_level_input(int idx)
289290
update_read_buffer(NULL);
290291

291292
#ifdef LOCK_RX_THREAD
292-
TXLockMutex.unlock();
293+
TXLockMutex.unlock();
293294
#endif
294295

295296
return NULL;
296297
}
297298

298299
rx_buff[idx] = temp_rxbuf;
299-
rx_ptr[idx] = (uint32_t*)memory_manager->get_ptr(rx_buff[idx]);
300+
rx_ptr[idx] = (uint32_t *)memory_manager->get_ptr(rx_buff[idx]);
300301
SCB_InvalidateDCache_by_Addr(rx_ptr[idx], ENET_ALIGN(ENET_ETH_MAX_FLEN, ENET_BUFF_ALIGNMENT));
301302

302-
update_read_buffer((uint8_t*)rx_ptr[idx]);
303+
update_read_buffer((uint8_t *)rx_ptr[idx]);
303304
}
304305

305306
#ifdef LOCK_RX_THREAD
@@ -332,12 +333,12 @@ void Kinetis_EMAC::input(int idx)
332333
*
333334
* \param[in] pvParameters pointer to the interface data
334335
*/
335-
void Kinetis_EMAC::thread_function(void* pvParameters)
336+
void Kinetis_EMAC::thread_function(void *pvParameters)
336337
{
337338
struct Kinetis_EMAC *kinetis_enet = static_cast<Kinetis_EMAC *>(pvParameters);
338339

339340
for (;;) {
340-
uint32_t flags = osThreadFlagsWait(FLAG_RX|FLAG_TX, osFlagsWaitAny, osWaitForever);
341+
uint32_t flags = osThreadFlagsWait(FLAG_RX | FLAG_TX, osFlagsWaitAny, osWaitForever);
341342

342343
MBED_ASSERT(!(flags & osFlagsError));
343344

@@ -388,7 +389,7 @@ bool Kinetis_EMAC::link_out(emac_mem_buf_t *buf)
388389
{
389390
// If buffer is chained or not aligned then make a contiguous aligned copy of it
390391
if (memory_manager->get_next(buf) ||
391-
reinterpret_cast<uint32_t>(memory_manager->get_ptr(buf)) % ENET_BUFF_ALIGNMENT) {
392+
reinterpret_cast<uint32_t>(memory_manager->get_ptr(buf)) % ENET_BUFF_ALIGNMENT) {
392393
emac_mem_buf_t *copy_buf;
393394
copy_buf = memory_manager->alloc_heap(memory_manager->get_total_len(buf), ENET_BUFF_ALIGNMENT);
394395
if (NULL == copy_buf) {
@@ -546,7 +547,7 @@ bool Kinetis_EMAC::get_hwaddr(uint8_t *addr) const
546547
void Kinetis_EMAC::set_hwaddr(const uint8_t *addr)
547548
{
548549
memcpy(hwaddr, addr, sizeof hwaddr);
549-
ENET_SetMacAddr(ENET, const_cast<uint8_t*>(addr));
550+
ENET_SetMacAddr(ENET, const_cast<uint8_t *>(addr));
550551
}
551552

552553
void Kinetis_EMAC::set_link_input_cb(emac_link_input_cb_t input_cb)
@@ -591,13 +592,15 @@ void Kinetis_EMAC::set_memory_manager(EMACMemoryManager &mem_mngr)
591592
}
592593

593594

594-
Kinetis_EMAC &Kinetis_EMAC::get_instance() {
595+
Kinetis_EMAC &Kinetis_EMAC::get_instance()
596+
{
595597
static Kinetis_EMAC emac;
596598
return emac;
597599
}
598600

599601
// Weak so a module can override
600-
MBED_WEAK EMAC &EMAC::get_default_instance() {
602+
MBED_WEAK EMAC &EMAC::get_default_instance()
603+
{
601604
return Kinetis_EMAC::get_instance();
602605
}
603606

0 commit comments

Comments
 (0)