[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-1.5 v2 12/20] pckbd: QOM'ify
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH for-1.5 v2 12/20] pckbd: QOM'ify |
Date: |
Sat, 27 Apr 2013 22:18:47 +0200 |
Introduce type constant and cast macro to obsolete DO_UPCAST().
Prepares for ISA realizefn.
Signed-off-by: Andreas Färber <address@hidden>
---
hw/input/pckbd.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
index 08ceb9f..17a5614 100644
--- a/hw/input/pckbd.c
+++ b/hw/input/pckbd.c
@@ -431,8 +431,12 @@ void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq,
qemu_register_reset(kbd_reset, s);
}
+#define TYPE_I8042 "i8042"
+#define I8042(obj) OBJECT_CHECK(ISAKBDState, (obj), TYPE_I8042)
+
typedef struct ISAKBDState {
- ISADevice dev;
+ ISADevice parent_obj;
+
KBDState kbd;
MemoryRegion io[2];
} ISAKBDState;
@@ -440,14 +444,16 @@ typedef struct ISAKBDState {
void i8042_isa_mouse_fake_event(void *opaque)
{
ISADevice *dev = opaque;
- KBDState *s = &(DO_UPCAST(ISAKBDState, dev, dev)->kbd);
+ ISAKBDState *isa = I8042(dev);
+ KBDState *s = &isa->kbd;
ps2_mouse_fake_event(s->mouse);
}
void i8042_setup_a20_line(ISADevice *dev, qemu_irq *a20_out)
{
- KBDState *s = &(DO_UPCAST(ISAKBDState, dev, dev)->kbd);
+ ISAKBDState *isa = I8042(dev);
+ KBDState *s = &isa->kbd;
s->a20_out = a20_out;
}
@@ -485,7 +491,7 @@ static const MemoryRegionOps i8042_cmd_ops = {
static int i8042_initfn(ISADevice *dev)
{
- ISAKBDState *isa_s = DO_UPCAST(ISAKBDState, dev, dev);
+ ISAKBDState *isa_s = I8042(dev);
KBDState *s = &isa_s->kbd;
isa_init_irq(dev, &s->irq_kbd, 1);
@@ -513,7 +519,7 @@ static void i8042_class_initfn(ObjectClass *klass, void
*data)
}
static const TypeInfo i8042_info = {
- .name = "i8042",
+ .name = TYPE_I8042,
.parent = TYPE_ISA_DEVICE,
.instance_size = sizeof(ISAKBDState),
.class_init = i8042_class_initfn,
--
1.8.1.4
- [Qemu-devel] [PATCH for-1.5 v2 04/20] i82374: QOM'ify, (continued)
- [Qemu-devel] [PATCH for-1.5 v2 04/20] i82374: QOM'ify, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 03/20] fdc: QOM'ify ISA floppy controller, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 07/20] m48t59: QOM'ify ISA M48T59 NVRAM, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 06/20] ide: QOM'ify ISA IDE, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 05/20] i8259: QOM cleanups, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 10/20] parallel: QOM'ify, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 08/20] mc146818rtc: QOM'ify, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 09/20] ne2000-isa: QOM'ify, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 11/20] pc: QOM'ify port 92, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 12/20] pckbd: QOM'ify,
Andreas Färber <=
- [Qemu-devel] [PATCH for-1.5 v2 13/20] pcspk: QOM'ify, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 14/20] sb16: QOM'ify, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 15/20] serial: QOM'ify ISA serial, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 16/20] sga: QOM'ify, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 17/20] vga-isa: QOM'ify ISA VGA, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 18/20] vmmouse: QOM'ify, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 19/20] vmport: QOM'ify, Andreas Färber, 2013/04/27
- [Qemu-devel] [PATCH for-1.5 v2 20/20] wdt_ib700: QOM'ify, Andreas Färber, 2013/04/27
- Re: [Qemu-devel] [PATCH for-1.5 v2 00/20] QOM realize for ISA, part 1, Anthony Liguori, 2013/04/29