Revision db895a1e hw/isa/pc87312.c
b/hw/isa/pc87312.c | ||
---|---|---|
264 | 264 |
pc87312_soft_reset(s); |
265 | 265 |
} |
266 | 266 |
|
267 |
static int pc87312_init(ISADevice *dev)
|
|
267 |
static void pc87312_realize(DeviceState *dev, Error **errp)
|
|
268 | 268 |
{ |
269 | 269 |
PC87312State *s; |
270 | 270 |
DeviceState *d; |
... | ... | |
276 | 276 |
int i; |
277 | 277 |
|
278 | 278 |
s = PC87312(dev); |
279 |
bus = isa_bus_from_device(dev); |
|
279 |
isa = ISA_DEVICE(dev); |
|
280 |
bus = isa_bus_from_device(isa); |
|
281 |
isa_register_ioport(isa, &s->io, s->iobase); |
|
280 | 282 |
pc87312_hard_reset(s); |
281 |
isa_register_ioport(dev, &s->io, s->iobase); |
|
282 | 283 |
|
283 | 284 |
if (is_parallel_enabled(s)) { |
284 | 285 |
chr = parallel_hds[0]; |
... | ... | |
345 | 346 |
s->ide.dev = isa; |
346 | 347 |
trace_pc87312_info_ide(get_ide_iobase(s)); |
347 | 348 |
} |
348 |
|
|
349 |
return 0; |
|
350 | 349 |
} |
351 | 350 |
|
352 | 351 |
static void pc87312_initfn(Object *obj) |
... | ... | |
378 | 377 |
static void pc87312_class_init(ObjectClass *klass, void *data) |
379 | 378 |
{ |
380 | 379 |
DeviceClass *dc = DEVICE_CLASS(klass); |
381 |
ISADeviceClass *ic = ISA_DEVICE_CLASS(klass); |
|
382 | 380 |
|
383 |
ic->init = pc87312_init;
|
|
381 |
dc->realize = pc87312_realize;
|
|
384 | 382 |
dc->reset = pc87312_reset; |
385 | 383 |
dc->vmsd = &vmstate_pc87312; |
386 | 384 |
dc->props = pc87312_properties; |
Also available in: Unified diff