diff options
| author | aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-01-18 14:08:04 +0000 |
|---|---|---|
| committer | aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-01-18 14:08:04 +0000 |
| commit | ceecf1d158d324c61a7ec1ba5de57dbc8a0f8373 (patch) | |
| tree | bb58577711ef3fedae6ebbe731ac4da7f2d85bde /hw/omap1.c | |
| parent | 9c554c1c0b01642c39232489cef8301a7858824d (diff) | |
| download | qemu-ceecf1d158d324c61a7ec1ba5de57dbc8a0f8373.tar.gz | |
add an init function parameter to qemu_chr_open()
And use it for the malta emulation. Fix segfault introduced in
revision 6352.
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6365 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/omap1.c')
| -rw-r--r-- | hw/omap1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/omap1.c b/hw/omap1.c index 4c79028698..c32d3f7f09 100644 --- a/hw/omap1.c +++ b/hw/omap1.c @@ -1988,7 +1988,7 @@ struct omap_uart_s *omap_uart_init(target_phys_addr_t base, s->fclk = fclk; s->irq = irq; s->serial = serial_mm_init(base, 2, irq, omap_clk_getrate(fclk)/16, - chr ?: qemu_chr_open("null", "null"), 1); + chr ?: qemu_chr_open("null", "null", NULL), 1); return s; } @@ -2104,7 +2104,7 @@ void omap_uart_attach(struct omap_uart_s *s, CharDriverState *chr) /* TODO: Should reuse or destroy current s->serial */ s->serial = serial_mm_init(s->base, 2, s->irq, omap_clk_getrate(s->fclk) / 16, - chr ?: qemu_chr_open("null", "null"), 1); + chr ?: qemu_chr_open("null", "null", NULL), 1); } /* MPU Clock/Reset/Power Mode Control */ |