[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/20] [MIPS] qdev: add a rtc forwarder device
From: |
Hervé Poussineau |
Subject: |
[Qemu-devel] [PATCH 13/20] [MIPS] qdev: add a rtc forwarder device |
Date: |
Sun, 1 Aug 2010 19:37:15 +0200 |
Use it in Jazz emulation
Signed-off-by: Hervé Poussineau <address@hidden>
---
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"
//#define DEBUG_CMOS
//#define DEBUG_COALESCED
@@ -631,7 +633,6 @@ ISADevice *rtc_init(int base_year, qemu_irq intercept_irq)
static ISADeviceInfo mc146818rtc_info = {
.qdev.name = "mc146818rtc",
.qdev.size = sizeof(RTCState),
- .qdev.no_user = 1,
.qdev.vmsd = &vmstate_rtc,
.init = rtc_initfn,
.qdev.props = (Property[]) {
@@ -640,8 +641,59 @@ static ISADeviceInfo mc146818rtc_info = {
}
};
+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, uint32_t
val)
+{
+ cpu_outw(0x71, val & 0xff);
+}
+
+static CPUReadMemoryFunc * const rtc_forward_read[3] = {
+ rtc_forward_readb,
+ rtc_forward_readb,
+ rtc_forward_readb,
+};
+
+static CPUWriteMemoryFunc * const rtc_forward_write[3] = {
+ 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 = FROM_SYSBUS(RtcForwardState, dev);
+ int io;
+
+ io = 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 = {
+ .qdev.name = "rtc-forward",
+ .qdev.size = sizeof(RtcForwardState),
+ .init = rtc_forward_init,
+ .qdev.props = (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,
};
-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 val)
-{
- cpu_outw(0x71, val & 0xff);
-}
-
-static CPUReadMemoryFunc * const rtc_read[3] = {
- rtc_readb,
- rtc_readb,
- rtc_readb,
-};
-
-static CPUWriteMemoryFunc * const rtc_write[3] = {
- rtc_writeb,
- rtc_writeb,
- rtc_writeb,
-};
-
static void dma_dummy_writeb(void *opaque, target_phys_addr_t addr, uint32_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,
/* Real time clock */
rtc_init(1980, NULL);
- s_rtc = cpu_register_io_memory(rtc_read, rtc_write, NULL);
- cpu_register_physical_memory(0x80004000, 0x00001000, s_rtc);
+ dev = qdev_create(NULL, "rtc-forward");
+ qdev_init_nofail(dev);
/* Keyboard (i8042) */
rc4030_create_simple("rc4030-i8042");
--
1.7.1.GIT
- [Qemu-devel] [PATCH 03/20] [MIPS] Jazz emulation: create a qdev cpu, (continued)
- [Qemu-devel] [PATCH 03/20] [MIPS] Jazz emulation: create a qdev cpu, Hervé Poussineau, 2010/08/01
- [Qemu-devel] [PATCH 04/20] [MIPS] rc4030: convert to qdev, Hervé Poussineau, 2010/08/01
- [Qemu-devel] [PATCH 05/20] Add a stub for some rc4030 functions, if rc4030 support is not compiled in., Hervé Poussineau, 2010/08/01
- [Qemu-devel] [PATCH 06/20] [MIPS] qdev: convert i8042 to rc4030 device, Hervé Poussineau, 2010/08/01
- [Qemu-devel] [PATCH 07/20] [MIPS] qdev: convert parallel port to rc4030 device, Hervé Poussineau, 2010/08/01
- [Qemu-devel] [PATCH 08/20] [MIPS] qdev: convert serial port to rc4030 device, Hervé Poussineau, 2010/08/01
- [Qemu-devel] [PATCH 09/20] [MIPS] qdev: convert jazz-led to sysbus device, Hervé Poussineau, 2010/08/01
- [Qemu-devel] [PATCH 10/20] [MIPS] Jazz emulation: make video card optional, Hervé Poussineau, 2010/08/01
- [Qemu-devel] [PATCH 11/20] [MIPS] qdev: convert vga-isa-mm to ISA device, Hervé Poussineau, 2010/08/01
- [Qemu-devel] [PATCH 12/20] [MIPS] qdev: convert g364fb to rc4030 device, Hervé Poussineau, 2010/08/01
- [Qemu-devel] [PATCH 13/20] [MIPS] qdev: add a rtc forwarder device,
Hervé Poussineau <=
- [Qemu-devel] [PATCH 14/20] [MIPS] qdev: add an isa bus device, Hervé Poussineau, 2010/08/01
- [Qemu-devel] [PATCH 15/20] [MIPS] qdev: convert dp83932 network card to rc4030 device, Hervé Poussineau, 2010/08/01
- [Qemu-devel] [PATCH 16/20] [MIPS] qdev: convert floppy disk controller to rc4030 device, Hervé Poussineau, 2010/08/01
- [Qemu-devel] [PATCH 17/20] [MIPS] qdev: convert esp scsi adapter to rc4030 device, Hervé Poussineau, 2010/08/01
- [Qemu-devel] [PATCH 18/20] [MIPS] qdev: convert ds1225y nvram to sysbus device, Hervé Poussineau, 2010/08/01
- [Qemu-devel] [PATCH 19/20] [MIPS] qdev: add a mips board device, which initializes the ram and the rom, Hervé Poussineau, 2010/08/01
- [Qemu-devel] [PATCH 20/20] [MIPS] qdev: Complete rc4030 conversion, by removing legacy stuff, Hervé Poussineau, 2010/08/01
- Re: [Qemu-devel] [PATCH 00/20] MIPS Magnum conversion to qdev, Blue Swirl, 2010/08/02