From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50038) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcY8L-0005oo-PG for qemu-devel@nongnu.org; Mon, 30 Mar 2015 07:45:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YcY8E-0001u4-Qm for qemu-devel@nongnu.org; Mon, 30 Mar 2015 07:45:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53729) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcY8E-0001ty-Li for qemu-devel@nongnu.org; Mon, 30 Mar 2015 07:45:26 -0400 From: Paolo Bonzini Date: Mon, 30 Mar 2015 13:45:14 +0200 Message-Id: <1427715918-25768-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1427715918-25768-1-git-send-email-pbonzini@redhat.com> References: <1427715918-25768-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH for-2.3 2/6] gus: clean up MemoryRegionPortio List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Mark Cave-Ayland Remove 16-bit reads/writes, since ioport.c is able to synthesize them. Remove the two MIDI registers (0x300 and 0x301) from gus_portio_list1, and add the second MIDI register (0x301) to gus_portio_list2. Tested with 2nd Reality. Signed-off-by: Paolo Bonzini --- hw/audio/gus.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/hw/audio/gus.c b/hw/audio/gus.c index 4a43ce7..772010e 100644 --- a/hw/audio/gus.c +++ b/hw/audio/gus.c @@ -71,13 +71,6 @@ IO_READ_PROTO (gus_readb) return gus_read (&s->emu, nport, 1); } -IO_READ_PROTO (gus_readw) -{ - GUSState *s = opaque; - - return gus_read (&s->emu, nport, 2); -} - IO_WRITE_PROTO (gus_writeb) { GUSState *s = opaque; @@ -85,13 +78,6 @@ IO_WRITE_PROTO (gus_writeb) gus_write (&s->emu, nport, 1, val); } -IO_WRITE_PROTO (gus_writew) -{ - GUSState *s = opaque; - - gus_write (&s->emu, nport, 2, val); -} - static int write_audio (GUSState *s, int samples) { int net = 0; @@ -236,17 +222,13 @@ static const VMStateDescription vmstate_gus = { static const MemoryRegionPortio gus_portio_list1[] = { {0x000, 1, 1, .write = gus_writeb }, - {0x000, 1, 2, .write = gus_writew }, {0x006, 10, 1, .read = gus_readb, .write = gus_writeb }, - {0x006, 10, 2, .read = gus_readw, .write = gus_writew }, - {0x100, 8, 1, .read = gus_readb, .write = gus_writeb }, - {0x100, 8, 2, .read = gus_readw, .write = gus_writew }, + {0x102, 6, 1, .read = gus_readb, .write = gus_writeb }, PORTIO_END_OF_LIST (), }; static const MemoryRegionPortio gus_portio_list2[] = { - {0, 1, 1, .read = gus_readb }, - {0, 1, 2, .read = gus_readw }, + {0, 2, 1, .read = gus_readb }, PORTIO_END_OF_LIST (), }; -- 2.3.4