diff options
| author | Edgar E. Iglesias <edgar.iglesias@gmail.com> | 2011-06-30 10:52:22 +0200 |
|---|---|---|
| committer | Edgar E. Iglesias <edgar.iglesias@gmail.com> | 2011-06-30 10:52:22 +0200 |
| commit | 20be39de592d883fc8b08d73349c70eb04e92f36 (patch) | |
| tree | ae39251bb480be54337e5ada1c90f33a5dfe2406 | |
| parent | 1dfdcaa83f9ce34aded8bc0669e81753d94f1b7d (diff) | |
| download | qemu-20be39de592d883fc8b08d73349c70eb04e92f36.zip qemu-20be39de592d883fc8b08d73349c70eb04e92f36.tar.gz qemu-20be39de592d883fc8b08d73349c70eb04e92f36.tar.bz2 | |
etraxfs-ser: Correct default value for RW_REC_CTRL
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
| -rw-r--r-- | hw/etraxfs_ser.c | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/hw/etraxfs_ser.c b/hw/etraxfs_ser.c index 2787ebd..b917d4d 100644 --- a/hw/etraxfs_ser.c +++ b/hw/etraxfs_ser.c @@ -190,15 +190,23 @@ static void serial_event(void *opaque, int event) } -static int etraxfs_ser_init(SysBusDevice *dev) +static void etraxfs_ser_reset(DeviceState *d) { - struct etrax_serial *s = FROM_SYSBUS(typeof (*s), dev); - int ser_regs; + struct etrax_serial *s = container_of(d, typeof(*s), busdev.qdev); /* transmitter begins ready and idle. */ s->regs[RS_STAT_DIN] |= (1 << STAT_TR_RDY); s->regs[RS_STAT_DIN] |= (1 << STAT_TR_IDLE); + s->regs[RW_REC_CTRL] = 0x10000; + +} + +static int etraxfs_ser_init(SysBusDevice *dev) +{ + struct etrax_serial *s = FROM_SYSBUS(typeof (*s), dev); + int ser_regs; + sysbus_init_irq(dev, &s->irq); ser_regs = cpu_register_io_memory(ser_read, ser_write, s, DEVICE_NATIVE_ENDIAN); @@ -211,10 +219,16 @@ static int etraxfs_ser_init(SysBusDevice *dev) return 0; } +static SysBusDeviceInfo etraxfs_ser_info = { + .init = etraxfs_ser_init, + .qdev.name = "etraxfs,serial", + .qdev.size = sizeof(struct etrax_serial), + .qdev.reset = etraxfs_ser_reset, +}; + static void etraxfs_serial_register(void) { - sysbus_register_dev("etraxfs,serial", sizeof (struct etrax_serial), - etraxfs_ser_init); + sysbus_register_withprop(&etraxfs_ser_info); } device_init(etraxfs_serial_register) |