[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH-for-9.1 v2 10/11] hw/net/lan9118: Use RX_DATA_FIFO_BYTES definiti
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH-for-9.1 v2 10/11] hw/net/lan9118: Use RX_DATA_FIFO_BYTES definition |
Date: |
Tue, 9 Apr 2024 15:37:59 +0200 |
rx_fifo[] is an array of words,
rx_fifo_size is a word count.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/net/lan9118.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
index 663776f575..56cc52d450 100644
--- a/hw/net/lan9118.c
+++ b/hw/net/lan9118.c
@@ -266,7 +266,7 @@ struct lan9118_state {
int32_t rx_fifo_size;
int32_t rx_fifo_used;
int32_t rx_fifo_head;
- uint32_t rx_fifo[3360];
+ uint32_t rx_fifo[RX_DATA_FIFO_BYTES / 4];
int32_t rx_packet_size_head;
int32_t rx_packet_size_tail;
int32_t rx_packet_size[1024];
@@ -338,7 +338,9 @@ static const VMStateDescription vmstate_lan9118 = {
VMSTATE_INT32(rx_fifo_size, lan9118_state),
VMSTATE_INT32(rx_fifo_used, lan9118_state),
VMSTATE_INT32(rx_fifo_head, lan9118_state),
- VMSTATE_UINT32_ARRAY(rx_fifo, lan9118_state, 3360),
+ VMSTATE_UINT32_ARRAY(rx_fifo, lan9118_state,
+ RX_DATA_FIFO_BYTES / 4),
+ VMSTATE_UNUSED(3360 * 4 - RX_DATA_FIFO_BYTES),
VMSTATE_INT32(rx_packet_size_head, lan9118_state),
VMSTATE_INT32(rx_packet_size_tail, lan9118_state),
VMSTATE_INT32_ARRAY(rx_packet_size, lan9118_state, 1024),
@@ -460,7 +462,7 @@ static void lan9118_reset(DeviceState *d)
s->txp->fifo_used = 0;
s->tx_fifo_bytes = TX_DATA_FIFO_BYTES;
s->tx_status_fifo_used = 0;
- s->rx_fifo_size = 2640;
+ s->rx_fifo_size = RX_DATA_FIFO_BYTES / 4;
s->rx_fifo_used = 0;
s->rx_status_fifo_wordcount = RX_STATUS_FIFO_BYTES / 4;
s->rx_status_fifo_used = 0;
--
2.41.0
- Re: [PATCH-for-9.1 v2 03/11] hw/net/lan9118: Remove duplicated assignment, (continued)
- [PATCH-for-9.1 v2 04/11] hw/net/lan9118: Replace magic '5' value by TX_FIF_SZ_RESET definition, Philippe Mathieu-Daudé, 2024/04/09
- [PATCH-for-9.1 v2 06/11] hw/net/lan9118: Use TX_DATA_FIFO_BYTES definition, Philippe Mathieu-Daudé, 2024/04/09
- [PATCH-for-9.1 v2 05/11] hw/net/lan9118: Add definitions for FIFO allocated sizes, Philippe Mathieu-Daudé, 2024/04/09
- [PATCH-for-9.1 v2 08/11] hw/net/lan9118: Use RX_STATUS_FIFO_BYTES definition, Philippe Mathieu-Daudé, 2024/04/09
- [PATCH-for-9.1 v2 09/11] hw/net/lan9118: Rename rx_status_fifo_size -> rx_status_fifo_wordcount, Philippe Mathieu-Daudé, 2024/04/09
- [PATCH-for-9.1 v2 10/11] hw/net/lan9118: Use RX_DATA_FIFO_BYTES definition,
Philippe Mathieu-Daudé <=
- [PATCH-for-9.1 v2 11/11] hw/net/lan9118: Rename rx_fifo_size -> rx_fifo_wordcount, Philippe Mathieu-Daudé, 2024/04/09
- [PATCH-for-9.1 v2 07/11] hw/net/lan9118: Rename tx_fifo_size -> tx_fifo_bytes, Philippe Mathieu-Daudé, 2024/04/09
- Re: [PATCH-for-9.0 v2 00/11] hw/net/lan9118: Fix overflow in TX FIFO, Philippe Mathieu-Daudé, 2024/04/09