claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Got rid of an unnecessary memcpy() in the network queue code.

Browse Source
This commit is contained in:
OBattler
2020-04-30 01:19:01 +02:00
parent ea3d08367e
commit bb359ff394
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/network/network.c
View File

@@ -240,16 +240,12 @@ network_queue_put(void *priv, uint8_t *data, int len)
static void static void
network_queue_get(netpkt_t *pkt) network_queue_get(netpkt_t **pkt)
{ {
pkt->priv = NULL;
pkt->data = NULL;
pkt->len = 0;
if (first_pkt == NULL) if (first_pkt == NULL)
return; *pkt = NULL;
else
memcpy(pkt, first_pkt, sizeof(netpkt_t)); *pkt = first_pkt;
} }
@@ -295,15 +291,15 @@ network_queue_clear(void)
static void static void
network_queue(void *priv) network_queue(void *priv)
{ {
netpkt_t pkt; netpkt_t *pkt = NULL;
network_busy(1); network_busy(1);
network_queue_get(&pkt); network_queue_get(&pkt);
if (pkt.len > 0) { if ((pkt != NULL) && (pkt->len > 0)) {
net_cards[network_card].rx(pkt.priv, pkt.data, pkt.len); net_cards[network_card].rx(pkt->priv, pkt->data, pkt->len);
if (pkt.len >= 128) if (pkt->len >= 128)
timer_on_auto(&network_queue_timer, 0.762939453125 * 2.0 * ((double) pkt.len)); timer_on_auto(&network_queue_timer, 0.762939453125 * 2.0 * ((double) pkt->len));
else else
timer_on_auto(&network_queue_timer, 0.762939453125 * 2.0 * 128.0); timer_on_auto(&network_queue_timer, 0.762939453125 * 2.0 * 128.0);
} else } else