From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=41861 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ofd07-0006xg-It for qemu-devel@nongnu.org; Sun, 01 Aug 2010 14:11:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Ofd05-0005xT-Ox for qemu-devel@nongnu.org; Sun, 01 Aug 2010 14:11:07 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:43375) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ofd05-0005wr-6y for qemu-devel@nongnu.org; Sun, 01 Aug 2010 14:11:05 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sun, 1 Aug 2010 19:37:10 +0200 Message-Id: <1280684242-19611-8-git-send-email-hpoussin@reactos.org> In-Reply-To: <4C5579DA.8050508@reactos.org> References: <4C5579DA.8050508@reactos.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 08/20] [MIPS] qdev: convert serial port to rc4030 device List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Use it in Jazz emulation Signed-off-by: Herv=C3=A9 Poussineau --- hw/mips_jazz.c | 12 +------- hw/pc.h | 1 + hw/serial.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++= ++++++ 3 files changed, 81 insertions(+), 10 deletions(-) diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c index a027559..1298bc1 100644 --- a/hw/mips_jazz.c +++ b/hw/mips_jazz.c @@ -256,18 +256,10 @@ void mips_jazz_init (ram_addr_t ram_size, =20 /* Serial ports */ if (serial_hds[0]) { -#ifdef TARGET_WORDS_BIGENDIAN - serial_mm_init(0x80006000, 0, rc4030[8], 8000000/16, serial_hds[= 0], 1, 1); -#else - serial_mm_init(0x80006000, 0, rc4030[8], 8000000/16, serial_hds[= 0], 1, 0); -#endif + serial_rc4030_init(0, serial_hds[0]); } if (serial_hds[1]) { -#ifdef TARGET_WORDS_BIGENDIAN - serial_mm_init(0x80007000, 0, rc4030[9], 8000000/16, serial_hds[= 1], 1, 1); -#else - serial_mm_init(0x80007000, 0, rc4030[9], 8000000/16, serial_hds[= 1], 1, 0); -#endif + serial_rc4030_init(1, serial_hds[1]); } =20 /* Parallel port */ diff --git a/hw/pc.h b/hw/pc.h index 61b5fbb..f5a479a 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -17,6 +17,7 @@ SerialState *serial_mm_init (target_phys_addr_t base, i= nt it_shift, CharDriverState *chr, int ioregister, int be); SerialState *serial_isa_init(int index, CharDriverState *chr); +SerialState *serial_rc4030_init(int index, CharDriverState *chr); void serial_set_frequency(SerialState *s, uint32_t frequency); =20 /* parallel.c */ diff --git a/hw/serial.c b/hw/serial.c index b66d13a..0c13cbb 100644 --- a/hw/serial.c +++ b/hw/serial.c @@ -28,6 +28,8 @@ #include "pc.h" #include "qemu-timer.h" #include "sysemu.h" +#include "rc4030.h" +#include "qdev-addr.h" =20 //#define DEBUG_SERIAL =20 @@ -155,6 +157,14 @@ typedef struct ISASerialState { SerialState state; } ISASerialState; =20 +typedef struct RC4030SerialState { + RC4030Device dev; + uint32_t index; + target_phys_addr_t iobase; + uint32_t irq; + SerialState state; +} RC4030SerialState; + static void serial_receive1(void *opaque, const uint8_t *buf, int size); =20 static void fifo_clear(SerialState *s, int fifo) @@ -964,6 +974,59 @@ SerialState *serial_mm_init (target_phys_addr_t base= , int it_shift, return s; } =20 +static const target_phys_addr_t rc4030_serial_io[] =3D { 0x80006000, 0x8= 0007000 }; +static const uint32_t rc4030_serial_irq[] =3D { 8, 9 }; + +static int serial_rc4030_initfn(RC4030Device *dev) +{ + static int index; + RC4030SerialState *rc4030 =3D DO_UPCAST(RC4030SerialState, dev, dev)= ; + SerialState *s =3D &rc4030->state; + int s_io; + + if (rc4030->index =3D=3D -1) + rc4030->index =3D index; + if (rc4030->index >=3D ARRAY_SIZE(rc4030_serial_io)) + return -1; + if (rc4030->iobase =3D=3D -1) + rc4030->iobase =3D rc4030_serial_io[rc4030->index]; + if (rc4030->irq =3D=3D -1) + rc4030->irq =3D rc4030_serial_irq[rc4030->index]; + index++; + + s->baudbase =3D 8000000 / 16; + rc4030_init_irq(dev, &s->irq, rc4030->irq); + serial_init_core(s); + + s_io =3D cpu_register_io_memory(serial_mm_read_le, + serial_mm_write_le, s); + cpu_register_physical_memory(rc4030->iobase, 8, s_io); + + return 0; +} + +SerialState *serial_rc4030_init(int index, CharDriverState *chr) +{ + RC4030Device *dev; + + dev =3D rc4030_create("rc4030-serial"); + qdev_prop_set_uint32(&dev->qdev, "index", index); + qdev_prop_set_chr(&dev->qdev, "chardev", chr); + if (qdev_init(&dev->qdev) < 0) + return NULL; + return &DO_UPCAST(RC4030SerialState, dev, dev)->state; +} + +static const VMStateDescription vmstate_rc4030_serial =3D { + .name =3D "serial", + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField []) { + VMSTATE_STRUCT(state, RC4030SerialState, 0, vmstate_serial, Seri= alState), + VMSTATE_END_OF_LIST() + } +}; + static ISADeviceInfo serial_isa_info =3D { .qdev.name =3D "isa-serial", .qdev.size =3D sizeof(ISASerialState), @@ -978,9 +1041,24 @@ static ISADeviceInfo serial_isa_info =3D { }, }; =20 +static RC4030DeviceInfo serial_rc4030_info =3D { + .qdev.name =3D "rc4030-serial", + .qdev.size =3D sizeof(RC4030SerialState), + .qdev.vmsd =3D &vmstate_rc4030_serial, + .init =3D serial_rc4030_initfn, + .qdev.props =3D (Property[]) { + DEFINE_PROP_UINT32("index", RC4030SerialState, index, -1), + DEFINE_PROP_TADDR("iobase", RC4030SerialState, iobase, -1), + DEFINE_PROP_UINT32("irq", RC4030SerialState, irq, -1), + DEFINE_PROP_CHR("chardev", RC4030SerialState, state.chr), + DEFINE_PROP_END_OF_LIST(), + }, +}; + static void serial_register_devices(void) { isa_qdev_register(&serial_isa_info); + rc4030_qdev_register(&serial_rc4030_info); } =20 device_init(serial_register_devices) --=20 1.7.1.GIT