ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/net/stellaris_enet: Get rid of rx_fifo pointer 

The rx_fifo pointer is awkward to migrate, and is actually
redundant since it is always possible to determine it from
the current rx[].len/.data and rx_fifo_len. Remove both
rx_fifo and rx_fifo_len from the state, replacing them with
a simple rx_fifo_offset which points at the current location
in the RX fifo.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Peter Maydell 2014-05-13 16:09:37 +01:00
parent eacd606ca7
commit 889ac2a32f
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
hw/net/stellaris_enet.c
View File

@ -67,8 +67,7 @@ typedef struct {
uint8_t data[2048]; uint8_t data[2048];
int len; int len;
} rx[31]; } rx[31];
uint8_t *rx_fifo; int rx_fifo_offset;
int rx_fifo_len;
int next_packet; int next_packet;
NICState *nic; NICState *nic;
NICConf conf; NICConf conf;
@ -216,21 +215,21 @@ static uint64_t stellaris_enet_read(void *opaque, hwaddr offset,
case 0x0c: /* TCTL */ case 0x0c: /* TCTL */
return s->tctl; return s->tctl;
case 0x10: /* DATA */ case 0x10: /* DATA */
if (s->rx_fifo_len == 0) { {
if (s->np == 0) { uint8_t *rx_fifo;
BADF("RX underflow\n");
return 0; if (s->np == 0) {
} BADF("RX underflow\n");
s->rx_fifo_len = s->rx[s->next_packet].len; return 0;
s->rx_fifo = s->rx[s->next_packet].data;
DPRINTF("RX FIFO start packet len=%d\n", s->rx_fifo_len);
} }
val = s->rx_fifo[0] | (s->rx_fifo[1] << 8) | (s->rx_fifo[2] << 16)
| (s->rx_fifo[3] << 24); rx_fifo = s->rx[s->next_packet].data + s->rx_fifo_offset;
s->rx_fifo += 4;
s->rx_fifo_len -= 4; val = rx_fifo[0] | (rx_fifo[1] << 8) | (rx_fifo[2] << 16)
if (s->rx_fifo_len <= 0) { | (rx_fifo[3] << 24);
s->rx_fifo_len = 0; s->rx_fifo_offset += 4;
if (s->rx_fifo_offset >= s->rx[s->next_packet].len) {
s->rx_fifo_offset = 0;
s->next_packet++; s->next_packet++;
if (s->next_packet >= 31) if (s->next_packet >= 31)
s->next_packet = 0; s->next_packet = 0;
@ -238,6 +237,7 @@ static uint64_t stellaris_enet_read(void *opaque, hwaddr offset,
DPRINTF("RX done np=%d\n", s->np); DPRINTF("RX done np=%d\n", s->np);
} }
return val; return val;
}
case 0x14: /* IA0 */ case 0x14: /* IA0 */
return s->conf.macaddr.a[0] | (s->conf.macaddr.a[1] << 8) return s->conf.macaddr.a[0] | (s->conf.macaddr.a[1] << 8)
| (s->conf.macaddr.a[2] << 16) | (s->conf.macaddr.a[2] << 16)
@ -291,8 +291,8 @@ static void stellaris_enet_write(void *opaque, hwaddr offset,
case 0x08: /* RCTL */ case 0x08: /* RCTL */
s->rctl = value; s->rctl = value;
if (value & SE_RCTL_RSTFIFO) { if (value & SE_RCTL_RSTFIFO) {
s->rx_fifo_len = 0;
s->np = 0; s->np = 0;
s->rx_fifo_offset = 0;
stellaris_enet_update(s); stellaris_enet_update(s);
} }
break; break;
@ -402,8 +402,7 @@ static void stellaris_enet_save(QEMUFile *f, void *opaque)
} }
qemu_put_be32(f, s->next_packet); qemu_put_be32(f, s->next_packet);
qemu_put_be32(f, s->rx_fifo - s->rx[s->next_packet].data); qemu_put_be32(f, s->rx_fifo_offset);
qemu_put_be32(f, s->rx_fifo_len);
} }
static int stellaris_enet_load(QEMUFile *f, void *opaque, int version_id) static int stellaris_enet_load(QEMUFile *f, void *opaque, int version_id)
@ -432,8 +431,7 @@ static int stellaris_enet_load(QEMUFile *f, void *opaque, int version_id)
} }
s->next_packet = qemu_get_be32(f); s->next_packet = qemu_get_be32(f);
s->rx_fifo = s->rx[s->next_packet].data + qemu_get_be32(f); s->rx_fifo_offset = qemu_get_be32(f);
s->rx_fifo_len = qemu_get_be32(f);
return 0; return 0;
} }