vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lan9118: QOM cast cleanup 

Signed-off-by: Andreas Färber <afaerber@suse.de>
master
Andreas Färber 2013-07-27 11:55:02 +02:00
parent 58076497df
commit 3ff66d101b
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hw/net/lan9118.c
View File

@ -170,8 +170,12 @@ static const VMStateDescription vmstate_lan9118_packet = {
} }
}; };
#define TYPE_LAN9118 "lan9118"
#define LAN9118(obj) OBJECT_CHECK(lan9118_state, (obj), TYPE_LAN9118)
typedef struct { typedef struct {
SysBusDevice busdev; SysBusDevice parent_obj;
NICState *nic; NICState *nic;
NICConf conf; NICConf conf;
qemu_irq irq; qemu_irq irq;
@ -401,7 +405,8 @@ static void phy_reset(lan9118_state *s)
static void lan9118_reset(DeviceState *d) static void lan9118_reset(DeviceState *d)
{ {
lan9118_state *s = FROM_SYSBUS(lan9118_state, SYS_BUS_DEVICE(d)); lan9118_state *s = LAN9118(d);
s->irq_cfg &= (IRQ_TYPE | IRQ_POL); s->irq_cfg &= (IRQ_TYPE | IRQ_POL);
s->int_sts = 0; s->int_sts = 0;
s->int_en = 0; s->int_en = 0;
@ -1053,7 +1058,7 @@ static void lan9118_writel(void *opaque, hwaddr offset,
case CSR_HW_CFG: case CSR_HW_CFG:
if (val & 1) { if (val & 1) {
/* SRST */ /* SRST */
lan9118_reset(&s->busdev.qdev); lan9118_reset(DEVICE(s));
} else { } else {
s->hw_cfg = (val & 0x003f300) | (s->hw_cfg & 0x4); s->hw_cfg = (val & 0x003f300) | (s->hw_cfg & 0x4);
} }
@ -1320,9 +1325,10 @@ static NetClientInfo net_lan9118_info = {
.link_status_changed = lan9118_set_link, .link_status_changed = lan9118_set_link,
}; };
static int lan9118_init1(SysBusDevice *dev) static int lan9118_init1(SysBusDevice *sbd)
{ {
lan9118_state *s = FROM_SYSBUS(lan9118_state, dev); DeviceState *dev = DEVICE(sbd);
lan9118_state *s = LAN9118(dev);
QEMUBH *bh; QEMUBH *bh;
int i; int i;
const MemoryRegionOps *mem_ops = const MemoryRegionOps *mem_ops =
@ -1330,12 +1336,12 @@ static int lan9118_init1(SysBusDevice *dev)
memory_region_init_io(&s->mmio, OBJECT(dev), mem_ops, s, memory_region_init_io(&s->mmio, OBJECT(dev), mem_ops, s,
"lan9118-mmio", 0x100); "lan9118-mmio", 0x100);
sysbus_init_mmio(dev, &s->mmio); sysbus_init_mmio(sbd, &s->mmio);
sysbus_init_irq(dev, &s->irq); sysbus_init_irq(sbd, &s->irq);
qemu_macaddr_default_if_unset(&s->conf.macaddr); qemu_macaddr_default_if_unset(&s->conf.macaddr);
s->nic = qemu_new_nic(&net_lan9118_info, &s->conf, s->nic = qemu_new_nic(&net_lan9118_info, &s->conf,
object_get_typename(OBJECT(dev)), dev->qdev.id, s); object_get_typename(OBJECT(dev)), dev->id, s);
qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a); qemu_format_nic_info_str(qemu_get_queue(s->nic), s->conf.macaddr.a);
s->eeprom[0] = 0xa5; s->eeprom[0] = 0xa5;
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++) {
@ -1370,7 +1376,7 @@ static void lan9118_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo lan9118_info = { static const TypeInfo lan9118_info = {
.name = "lan9118", .name = TYPE_LAN9118,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(lan9118_state), .instance_size = sizeof(lan9118_state),
.class_init = lan9118_class_init, .class_init = lan9118_class_init,
@ -1389,7 +1395,7 @@ void lan9118_init(NICInfo *nd, uint32_t base, qemu_irq irq)
SysBusDevice *s; SysBusDevice *s;
qemu_check_nic_model(nd, "lan9118"); qemu_check_nic_model(nd, "lan9118");
dev = qdev_create(NULL, "lan9118"); dev = qdev_create(NULL, TYPE_LAN9118);
qdev_set_nic_properties(dev, nd); qdev_set_nic_properties(dev, nd);
qdev_init_nofail(dev); qdev_init_nofail(dev);
s = SYS_BUS_DEVICE(dev); s = SYS_BUS_DEVICE(dev);