From ee6847d19be16c789b8bd4e553b7cd6701ba1245 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 15 Jul 2009 13:43:31 +0200 Subject: qdev: rework device properties. This patch is a major overhaul of the device properties. The properties are saved directly in the device state struct now, the linked list of property values is gone. Advantages: * We don't have to maintain the list with the property values. * The value in the property list and the value actually used by the device can't go out of sync any more (used to happen for the pci.devfn == -1 case) because there is only one place where the value is stored. * A record describing the property is required now, you can't set random properties any more. There are bus-specific and device-specific properties. The former should be used for properties common to all bus drivers. Typical use case is bus addressing, i.e. pci.devfn and i2c.address. Properties have a PropertyInfo struct attached with name, size and function pointers to parse and print properties. A few common property types have PropertyInfos defined in qdev-properties.c. Drivers are free to implement their own very special property parsers if needed. Properties can have default values. If unset they are zero-filled. Signed-off-by: Gerd Hoffmann Signed-off-by: Anthony Liguori --- hw/syborg_pointer.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) (limited to 'hw/syborg_pointer.c') diff --git a/hw/syborg_pointer.c b/hw/syborg_pointer.c index e0a892d003..edd1f2229e 100644 --- a/hw/syborg_pointer.c +++ b/hw/syborg_pointer.c @@ -45,11 +45,11 @@ typedef struct { typedef struct { SysBusDevice busdev; int int_enabled; - int fifo_size; + uint32_t fifo_size; event_data *event_fifo; int read_pos, read_count; qemu_irq irq; - int absolute; + uint32_t absolute; } SyborgPointerState; static void syborg_pointer_update(SyborgPointerState *s) @@ -209,8 +209,6 @@ static void syborg_pointer_init(SysBusDevice *dev) syborg_pointer_writefn, s); sysbus_init_mmio(dev, 0x1000, iomemtype); - s->absolute = qdev_get_prop_int(&dev->qdev, "absolute", 1); - s->fifo_size = qdev_get_prop_int(&dev->qdev, "fifo-size", 16); if (s->fifo_size <= 0) { fprintf(stderr, "syborg_pointer: fifo too small\n"); s->fifo_size = 16; @@ -224,10 +222,29 @@ static void syborg_pointer_init(SysBusDevice *dev) syborg_pointer_save, syborg_pointer_load, s); } +static SysBusDeviceInfo syborg_pointer_info = { + .init = syborg_pointer_init, + .qdev.name = "syborg,pointer", + .qdev.size = sizeof(SyborgPointerState), + .qdev.props = (Property[]) { + { + .name = "fifo-size", + .info = &qdev_prop_uint32, + .offset = offsetof(SyborgPointerState, fifo_size), + .defval = (uint32_t[]) { 16 }, + },{ + .name = "absolute", + .info = &qdev_prop_uint32, + .offset = offsetof(SyborgPointerState, absolute), + .defval = (uint32_t[]) { 1 }, + }, + {/* end of list */} + } +}; + static void syborg_pointer_register_devices(void) { - sysbus_register_dev("syborg,pointer", sizeof(SyborgPointerState), - syborg_pointer_init); + sysbus_register_withprop(&syborg_pointer_info); } device_init(syborg_pointer_register_devices) -- cgit 1.4.1