aboutsummaryrefslogtreecommitdiff
path: root/hw/syborg_serial.c
diff options
context:
space:
mode:
Diffstat (limited to 'hw/syborg_serial.c')
-rw-r--r--hw/syborg_serial.c21
1 files changed, 17 insertions, 4 deletions
diff --git a/hw/syborg_serial.c b/hw/syborg_serial.c
index f430508018..f69342154a 100644
--- a/hw/syborg_serial.c
+++ b/hw/syborg_serial.c
@@ -59,7 +59,7 @@ enum {
typedef struct {
SysBusDevice busdev;
uint32_t int_enable;
- int fifo_size;
+ uint32_t fifo_size;
uint32_t *read_fifo;
int read_pos;
int read_count;
@@ -329,7 +329,6 @@ static void syborg_serial_init(SysBusDevice *dev)
qemu_chr_add_handlers(s->chr, syborg_serial_can_receive,
syborg_serial_receive, syborg_serial_event, s);
}
- s->fifo_size = qdev_get_prop_int(&dev->qdev, "fifo-size", 16);
if (s->fifo_size <= 0) {
fprintf(stderr, "syborg_serial: fifo too small\n");
s->fifo_size = 16;
@@ -340,10 +339,24 @@ static void syborg_serial_init(SysBusDevice *dev)
syborg_serial_save, syborg_serial_load, s);
}
+static SysBusDeviceInfo syborg_serial_info = {
+ .init = syborg_serial_init,
+ .qdev.name = "syborg,serial",
+ .qdev.size = sizeof(SyborgSerialState),
+ .qdev.props = (Property[]) {
+ {
+ .name = "fifo-size",
+ .info = &qdev_prop_uint32,
+ .offset = offsetof(SyborgSerialState, fifo_size),
+ .defval = (uint32_t[]) { 16 },
+ },
+ {/* end of list */}
+ }
+};
+
static void syborg_serial_register_devices(void)
{
- sysbus_register_dev("syborg,serial", sizeof(SyborgSerialState),
- syborg_serial_init);
+ sysbus_register_withprop(&syborg_serial_info);
}
device_init(syborg_serial_register_devices)