Skip to content

Commit d157e59

Browse files
Qinghao ShiQinghao Shi
Qinghao Shi
authored and
Qinghao Shi
committed
reformat to following codeing style rules
1 parent 25e8f89 commit d157e59

File tree

4 files changed

+76
-88
lines changed

4 files changed

+76
-88
lines changed

‎features/netsocket/emac-drivers/TARGET_ARM_FM/COMPONENT_LAN91C111/fvp_emac.cpp

Lines changed: 29 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -43,24 +43,23 @@
4343
#define PHY_TASK_PERIOD_MS 200
4444

4545

46-
fvp_EMAC::fvp_EMAC() : _thread(THREAD_PRIORITY,THREAD_STACKSIZE,NULL,"fvp_emac_thread")
46+
fvp_EMAC::fvp_EMAC() : _thread(THREAD_PRIORITY, THREAD_STACKSIZE, NULL, "fvp_emac_thread")
4747

4848
{
4949
}
5050

5151
void fvp_EMAC::ethernet_callback(lan91_event_t event, void *param)
5252
{
5353
fvp_EMAC *enet = static_cast<fvp_EMAC *>(param);
54-
switch (event)
55-
{
56-
case LAN91_RxEvent:
57-
enet->rx_isr();
58-
break;
59-
case LAN91_TxEvent:
60-
enet->tx_isr();
61-
break;
62-
default:
63-
break;
54+
switch (event) {
55+
case LAN91_RxEvent:
56+
enet->rx_isr();
57+
break;
58+
case LAN91_TxEvent:
59+
enet->tx_isr();
60+
break;
61+
default:
62+
break;
6463
}
6564
}
6665

@@ -90,12 +89,12 @@ bool fvp_EMAC::low_level_init_successful()
9089
*
9190
* \param[in] pvParameters pointer to the interface data
9291
*/
93-
void fvp_EMAC::thread_function(void* pvParameters)
92+
void fvp_EMAC::thread_function(void *pvParameters)
9493
{
9594
struct fvp_EMAC *fvp_enet = static_cast<fvp_EMAC *>(pvParameters);
9695

9796
for (;;) {
98-
uint32_t flags = ThisThread::flags_wait_any(FLAG_RX|FLAG_TX);
97+
uint32_t flags = ThisThread::flags_wait_any(FLAG_RX | FLAG_TX);
9998
if (flags & FLAG_RX) {
10099
fvp_enet->packet_rx();
101100
}
@@ -110,8 +109,7 @@ void fvp_EMAC::thread_function(void* pvParameters)
110109
*/
111110
void fvp_EMAC::packet_rx()
112111
{
113-
while(!LAN91_RxFIFOEmpty())
114-
{
112+
while (!LAN91_RxFIFOEmpty()) {
115113
emac_mem_buf_t *temp_rxbuf = NULL;
116114
uint32_t *rx_payload_ptr;
117115
uint32_t rx_length = 0;
@@ -121,26 +119,23 @@ void fvp_EMAC::packet_rx()
121119
/* no memory been allocated*/
122120
if (NULL != temp_rxbuf) {
123121

124-
rx_payload_ptr = (uint32_t*)_memory_manager->get_ptr(temp_rxbuf);
122+
rx_payload_ptr = (uint32_t *)_memory_manager->get_ptr(temp_rxbuf);
125123
rx_length = _memory_manager->get_len(temp_rxbuf);
126124
bool state;
127125

128126
#ifdef LOCK_RX_THREAD
129-
/* Get exclusive access */
130-
_TXLockMutex.lock();
127+
/* Get exclusive access */
128+
_TXLockMutex.lock();
131129
#endif
132130
state = LAN91_receive_frame(rx_payload_ptr, &rx_length);
133-
131+
134132
#ifdef LOCK_RX_THREAD
135-
_TXLockMutex.unlock();
133+
_TXLockMutex.unlock();
136134
#endif
137-
if(!state)
138-
{
135+
if (!state) {
139136
_memory_manager->free(temp_rxbuf);
140137
continue;
141-
}
142-
else
143-
{
138+
} else {
144139
_memory_manager->set_len(temp_rxbuf, rx_length);
145140
}
146141
_emac_link_input_cb(temp_rxbuf);
@@ -161,7 +156,7 @@ bool fvp_EMAC::link_out(emac_mem_buf_t *buf)
161156
{
162157
// If buffer is chained or not aligned then make a contiguous aligned copy of it
163158
if (_memory_manager->get_next(buf) ||
164-
reinterpret_cast<uint32_t>(_memory_manager->get_ptr(buf)) % LAN91_BUFF_ALIGNMENT) {
159+
reinterpret_cast<uint32_t>(_memory_manager->get_ptr(buf)) % LAN91_BUFF_ALIGNMENT) {
165160
emac_mem_buf_t *copy_buf;
166161
copy_buf = _memory_manager->alloc_heap(_memory_manager->get_total_len(buf), LAN91_BUFF_ALIGNMENT);
167162
if (NULL == copy_buf) {
@@ -176,7 +171,7 @@ bool fvp_EMAC::link_out(emac_mem_buf_t *buf)
176171
}
177172

178173
/* Save the buffer so that it can be freed when transmit is done */
179-
uint32_t * buffer;
174+
uint32_t *buffer;
180175
uint32_t tx_length = 0;
181176
bool state;
182177
buffer = (uint32_t *)(_memory_manager->get_ptr(buf));
@@ -186,17 +181,17 @@ bool fvp_EMAC::link_out(emac_mem_buf_t *buf)
186181
_TXLockMutex.lock();
187182

188183
/* Setup transfers */
189-
state = LAN91_send_frame(buffer,&tx_length);
184+
state = LAN91_send_frame(buffer, &tx_length);
190185
_TXLockMutex.unlock();
191186
/* Restore access */
192187

193188

194-
if(!state){
189+
if (!state) {
195190
return false;
196191
}
197192
/* Free the buffer */
198193
_memory_manager->free(buf);
199-
194+
200195
return true;
201196
}
202197

@@ -306,13 +301,15 @@ void fvp_EMAC::set_memory_manager(EMACMemoryManager &mem_mngr)
306301
}
307302

308303

309-
fvp_EMAC &fvp_EMAC::get_instance() {
304+
fvp_EMAC &fvp_EMAC::get_instance()
305+
{
310306
static fvp_EMAC emac;
311307
return emac;
312308
}
313309

314310
// Weak so a module can override
315-
MBED_WEAK EMAC &EMAC::get_default_instance() {
311+
MBED_WEAK EMAC &EMAC::get_default_instance()
312+
{
316313
return fvp_EMAC::get_instance();
317314
}
318315

‎features/netsocket/emac-drivers/TARGET_ARM_FM/COMPONENT_LAN91C111/fvp_emac.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,17 +159,17 @@ class fvp_EMAC : public EMAC {
159159
void rx_isr();
160160
void tx_isr();
161161
void packet_rx();
162-
static void thread_function(void* pvParameters);
162+
static void thread_function(void *pvParameters);
163163
void phy_task();
164-
static void ethernet_callback(lan91_event_t event, void *param);
164+
static void ethernet_callback(lan91_event_t event, void *param);
165165

166166
Thread _thread; /* Processing thread */
167167
rtos::Mutex _TXLockMutex; /* TX critical section mutex */
168168

169169
emac_link_input_cb_t _emac_link_input_cb; /* Callback for incoming data */
170170
emac_link_state_change_cb_t _emac_link_state_cb; /* Link state change callback */
171171

172-
EMACMemoryManager * _memory_manager; /* Memory manager */
172+
EMACMemoryManager *_memory_manager; /* Memory manager */
173173

174174
int _phy_task_handle; /* Handle for phy task event */
175175
lan91_phy_status_t _prev_state;

‎targets/TARGET_ARM_FM/TARGET_FVP_MPS2/drivers/lan91c111.c

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ void LAN91_init(void)
3939

4040
/* Reset the PHY*/
4141
write_PHY(0, 0x8000);
42-
42+
4343
/* clear phy 18 status */
4444
read_PHY(18);
4545

@@ -75,21 +75,21 @@ void LAN91_init(void)
7575

7676
void read_MACaddr(uint8_t *addr)
7777
{
78-
int i;
79-
80-
LAN91_SelectBank(1);
78+
int i;
79+
80+
LAN91_SelectBank(1);
8181

82-
i = LREG(uint16_t, B1_IAR0);
83-
addr[0] = (uint8_t)i;
84-
addr[1] = (uint8_t)(i >> 8);
82+
i = LREG(uint16_t, B1_IAR0);
83+
addr[0] = (uint8_t)i;
84+
addr[1] = (uint8_t)(i >> 8);
8585

86-
i = LREG(uint16_t, B1_IAR2);
87-
addr[2] = (uint8_t)i;
88-
addr[3] = (uint8_t)(i >> 8);
86+
i = LREG(uint16_t, B1_IAR2);
87+
addr[2] = (uint8_t)i;
88+
addr[3] = (uint8_t)(i >> 8);
8989

90-
i = LREG(uint16_t, B1_IAR4);
91-
addr[4] = (uint8_t)i;
92-
addr[5] = (uint8_t)(i >> 8);
90+
i = LREG(uint16_t, B1_IAR4);
91+
addr[4] = (uint8_t)i;
92+
addr[5] = (uint8_t)(i >> 8);
9393
}
9494

9595
void LAN91_SetCallback(lan91_callback_t callback, void *userData)
@@ -113,8 +113,7 @@ bool LAN91_send_frame(uint32_t *buff, uint32_t *size)
113113
LREG(uint16_t, B2_MMUCR) = MMU_ALLOC_TX;
114114

115115
/* Check if Interrupt Status Register been set for MMU Allocate Ready */
116-
if (!(LREG(uint16_t, B2_IST) & IST_ALLOC_INT))
117-
{
116+
if (!(LREG(uint16_t, B2_IST) & IST_ALLOC_INT)) {
118117
/* Failed, Reset MMU */
119118
LREG(uint16_t, B2_MMUCR) = MMU_RESET;
120119
while (LREG(uint16_t, B2_MMUCR) & MMUCR_BUSY);
@@ -172,15 +171,15 @@ bool LAN91_receive_frame(uint32_t *buff, uint32_t *size)
172171
}
173172

174173

175-
/* Pointer Register set to RCV + Auto Increase + Read access
174+
/* Pointer Register set to RCV + Auto Increase + Read access
176175
So that Data Register is use RX FIFO*/
177176
LREG(uint16_t, B2_PTR) = PTR_RCV | PTR_AUTO_INCR | PTR_READ;
178177

179178
/* Read status word and packet length */
180179
val = LREG(uint32_t, B2_DATA);
181180
State = val & 0xFFFF;
182181
/* Raw Data Size = Total - STATUS WORD - BYTE COUNT - CONTROL BYTE - LAST BYTE */
183-
RxLen = (val >> 16) - 6;
182+
RxLen = (val >> 16) - 6;
184183

185184
/* Check State word if Odd number of bytes in a frame. */
186185
if (State & RFS_ODDFRM) {
@@ -214,8 +213,7 @@ bool LAN91_receive_frame(uint32_t *buff, uint32_t *size)
214213
void ETHERNET_Handler(void)
215214
{
216215
LAN91_SelectBank(2);
217-
if((LREG(uint8_t, B2_IST) & IST_RCV) !=0)
218-
{
216+
if ((LREG(uint8_t, B2_IST) & IST_RCV) != 0) {
219217
LREG(uint8_t, B2_MSK) = 0;
220218
/* Callback function. */
221219
if (lan91c111_handle->callback) {
@@ -227,12 +225,9 @@ void ETHERNET_Handler(void)
227225

228226
lan91_phy_status_t LAN91_GetLinkStatus(void)
229227
{
230-
if (read_PHY(0x2u) & 0x4u)
231-
{
228+
if (read_PHY(0x2u) & 0x4u) {
232229
return STATE_LINK_UP;
233-
}
234-
else
235-
{
230+
} else {
236231
return STATE_LINK_DOWN;
237232
}
238233
}

0 commit comments

Comments
 (0)