indent
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2104 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
8ccad811e6
commit
35b961cf8d
58
hw/lance.c
58
hw/lance.c
@ -198,7 +198,8 @@ static uint32_t lance_mem_readw(void *opaque, target_phys_addr_t addr)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void lance_mem_writew(void *opaque, target_phys_addr_t addr, uint32_t val)
|
||||
static void lance_mem_writew(void *opaque, target_phys_addr_t addr,
|
||||
uint32_t val)
|
||||
{
|
||||
LANCEState *s = opaque;
|
||||
uint32_t saddr;
|
||||
@ -235,8 +236,7 @@ static void lance_mem_writew(void *opaque, target_phys_addr_t addr, uint32_t val
|
||||
if (val & LE_C0_INIT) {
|
||||
reg |= LE_C0_IDON | LE_C0_INIT;
|
||||
reg &= ~LE_C0_STOP;
|
||||
}
|
||||
else if (val & LE_C0_STRT) {
|
||||
} else if (val & LE_C0_STRT) {
|
||||
reg |= LE_C0_STRT | LE_C0_RXON | LE_C0_TXON;
|
||||
reg &= ~LE_C0_STOP;
|
||||
}
|
||||
@ -304,16 +304,21 @@ static void lance_receive(void *opaque, const uint8_t *buf, int size)
|
||||
ib = (void *) iommu_translate(dmaptr);
|
||||
|
||||
old_rxptr = s->rxptr;
|
||||
for (i = s->rxptr; i != ((old_rxptr - 1) & RX_RING_MOD_MASK); i = (i + 1) & RX_RING_MOD_MASK) {
|
||||
cpu_physical_memory_read((uint32_t)&ib->brx_ring[i].rmd1_bits, (void *) &temp8, 1);
|
||||
for (i = s->rxptr; i != ((old_rxptr - 1) & RX_RING_MOD_MASK);
|
||||
i = (i + 1) & RX_RING_MOD_MASK) {
|
||||
cpu_physical_memory_read((uint32_t) & ib->brx_ring[i].rmd1_bits,
|
||||
(void *) &temp8, 1);
|
||||
if (temp8 == (LE_R1_OWN)) {
|
||||
s->rxptr = (s->rxptr + 1) & RX_RING_MOD_MASK;
|
||||
temp16 = size + 4;
|
||||
bswap16s(&temp16);
|
||||
cpu_physical_memory_write((uint32_t)&ib->brx_ring[i].mblength, (void *) &temp16, 2);
|
||||
cpu_physical_memory_write((uint32_t)&ib->rx_buf[i], buf, size);
|
||||
cpu_physical_memory_write((uint32_t) & ib->brx_ring[i].
|
||||
mblength, (void *) &temp16, 2);
|
||||
cpu_physical_memory_write((uint32_t) & ib->rx_buf[i], buf,
|
||||
size);
|
||||
temp8 = LE_R1_POK;
|
||||
cpu_physical_memory_write((uint32_t)&ib->brx_ring[i].rmd1_bits, (void *) &temp8, 1);
|
||||
cpu_physical_memory_write((uint32_t) & ib->brx_ring[i].
|
||||
rmd1_bits, (void *) &temp8, 1);
|
||||
s->regs[LE_CSR0] |= LE_C0_RINT | LE_C0_INTR;
|
||||
if (s->regs[LE_CSR0] & LE_C0_INEA)
|
||||
pic_set_irq(s->irq, 1);
|
||||
@ -339,19 +344,25 @@ static void lance_send(void *opaque)
|
||||
|
||||
ib = (void *) iommu_translate(dmaptr);
|
||||
|
||||
DPRINTF("sending packet? (dmaptr %8.8x) (ib %p) (btx_ring %p)\n", dmaptr, ib, &ib->btx_ring);
|
||||
DPRINTF("sending packet? (dmaptr %8.8x) (ib %p) (btx_ring %p)\n",
|
||||
dmaptr, ib, &ib->btx_ring);
|
||||
old_txptr = s->txptr;
|
||||
for (i = s->txptr; i != ((old_txptr - 1) & TX_RING_MOD_MASK); i = (i + 1) & TX_RING_MOD_MASK) {
|
||||
cpu_physical_memory_read((uint32_t)&ib->btx_ring[i].tmd1_bits, (void *) &temp8, 1);
|
||||
for (i = s->txptr; i != ((old_txptr - 1) & TX_RING_MOD_MASK);
|
||||
i = (i + 1) & TX_RING_MOD_MASK) {
|
||||
cpu_physical_memory_read((uint32_t) & ib->btx_ring[i].tmd1_bits,
|
||||
(void *) &temp8, 1);
|
||||
if (temp8 == (LE_T1_POK | LE_T1_OWN)) {
|
||||
cpu_physical_memory_read((uint32_t)&ib->btx_ring[i].length, (void *) &temp16, 2);
|
||||
cpu_physical_memory_read((uint32_t) & ib->btx_ring[i].length,
|
||||
(void *) &temp16, 2);
|
||||
bswap16s(&temp16);
|
||||
temp16 = (~temp16) + 1;
|
||||
cpu_physical_memory_read((uint32_t)&ib->tx_buf[i], pkt_buf, temp16);
|
||||
cpu_physical_memory_read((uint32_t) & ib->tx_buf[i], pkt_buf,
|
||||
temp16);
|
||||
DPRINTF("sending packet, len %d\n", temp16);
|
||||
qemu_send_packet(s->vc, pkt_buf, temp16);
|
||||
temp8 = LE_T1_POK;
|
||||
cpu_physical_memory_write((uint32_t)&ib->btx_ring[i].tmd1_bits, (void *) &temp8, 1);
|
||||
cpu_physical_memory_write((uint32_t) & ib->btx_ring[i].
|
||||
tmd1_bits, (void *) &temp8, 1);
|
||||
s->txptr = (s->txptr + 1) & TX_RING_MOD_MASK;
|
||||
s->regs[LE_CSR0] |= LE_C0_TINT | LE_C0_INTR;
|
||||
}
|
||||
@ -369,7 +380,8 @@ static uint32_t ledma_mem_readl(void *opaque, target_phys_addr_t addr)
|
||||
return s->ledmaregs[saddr];
|
||||
}
|
||||
|
||||
static void ledma_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t val)
|
||||
static void ledma_mem_writel(void *opaque, target_phys_addr_t addr,
|
||||
uint32_t val)
|
||||
{
|
||||
LANCEState *s = opaque;
|
||||
uint32_t saddr;
|
||||
@ -435,28 +447,28 @@ void lance_init(NICInfo *nd, int irq, uint32_t leaddr, uint32_t ledaddr)
|
||||
|
||||
s->irq = irq;
|
||||
|
||||
lance_io_memory = cpu_register_io_memory(0, lance_mem_read, lance_mem_write, s);
|
||||
lance_io_memory =
|
||||
cpu_register_io_memory(0, lance_mem_read, lance_mem_write, s);
|
||||
cpu_register_physical_memory(leaddr, 4, lance_io_memory);
|
||||
|
||||
ledma_io_memory = cpu_register_io_memory(0, ledma_mem_read, ledma_mem_write, s);
|
||||
ledma_io_memory =
|
||||
cpu_register_io_memory(0, ledma_mem_read, ledma_mem_write, s);
|
||||
cpu_register_physical_memory(ledaddr, 16, ledma_io_memory);
|
||||
|
||||
memcpy(s->macaddr, nd->macaddr, 6);
|
||||
|
||||
lance_reset(s);
|
||||
|
||||
s->vc = qemu_new_vlan_client(nd->vlan, lance_receive, lance_can_receive, s);
|
||||
s->vc =
|
||||
qemu_new_vlan_client(nd->vlan, lance_receive, lance_can_receive,
|
||||
s);
|
||||
|
||||
snprintf(s->vc->info_str, sizeof(s->vc->info_str),
|
||||
"lance macaddr=%02x:%02x:%02x:%02x:%02x:%02x",
|
||||
s->macaddr[0],
|
||||
s->macaddr[1],
|
||||
s->macaddr[2],
|
||||
s->macaddr[3],
|
||||
s->macaddr[4],
|
||||
s->macaddr[5]);
|
||||
s->macaddr[2], s->macaddr[3], s->macaddr[4], s->macaddr[5]);
|
||||
|
||||
register_savevm("lance", leaddr, 1, lance_save, lance_load, s);
|
||||
qemu_register_reset(lance_reset, s);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user