[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 8/9] sm501: Pass address_space_mem to sm501_init.
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 8/9] sm501: Pass address_space_mem to sm501_init. |
Date: |
Thu, 11 Aug 2011 16:07:20 -0700 |
Signed-off-by: Richard Henderson <address@hidden>
---
hw/devices.h | 6 +++++-
hw/r2d.c | 3 ++-
hw/sm501.c | 7 +++----
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/hw/devices.h b/hw/devices.h
index 07fda83..36c21e7 100644
--- a/hw/devices.h
+++ b/hw/devices.h
@@ -1,6 +1,9 @@
#ifndef QEMU_DEVICES_H
#define QEMU_DEVICES_H
+/* ??? Not all users of this file can include cpu-common.h. */
+typedef struct MemoryRegion MemoryRegion;
+
/* Devices that have nowhere better to go. */
/* smc91c111.c */
@@ -57,7 +60,8 @@ qemu_irq *tc6393xb_gpio_in_get(TC6393xbState *s);
qemu_irq tc6393xb_l3v_get(TC6393xbState *s);
/* sm501.c */
-void sm501_init(uint32_t base, uint32_t local_mem_bytes, qemu_irq irq,
+void sm501_init(MemoryRegion *address_space_mem, uint32_t base,
+ uint32_t local_mem_bytes, qemu_irq irq,
CharDriverState *chr);
#endif
diff --git a/hw/r2d.c b/hw/r2d.c
index e9ec58f..1338cd7 100644
--- a/hw/r2d.c
+++ b/hw/r2d.c
@@ -262,7 +262,8 @@ static void r2d_init(MemoryRegion *address_space_mem,
sysbus_create_varargs("sh_pci", 0x1e200000, irq[PCI_INTA], irq[PCI_INTB],
irq[PCI_INTC], irq[PCI_INTD], NULL);
- sm501_init(0x10000000, SM501_VRAM_SIZE, irq[SM501], serial_hds[2]);
+ sm501_init(address_space_mem, 0x10000000, SM501_VRAM_SIZE,
+ irq[SM501], serial_hds[2]);
/* onboard CF (True IDE mode, Master only). */
dinfo = drive_get(IF_IDE, 0, 0);
diff --git a/hw/sm501.c b/hw/sm501.c
index 56db3b9..8ec498f 100644
--- a/hw/sm501.c
+++ b/hw/sm501.c
@@ -30,7 +30,6 @@
#include "sysbus.h"
#include "qdev-addr.h"
#include "range.h"
-#include "exec-memory.h"
/*
* Status: 2010/05/07
@@ -1386,8 +1385,8 @@ static void sm501_update_display(void *opaque)
sm501_draw_crt(s);
}
-void sm501_init(uint32_t base, uint32_t local_mem_bytes, qemu_irq irq,
- CharDriverState *chr)
+void sm501_init(MemoryRegion *address_space_mem, uint32_t base,
+ uint32_t local_mem_bytes, qemu_irq irq, CharDriverState *chr)
{
SM501State * s;
DeviceState *dev;
@@ -1441,7 +1440,7 @@ void sm501_init(uint32_t base, uint32_t local_mem_bytes,
qemu_irq irq,
/* bridge to serial emulation module */
if (chr) {
- serial_mm_init(get_system_memory(),
+ serial_mm_init(address_space_mem,
base + MMIO_BASE_OFFSET + SM501_UART0, 2,
NULL, /* TODO : chain irq to IRL */
115200, chr, DEVICE_NATIVE_ENDIAN);
--
1.7.6
- [Qemu-devel] [PATCH 0/9] Convert serial_mm_init to MemoryRegion, Richard Henderson, 2011/08/11
- [Qemu-devel] [PATCH 1/9] serial: Convert serial_mm_init to MemoryRegion., Richard Henderson, 2011/08/11
- [Qemu-devel] [PATCH 2/9] serial: Use enum device_endian in serial_mm_init parameter., Richard Henderson, 2011/08/11
- [Qemu-devel] [PATCH 5/9] ppc405: Pass in address_space_mem to ppc405{cr, ep}_init., Richard Henderson, 2011/08/11
- [Qemu-devel] [PATCH 4/9] serial: Add MemoryRegion parameter to serial_mm_init., Richard Henderson, 2011/08/11
- [Qemu-devel] [PATCH 6/9] ppc440: Pass in address_space_mem to ppc440ep_init., Richard Henderson, 2011/08/11
- [Qemu-devel] [PATCH 7/9] pxa: Pass in address_space to pxa{255, 270}_init., Richard Henderson, 2011/08/11
- [Qemu-devel] [PATCH 9/9] sun4u: Pass address_space_mem to sun4uv_init., Richard Henderson, 2011/08/11
- [Qemu-devel] [PATCH 8/9] sm501: Pass address_space_mem to sm501_init.,
Richard Henderson <=
- [Qemu-devel] [PATCH 3/9] serial: Remove ioregister parameter from serial_mm_init., Richard Henderson, 2011/08/11
- Re: [Qemu-devel] [PATCH 0/9] Convert serial_mm_init to MemoryRegion, Avi Kivity, 2011/08/14