From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=41965 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ofd0R-0007C6-9v for qemu-devel@nongnu.org; Sun, 01 Aug 2010 14:11:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Ofd0P-00061l-R4 for qemu-devel@nongnu.org; Sun, 01 Aug 2010 14:11:27 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:43793) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ofd0P-00061M-5d for qemu-devel@nongnu.org; Sun, 01 Aug 2010 14:11:25 -0400 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sun, 1 Aug 2010 19:37:15 +0200 Message-Id: <1280684242-19611-13-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 13/20] [MIPS] qdev: add a rtc forwarder 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/mc146818rtc.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++= +++++- hw/mips_jazz.c | 28 +++------------------------- 2 files changed, 56 insertions(+), 26 deletions(-) diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c index 2b91fa8..674d24f 100644 --- a/hw/mc146818rtc.c +++ b/hw/mc146818rtc.c @@ -28,6 +28,8 @@ #include "apic.h" #include "isa.h" #include "mc146818rtc.h" +#include "sysbus.h" +#include "qdev-addr.h" =20 //#define DEBUG_CMOS //#define DEBUG_COALESCED @@ -631,7 +633,6 @@ ISADevice *rtc_init(int base_year, qemu_irq intercept= _irq) static ISADeviceInfo mc146818rtc_info =3D { .qdev.name =3D "mc146818rtc", .qdev.size =3D sizeof(RTCState), - .qdev.no_user =3D 1, .qdev.vmsd =3D &vmstate_rtc, .init =3D rtc_initfn, .qdev.props =3D (Property[]) { @@ -640,8 +641,59 @@ static ISADeviceInfo mc146818rtc_info =3D { } }; =20 +static uint32_t rtc_forward_readb(void *opaque, target_phys_addr_t addr) +{ + return cpu_inw(0x71); +} + +static void rtc_forward_writeb(void *opaque, target_phys_addr_t addr, ui= nt32_t val) +{ + cpu_outw(0x71, val & 0xff); +} + +static CPUReadMemoryFunc * const rtc_forward_read[3] =3D { + rtc_forward_readb, + rtc_forward_readb, + rtc_forward_readb, +}; + +static CPUWriteMemoryFunc * const rtc_forward_write[3] =3D { + rtc_forward_writeb, + rtc_forward_writeb, + rtc_forward_writeb, +}; + +typedef struct RtcForwardState { + SysBusDevice busdev; + target_phys_addr_t iobase; + uint32_t size; +} RtcForwardState; + +static int rtc_forward_init(SysBusDevice *dev) +{ + RtcForwardState *s =3D FROM_SYSBUS(RtcForwardState, dev); + int io; + + io =3D cpu_register_io_memory(rtc_forward_read, rtc_forward_write, s= ); + cpu_register_physical_memory(s->iobase, s->size, io); + + return 0; +} + +static SysBusDeviceInfo rtc_forward_info =3D { + .qdev.name =3D "rtc-forward", + .qdev.size =3D sizeof(RtcForwardState), + .init =3D rtc_forward_init, + .qdev.props =3D (Property[]) { + DEFINE_PROP_TADDR("iobase", RtcForwardState, iobase, 0x80004000)= , + DEFINE_PROP_HEX32("size", RtcForwardState, size, 0x1000), + DEFINE_PROP_END_OF_LIST(), + }, +}; + static void mc146818rtc_register(void) { isa_qdev_register(&mc146818rtc_info); + sysbus_register_withprop(&rtc_forward_info); } device_init(mc146818rtc_register) diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c index c4f3721..b9c6b62 100644 --- a/hw/mips_jazz.c +++ b/hw/mips_jazz.c @@ -44,28 +44,6 @@ enum jazz_model_e JAZZ_PICA61, }; =20 -static uint32_t rtc_readb(void *opaque, target_phys_addr_t addr) -{ - return cpu_inw(0x71); -} - -static void rtc_writeb(void *opaque, target_phys_addr_t addr, uint32_t v= al) -{ - cpu_outw(0x71, val & 0xff); -} - -static CPUReadMemoryFunc * const rtc_read[3] =3D { - rtc_readb, - rtc_readb, - rtc_readb, -}; - -static CPUWriteMemoryFunc * const rtc_write[3] =3D { - rtc_writeb, - rtc_writeb, - rtc_writeb, -}; - static void dma_dummy_writeb(void *opaque, target_phys_addr_t addr, uint= 32_t val) { /* Nothing to do. That is only to ensure that @@ -128,7 +106,7 @@ void mips_jazz_init (ram_addr_t ram_size, qemu_irq *rc4030, *i8259; rc4030_dma *dmas; void* rc4030_opaque; - int s_rtc, s_dma_dummy; + int s_dma_dummy; NICInfo *nd; PITState *pit; DriveInfo *fds[MAX_FD]; @@ -251,8 +229,8 @@ void mips_jazz_init (ram_addr_t ram_size, =20 /* Real time clock */ rtc_init(1980, NULL); - s_rtc =3D cpu_register_io_memory(rtc_read, rtc_write, NULL); - cpu_register_physical_memory(0x80004000, 0x00001000, s_rtc); + dev =3D qdev_create(NULL, "rtc-forward"); + qdev_init_nofail(dev); =20 /* Keyboard (i8042) */ rc4030_create_simple("rc4030-i8042"); --=20 1.7.1.GIT