Skip to content

Commit b8a75f8

Browse files
BernardXiongBernardXiong
authored
Merge pull request #4901 from mysterywolf/eth
[stm32][eth] beautify codes
2 parents 230b7b3 + b339b5c commit b8a75f8

File tree

12 files changed

+77
-39
lines changed

12 files changed

+77
-39
lines changed

‎bsp/stm32/libraries/HAL_Drivers/drv_eth.c‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ struct rt_stm32_eth
4141
/* interface address info, hw address */
4242
rt_uint8_t dev_addr[MAX_ADDR_LEN];
4343
/* ETH_Speed */
44-
uint32_t ETH_Speed;
44+
rt_uint32_t ETH_Speed;
4545
/* ETH_Duplex_Mode */
46-
uint32_t ETH_Mode;
46+
rt_uint32_t ETH_Mode;
4747
};
4848

4949
static ETH_DMADescTypeDef *DMARxDscrTab, *DMATxDscrTab;
@@ -167,8 +167,14 @@ static rt_err_t rt_stm32_eth_control(rt_device_t dev, int cmd, void *args)
167167
{
168168
case NIOCTL_GADDR:
169169
/* get mac address */
170-
if (args) rt_memcpy(args, stm32_eth_device.dev_addr, 6);
171-
else return -RT_ERROR;
170+
if (args)
171+
{
172+
SMEMCPY(args, stm32_eth_device.dev_addr, 6);
173+
}
174+
else
175+
{
176+
return -RT_ERROR;
177+
}
172178
break;
173179

174180
default :
@@ -214,7 +220,7 @@ rt_err_t rt_stm32_eth_tx(rt_device_t dev, struct pbuf *p)
214220
while ((byteslefttocopy + bufferoffset) > ETH_TX_BUF_SIZE)
215221
{
216222
/* Copy data to Tx buffer*/
217-
memcpy((uint8_t *)((uint8_t *)buffer + bufferoffset), (uint8_t *)((uint8_t *)q->payload + payloadoffset), (ETH_TX_BUF_SIZE - bufferoffset));
223+
SMEMCPY((uint8_t *)((uint8_t *)buffer + bufferoffset), (uint8_t *)((uint8_t *)q->payload + payloadoffset), (ETH_TX_BUF_SIZE - bufferoffset));
218224

219225
/* Point to next descriptor */
220226
DmaTxDesc = (ETH_DMADescTypeDef *)(DmaTxDesc->Buffer2NextDescAddr);
@@ -236,7 +242,7 @@ rt_err_t rt_stm32_eth_tx(rt_device_t dev, struct pbuf *p)
236242
}
237243

238244
/* Copy the remaining bytes */
239-
memcpy((uint8_t *)((uint8_t *)buffer + bufferoffset), (uint8_t *)((uint8_t *)q->payload + payloadoffset), byteslefttocopy);
245+
SMEMCPY((uint8_t *)((uint8_t *)buffer + bufferoffset), (uint8_t *)((uint8_t *)q->payload + payloadoffset), byteslefttocopy);
240246
bufferoffset = bufferoffset + byteslefttocopy;
241247
framelength = framelength + byteslefttocopy;
242248
}
@@ -327,7 +333,7 @@ struct pbuf *rt_stm32_eth_rx(rt_device_t dev)
327333
while ((byteslefttocopy + bufferoffset) > ETH_RX_BUF_SIZE)
328334
{
329335
/* Copy data to pbuf */
330-
memcpy((uint8_t *)((uint8_t *)q->payload + payloadoffset), (uint8_t *)((uint8_t *)buffer + bufferoffset), (ETH_RX_BUF_SIZE - bufferoffset));
336+
SMEMCPY((uint8_t *)((uint8_t *)q->payload + payloadoffset), (uint8_t *)((uint8_t *)buffer + bufferoffset), (ETH_RX_BUF_SIZE - bufferoffset));
331337

332338
/* Point to next descriptor */
333339
dmarxdesc = (ETH_DMADescTypeDef *)(dmarxdesc->Buffer2NextDescAddr);
@@ -338,7 +344,7 @@ struct pbuf *rt_stm32_eth_rx(rt_device_t dev)
338344
bufferoffset = 0;
339345
}
340346
/* Copy remaining data in pbuf */
341-
memcpy((uint8_t *)((uint8_t *)q->payload + payloadoffset), (uint8_t *)((uint8_t *)buffer + bufferoffset), byteslefttocopy);
347+
SMEMCPY((uint8_t *)((uint8_t *)q->payload + payloadoffset), (uint8_t *)((uint8_t *)buffer + bufferoffset), byteslefttocopy);
342348
bufferoffset = bufferoffset + byteslefttocopy;
343349
}
344350
}
@@ -385,7 +391,9 @@ void HAL_ETH_RxCpltCallback(ETH_HandleTypeDef *heth)
385391
rt_err_t result;
386392
result = eth_device_ready(&(stm32_eth_device.parent));
387393
if (result != RT_EOK)
394+
{
388395
LOG_I("RxCpltCallback err = %d", result);
396+
}
389397
}
390398

391399
void HAL_ETH_ErrorCallback(ETH_HandleTypeDef *heth)

‎bsp/stm32/libraries/HAL_Drivers/drv_eth.h‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,12 @@
2828

2929
/* The PHY ID one register */
3030
#define PHY_ID1_REG 0x02U
31-
3231
/* The PHY ID two register */
3332
#define PHY_ID2_REG 0x03U
34-
3533
/* The PHY auto-negotiate advertise register */
3634
#define PHY_AUTONEG_ADVERTISE_REG 0x04U
3735

36+
3837
#ifdef PHY_USING_LAN8720A
3938
/* The PHY interrupt source flag register. */
4039
#define PHY_INTERRUPT_FLAG_REG 0x1DU
@@ -51,9 +50,8 @@
5150
#define PHY_Status_SPEED_10M(sr) ((sr) & PHY_10M_MASK)
5251
#define PHY_Status_SPEED_100M(sr) ((sr) & PHY_100M_MASK)
5352
#define PHY_Status_FULL_DUPLEX(sr) ((sr) & PHY_FULL_DUPLEX_MASK)
54-
#endif /* PHY_USING_LAN8720A */
5553

56-
#ifdef PHY_USING_DM9161CEP
54+
#elif defined(PHY_USING_DM9161CEP)
5755
#define PHY_Status_REG 0x11U
5856
#define PHY_10M_MASK ((1<<12) || (1<<13))
5957
#define PHY_100M_MASK ((1<<14) || (1<<15))
@@ -69,9 +67,7 @@
6967
#define PHY_LINK_CHANGE_MASK (1<<9)
7068
#define PHY_INT_MASK 0
7169

72-
#endif /* PHY_USING_DM9161CEP */
73-
74-
#ifdef PHY_USING_DP83848C
70+
#elif defined(PHY_USING_DP83848C)
7571
#define PHY_Status_REG 0x10U
7672
#define PHY_10M_MASK (1<<1)
7773
#define PHY_FULL_DUPLEX_MASK (1<<2)
@@ -87,6 +83,6 @@
8783
/* The PHY interrupt mask register. */
8884
#define PHY_INTERRUPT_MASK_REG 0x12U
8985
#define PHY_INT_MASK (1<<5)
90-
#endif /* PHY_USING_DP83848C */
86+
#endif
9187

9288
#endif /* __DRV_ETH_H__ */

‎components/net/lwip-1.4.1/src/lwipopts.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,13 @@
222222
#define LWIP_DBG_TYPES_ON (LWIP_DBG_ON|LWIP_DBG_TRACE|LWIP_DBG_STATE|LWIP_DBG_FRESH|LWIP_DBG_HALT)
223223

224224
/* ---------- Memory options ---------- */
225+
#ifdef RT_USING_ASM_MEMCPY
226+
#define MEMCPY(dst,src,len) rt_memcpy(dst,src,len)
227+
#else
228+
#define MEMCPY(dst,src,len) memcpy(dst,src,len)
229+
#endif /* RT_USING_ASM_MEMCPY */
230+
#define SMEMCPY(dst,src,len) MEMCPY(dst,src,len)
231+
225232
#define MEM_ALIGNMENT 4
226233

227234
#define MEM_LIBC_MALLOC 1

‎components/net/lwip-1.4.1/src/netif/ethernetif.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,14 +201,14 @@ int lwip_netdev_ping(struct netdev *netif, const char *host, size_t data_len,
201201
{
202202
return -RT_ERROR;
203203
}
204-
rt_memcpy(&h, &res->ai_addr, sizeof(struct sockaddr_in *));
205-
rt_memcpy(&ina, &h->sin_addr, sizeof(ina));
204+
SMEMCPY(&h, &res->ai_addr, sizeof(struct sockaddr_in *));
205+
SMEMCPY(&ina, &h->sin_addr, sizeof(ina));
206206
lwip_freeaddrinfo(res);
207207
if (inet_aton(inet_ntoa(ina), &target_addr) == 0)
208208
{
209209
return -RT_ERROR;
210210
}
211-
rt_memcpy(&(ping_resp->ip_addr), &target_addr, sizeof(ip_addr_t));
211+
SMEMCPY(&(ping_resp->ip_addr), &target_addr, sizeof(ip_addr_t));
212212

213213
/* new a socket */
214214
if ((s = lwip_socket(AF_INET, SOCK_RAW, IP_PROTO_ICMP)) < 0)
@@ -331,7 +331,7 @@ static int netdev_add(struct netif *lwip_netif)
331331
netdev->mtu = lwip_netif->mtu;
332332
netdev->ops = &lwip_netdev_ops;
333333
netdev->hwaddr_len = lwip_netif->hwaddr_len;
334-
rt_memcpy(netdev->hwaddr, lwip_netif->hwaddr, lwip_netif->hwaddr_len);
334+
SMEMCPY(netdev->hwaddr, lwip_netif->hwaddr, lwip_netif->hwaddr_len);
335335
netdev->ip_addr = lwip_netif->ip_addr;
336336
netdev->gw = lwip_netif->gw;
337337
netdev->netmask = lwip_netif->netmask;

‎components/net/lwip-2.0.2/src/lwipopts.h‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,14 +230,21 @@
230230
#define LWIP_DBG_TYPES_ON (LWIP_DBG_ON|LWIP_DBG_TRACE|LWIP_DBG_STATE|LWIP_DBG_FRESH|LWIP_DBG_HALT)
231231

232232
/* ---------- Memory options ---------- */
233+
#ifdef RT_USING_ASM_MEMCPY
234+
#define MEMCPY(dst,src,len) rt_memcpy(dst,src,len)
235+
#else
236+
#define MEMCPY(dst,src,len) memcpy(dst,src,len)
237+
#endif /* RT_USING_ASM_MEMCPY */
238+
#define SMEMCPY(dst,src,len) MEMCPY(dst,src,len)
239+
233240
#ifdef RT_LWIP_MEM_ALIGNMENT
234241
#define MEM_ALIGNMENT RT_LWIP_MEM_ALIGNMENT
235242
#else
236243
#define MEM_ALIGNMENT 4
237244
#endif
238245

239-
#define MEMP_OVERFLOW_CHECK 1 ////
240-
#define LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT 1 ////
246+
#define MEMP_OVERFLOW_CHECK 1
247+
#define LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT 1
241248
//#define MEM_LIBC_MALLOC 1
242249
//#define MEM_USE_POOLS 1
243250
//#define MEMP_USE_CUSTOM_POOLS 1

‎components/net/lwip-2.0.2/src/netif/ethernetif.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,14 +210,14 @@ int lwip_netdev_ping(struct netdev *netif, const char *host, size_t data_len,
210210
{
211211
return -RT_ERROR;
212212
}
213-
rt_memcpy(&h, &res->ai_addr, sizeof(struct sockaddr_in *));
214-
rt_memcpy(&ina, &h->sin_addr, sizeof(ina));
213+
SMEMCPY(&h, &res->ai_addr, sizeof(struct sockaddr_in *));
214+
SMEMCPY(&ina, &h->sin_addr, sizeof(ina));
215215
lwip_freeaddrinfo(res);
216216
if (inet_aton(inet_ntoa(ina), &target_addr) == 0)
217217
{
218218
return -RT_ERROR;
219219
}
220-
rt_memcpy(&(ping_resp->ip_addr), &target_addr, sizeof(ip_addr_t));
220+
SMEMCPY(&(ping_resp->ip_addr), &target_addr, sizeof(ip_addr_t));
221221

222222
/* new a socket */
223223
if ((s = lwip_socket(AF_INET, SOCK_RAW, IP_PROTO_ICMP)) < 0)
@@ -340,7 +340,7 @@ static int netdev_add(struct netif *lwip_netif)
340340
netdev->mtu = lwip_netif->mtu;
341341
netdev->ops = &lwip_netdev_ops;
342342
netdev->hwaddr_len = lwip_netif->hwaddr_len;
343-
rt_memcpy(netdev->hwaddr, lwip_netif->hwaddr, lwip_netif->hwaddr_len);
343+
SMEMCPY(netdev->hwaddr, lwip_netif->hwaddr, lwip_netif->hwaddr_len);
344344
netdev->ip_addr = lwip_netif->ip_addr;
345345
netdev->gw = lwip_netif->gw;
346346
netdev->netmask = lwip_netif->netmask;

‎components/net/lwip-2.0.3/src/lwipopts.h‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,14 +230,21 @@
230230
#define LWIP_DBG_TYPES_ON (LWIP_DBG_ON|LWIP_DBG_TRACE|LWIP_DBG_STATE|LWIP_DBG_FRESH|LWIP_DBG_HALT)
231231

232232
/* ---------- Memory options ---------- */
233+
#ifdef RT_USING_ASM_MEMCPY
234+
#define MEMCPY(dst,src,len) rt_memcpy(dst,src,len)
235+
#else
236+
#define MEMCPY(dst,src,len) memcpy(dst,src,len)
237+
#endif /* RT_USING_ASM_MEMCPY */
238+
#define SMEMCPY(dst,src,len) MEMCPY(dst,src,len)
239+
233240
#ifdef RT_LWIP_MEM_ALIGNMENT
234241
#define MEM_ALIGNMENT RT_LWIP_MEM_ALIGNMENT
235242
#else
236243
#define MEM_ALIGNMENT 4
237244
#endif
238245

239-
#define MEMP_OVERFLOW_CHECK 1 ////
240-
#define LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT 1 ////
246+
#define MEMP_OVERFLOW_CHECK 1
247+
#define LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT 1
241248
//#define MEM_LIBC_MALLOC 1
242249
//#define MEM_USE_POOLS 1
243250
//#define MEMP_USE_CUSTOM_POOLS 1

‎components/net/lwip-2.0.3/src/netif/ethernetif.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,14 +210,14 @@ int lwip_netdev_ping(struct netdev *netif, const char *host, size_t data_len,
210210
{
211211
return -RT_ERROR;
212212
}
213-
rt_memcpy(&h, &res->ai_addr, sizeof(struct sockaddr_in *));
214-
rt_memcpy(&ina, &h->sin_addr, sizeof(ina));
213+
SMEMCPY(&h, &res->ai_addr, sizeof(struct sockaddr_in *));
214+
SMEMCPY(&ina, &h->sin_addr, sizeof(ina));
215215
lwip_freeaddrinfo(res);
216216
if (inet_aton(inet_ntoa(ina), &target_addr) == 0)
217217
{
218218
return -RT_ERROR;
219219
}
220-
rt_memcpy(&(ping_resp->ip_addr), &target_addr, sizeof(ip_addr_t));
220+
SMEMCPY(&(ping_resp->ip_addr), &target_addr, sizeof(ip_addr_t));
221221

222222
/* new a socket */
223223
if ((s = lwip_socket(AF_INET, SOCK_RAW, IP_PROTO_ICMP)) < 0)
@@ -340,7 +340,7 @@ static int netdev_add(struct netif *lwip_netif)
340340
netdev->mtu = lwip_netif->mtu;
341341
netdev->ops = &lwip_netdev_ops;
342342
netdev->hwaddr_len = lwip_netif->hwaddr_len;
343-
rt_memcpy(netdev->hwaddr, lwip_netif->hwaddr, lwip_netif->hwaddr_len);
343+
SMEMCPY(netdev->hwaddr, lwip_netif->hwaddr, lwip_netif->hwaddr_len);
344344
netdev->ip_addr = lwip_netif->ip_addr;
345345
netdev->gw = lwip_netif->gw;
346346
netdev->netmask = lwip_netif->netmask;

‎components/net/lwip-2.1.2/src/lwipopts.h‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,9 +242,16 @@
242242
#endif
243243

244244
/* ---------- Memory options ---------- */
245+
#ifdef RT_USING_ASM_MEMCPY
246+
#define MEMCPY(dst,src,len) rt_memcpy(dst,src,len)
247+
#else
248+
#define MEMCPY(dst,src,len) memcpy(dst,src,len)
249+
#endif /* RT_USING_ASM_MEMCPY */
250+
#define SMEMCPY(dst,src,len) MEMCPY(dst,src,len)
251+
245252
#define MEM_ALIGNMENT 4
246-
#define MEMP_OVERFLOW_CHECK 1 ////
247-
#define LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT 1 ////
253+
#define MEMP_OVERFLOW_CHECK 1
254+
#define LWIP_ALLOW_MEM_FREE_FROM_OTHER_CONTEXT 1
248255
//#define MEM_LIBC_MALLOC 1
249256
//#define MEM_USE_POOLS 1
250257
//#define MEMP_USE_CUSTOM_POOLS 1

‎components/net/lwip-2.1.2/src/netif/ethernetif.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,14 +208,14 @@ int lwip_netdev_ping(struct netdev *netif, const char *host, size_t data_len,
208208
{
209209
return -RT_ERROR;
210210
}
211-
rt_memcpy(&h, &res->ai_addr, sizeof(struct sockaddr_in *));
212-
rt_memcpy(&ina, &h->sin_addr, sizeof(ina));
211+
SMEMCPY(&h, &res->ai_addr, sizeof(struct sockaddr_in *));
212+
SMEMCPY(&ina, &h->sin_addr, sizeof(ina));
213213
lwip_freeaddrinfo(res);
214214
if (inet_aton(inet_ntoa(ina), &target_addr) == 0)
215215
{
216216
return -RT_ERROR;
217217
}
218-
rt_memcpy(&(ping_resp->ip_addr), &target_addr, sizeof(ip_addr_t));
218+
SMEMCPY(&(ping_resp->ip_addr), &target_addr, sizeof(ip_addr_t));
219219

220220
/* new a socket */
221221
if ((s = lwip_socket(AF_INET, SOCK_RAW, IP_PROTO_ICMP)) < 0)
@@ -338,7 +338,7 @@ static int netdev_add(struct netif *lwip_netif)
338338
netdev->mtu = lwip_netif->mtu;
339339
netdev->ops = &lwip_netdev_ops;
340340
netdev->hwaddr_len = lwip_netif->hwaddr_len;
341-
rt_memcpy(netdev->hwaddr, lwip_netif->hwaddr, lwip_netif->hwaddr_len);
341+
SMEMCPY(netdev->hwaddr, lwip_netif->hwaddr, lwip_netif->hwaddr_len);
342342
netdev->ip_addr = lwip_netif->ip_addr;
343343
netdev->gw = lwip_netif->gw;
344344
netdev->netmask = lwip_netif->netmask;

0 commit comments

Comments
 (0)