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

smc91c111: qdevify reset 

Register the smc91c111 reset function as a qdev reset function.

Signed-off-by: Juha Riihimäki <juha.riihimaki@nokia.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Juha Riihimäki 2011-05-31 17:48:23 +01:00 committed by Blue Swirl
parent 22e1e72960
commit 1e36f6a5b5
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/smc91c111.c
View File

@ -252,8 +252,9 @@ static void smc91c111_queue_tx(smc91c111_state *s, int packet)
smc91c111_do_tx(s); smc91c111_do_tx(s);
} }
static void smc91c111_reset(smc91c111_state *s) static void smc91c111_reset(DeviceState *dev)
{ {
smc91c111_state *s = FROM_SYSBUS(smc91c111_state, sysbus_from_qdev(dev));
s->bank = 0; s->bank = 0;
s->tx_fifo_len = 0; s->tx_fifo_len = 0;
s->tx_fifo_done_len = 0; s->tx_fifo_done_len = 0;
@ -302,7 +303,7 @@ static void smc91c111_writeb(void *opaque, target_phys_addr_t offset,
case 5: case 5:
SET_HIGH(rcr, value); SET_HIGH(rcr, value);
if (s->rcr & RCR_SOFT_RST) if (s->rcr & RCR_SOFT_RST)
smc91c111_reset(s); smc91c111_reset(&s->busdev.qdev);
return; return;
case 10: case 11: /* RPCR */ case 10: case 11: /* RPCR */
/* Ignored */ /* Ignored */
@ -753,9 +754,6 @@ static int smc91c111_init1(SysBusDevice *dev)
sysbus_init_mmio(dev, 16, s->mmio_index); sysbus_init_mmio(dev, 16, s->mmio_index);
sysbus_init_irq(dev, &s->irq); sysbus_init_irq(dev, &s->irq);
qemu_macaddr_default_if_unset(&s->conf.macaddr); qemu_macaddr_default_if_unset(&s->conf.macaddr);
smc91c111_reset(s);
s->nic = qemu_new_nic(&net_smc91c111_info, &s->conf, s->nic = qemu_new_nic(&net_smc91c111_info, &s->conf,
dev->qdev.info->name, dev->qdev.id, s); dev->qdev.info->name, dev->qdev.id, s);
qemu_format_nic_info_str(&s->nic->nc, s->conf.macaddr.a); qemu_format_nic_info_str(&s->nic->nc, s->conf.macaddr.a);
@ -768,6 +766,7 @@ static SysBusDeviceInfo smc91c111_info = {
.qdev.name = "smc91c111", .qdev.name = "smc91c111",
.qdev.size = sizeof(smc91c111_state), .qdev.size = sizeof(smc91c111_state),
.qdev.vmsd = &vmstate_smc91c111, .qdev.vmsd = &vmstate_smc91c111,
.qdev.reset = smc91c111_reset,
.qdev.props = (Property[]) { .qdev.props = (Property[]) {
DEFINE_NIC_PROPERTIES(smc91c111_state, conf), DEFINE_NIC_PROPERTIES(smc91c111_state, conf),
DEFINE_PROP_END_OF_LIST(), DEFINE_PROP_END_OF_LIST(),