spitz: QOM cast cleanup for SpitzKeyboardState
Introduce a type constant, use QOM casts, rename the parent field and prepare for QOM realize. Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
parent
7eb8104a9c
commit
73e9d965dd
|
@ -215,8 +215,13 @@ static const int spitz_gpiomap[5] = {
|
||||||
SPITZ_GPIO_SWA, SPITZ_GPIO_SWB,
|
SPITZ_GPIO_SWA, SPITZ_GPIO_SWB,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#define TYPE_SPITZ_KEYBOARD "spitz-keyboard"
|
||||||
|
#define SPITZ_KEYBOARD(obj) \
|
||||||
|
OBJECT_CHECK(SpitzKeyboardState, (obj), TYPE_SPITZ_KEYBOARD)
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
SysBusDevice busdev;
|
SysBusDevice parent_obj;
|
||||||
|
|
||||||
qemu_irq sense[SPITZ_KEY_SENSE_NUM];
|
qemu_irq sense[SPITZ_KEY_SENSE_NUM];
|
||||||
qemu_irq gpiomap[5];
|
qemu_irq gpiomap[5];
|
||||||
int keymap[0x80];
|
int keymap[0x80];
|
||||||
|
@ -461,8 +466,8 @@ static void spitz_keyboard_register(PXA2xxState *cpu)
|
||||||
DeviceState *dev;
|
DeviceState *dev;
|
||||||
SpitzKeyboardState *s;
|
SpitzKeyboardState *s;
|
||||||
|
|
||||||
dev = sysbus_create_simple("spitz-keyboard", -1, NULL);
|
dev = sysbus_create_simple(TYPE_SPITZ_KEYBOARD, -1, NULL);
|
||||||
s = FROM_SYSBUS(SpitzKeyboardState, SYS_BUS_DEVICE(dev));
|
s = SPITZ_KEYBOARD(dev);
|
||||||
|
|
||||||
for (i = 0; i < SPITZ_KEY_SENSE_NUM; i ++)
|
for (i = 0; i < SPITZ_KEY_SENSE_NUM; i ++)
|
||||||
qdev_connect_gpio_out(dev, i, qdev_get_gpio_in(cpu->gpio, spitz_gpio_key_sense[i]));
|
qdev_connect_gpio_out(dev, i, qdev_get_gpio_in(cpu->gpio, spitz_gpio_key_sense[i]));
|
||||||
|
@ -485,13 +490,12 @@ static void spitz_keyboard_register(PXA2xxState *cpu)
|
||||||
qemu_add_kbd_event_handler(spitz_keyboard_handler, s);
|
qemu_add_kbd_event_handler(spitz_keyboard_handler, s);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int spitz_keyboard_init(SysBusDevice *dev)
|
static int spitz_keyboard_init(SysBusDevice *sbd)
|
||||||
{
|
{
|
||||||
SpitzKeyboardState *s;
|
DeviceState *dev = DEVICE(sbd);
|
||||||
|
SpitzKeyboardState *s = SPITZ_KEYBOARD(dev);
|
||||||
int i, j;
|
int i, j;
|
||||||
|
|
||||||
s = FROM_SYSBUS(SpitzKeyboardState, dev);
|
|
||||||
|
|
||||||
for (i = 0; i < 0x80; i ++)
|
for (i = 0; i < 0x80; i ++)
|
||||||
s->keymap[i] = -1;
|
s->keymap[i] = -1;
|
||||||
for (i = 0; i < SPITZ_KEY_SENSE_NUM + 1; i ++)
|
for (i = 0; i < SPITZ_KEY_SENSE_NUM + 1; i ++)
|
||||||
|
@ -502,8 +506,8 @@ static int spitz_keyboard_init(SysBusDevice *dev)
|
||||||
spitz_keyboard_pre_map(s);
|
spitz_keyboard_pre_map(s);
|
||||||
|
|
||||||
s->kbdtimer = qemu_new_timer_ns(vm_clock, spitz_keyboard_tick, s);
|
s->kbdtimer = qemu_new_timer_ns(vm_clock, spitz_keyboard_tick, s);
|
||||||
qdev_init_gpio_in(&dev->qdev, spitz_keyboard_strobe, SPITZ_KEY_STROBE_NUM);
|
qdev_init_gpio_in(dev, spitz_keyboard_strobe, SPITZ_KEY_STROBE_NUM);
|
||||||
qdev_init_gpio_out(&dev->qdev, s->sense, SPITZ_KEY_SENSE_NUM);
|
qdev_init_gpio_out(dev, s->sense, SPITZ_KEY_SENSE_NUM);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -1065,7 +1069,7 @@ static void spitz_keyboard_class_init(ObjectClass *klass, void *data)
|
||||||
}
|
}
|
||||||
|
|
||||||
static const TypeInfo spitz_keyboard_info = {
|
static const TypeInfo spitz_keyboard_info = {
|
||||||
.name = "spitz-keyboard",
|
.name = TYPE_SPITZ_KEYBOARD,
|
||||||
.parent = TYPE_SYS_BUS_DEVICE,
|
.parent = TYPE_SYS_BUS_DEVICE,
|
||||||
.instance_size = sizeof(SpitzKeyboardState),
|
.instance_size = sizeof(SpitzKeyboardState),
|
||||||
.class_init = spitz_keyboard_class_init,
|
.class_init = spitz_keyboard_class_init,
|
||||||
|
|
Loading…
Reference in a new issue