Revision db895a1e hw/net/ne2000-isa.c
b/hw/net/ne2000-isa.c | ||
---|---|---|
66 | 66 |
} |
67 | 67 |
}; |
68 | 68 |
|
69 |
static int isa_ne2000_initfn(ISADevice *dev)
|
|
69 |
static void isa_ne2000_realizefn(DeviceState *dev, Error **errp)
|
|
70 | 70 |
{ |
71 |
ISADevice *isadev = ISA_DEVICE(dev); |
|
71 | 72 |
ISANE2000State *isa = ISA_NE2000(dev); |
72 | 73 |
NE2000State *s = &isa->ne2000; |
73 | 74 |
|
74 | 75 |
ne2000_setup_io(s, 0x20); |
75 |
isa_register_ioport(dev, &s->io, isa->iobase); |
|
76 |
isa_register_ioport(isadev, &s->io, isa->iobase);
|
|
76 | 77 |
|
77 |
isa_init_irq(dev, &s->irq, isa->isairq); |
|
78 |
isa_init_irq(isadev, &s->irq, isa->isairq);
|
|
78 | 79 |
|
79 | 80 |
qemu_macaddr_default_if_unset(&s->c.macaddr); |
80 | 81 |
ne2000_reset(s); |
81 | 82 |
|
82 | 83 |
s->nic = qemu_new_nic(&net_ne2000_isa_info, &s->c, |
83 |
object_get_typename(OBJECT(dev)), dev->qdev.id, s);
|
|
84 |
object_get_typename(OBJECT(dev)), dev->id, s); |
|
84 | 85 |
qemu_format_nic_info_str(qemu_get_queue(s->nic), s->c.macaddr.a); |
85 |
|
|
86 |
return 0; |
|
87 | 86 |
} |
88 | 87 |
|
89 | 88 |
static Property ne2000_isa_properties[] = { |
... | ... | |
96 | 95 |
static void isa_ne2000_class_initfn(ObjectClass *klass, void *data) |
97 | 96 |
{ |
98 | 97 |
DeviceClass *dc = DEVICE_CLASS(klass); |
99 |
ISADeviceClass *ic = ISA_DEVICE_CLASS(klass); |
|
100 |
ic->init = isa_ne2000_initfn;
|
|
98 |
|
|
99 |
dc->realize = isa_ne2000_realizefn;
|
|
101 | 100 |
dc->props = ne2000_isa_properties; |
102 | 101 |
} |
103 | 102 |
|
Also available in: Unified diff