[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/11] bonito: convert north bridge pci config to me
From: |
Benoît Canet |
Subject: |
[Qemu-devel] [PATCH 08/11] bonito: convert north bridge pci config to memory API |
Date: |
Tue, 22 Nov 2011 15:23:25 +0100 |
Signed-off-by: Benoît Canet <address@hidden>
---
hw/bonito.c | 38 ++++++++++++++++----------------------
1 files changed, 16 insertions(+), 22 deletions(-)
diff --git a/hw/bonito.c b/hw/bonito.c
index 9260848..8fa709a 100644
--- a/hw/bonito.c
+++ b/hw/bonito.c
@@ -202,10 +202,7 @@ typedef struct PCIBonitoState
/* Bonito registers */
MemoryRegion iomem;
-
- target_phys_addr_t bonito_pciconf_start;
- target_phys_addr_t bonito_pciconf_length;
- int bonito_pciconf_handle;
+ MemoryRegion iomem_pciconf;
target_phys_addr_t bonito_spciconf_start;
target_phys_addr_t bonito_spciconf_length;
@@ -322,7 +319,7 @@ static const MemoryRegionOps bonito_ops = {
};
static void bonito_pciconf_writel(void *opaque, target_phys_addr_t addr,
- uint32_t val)
+ uint64_t val, unsigned size)
{
PCIBonitoState *s = opaque;
@@ -330,7 +327,8 @@ static void bonito_pciconf_writel(void *opaque,
target_phys_addr_t addr,
s->dev.config_write(&s->dev, addr, val, 4);
}
-static uint32_t bonito_pciconf_readl(void *opaque, target_phys_addr_t addr)
+static uint64_t bonito_pciconf_readl(void *opaque, target_phys_addr_t addr,
+ unsigned size)
{
PCIBonitoState *s = opaque;
@@ -340,16 +338,15 @@ static uint32_t bonito_pciconf_readl(void *opaque,
target_phys_addr_t addr)
}
/* north bridge PCI configure space. 0x1fe0 0000 - 0x1fe0 00ff */
-static CPUWriteMemoryFunc * const bonito_pciconf_write[] = {
- NULL,
- NULL,
- bonito_pciconf_writel,
-};
-static CPUReadMemoryFunc * const bonito_pciconf_read[] = {
- NULL,
- NULL,
- bonito_pciconf_readl,
+static const MemoryRegionOps bonito_pciconf_ops = {
+ .read = bonito_pciconf_readl,
+ .write = bonito_pciconf_writel,
+ .endianness = DEVICE_NATIVE_ENDIAN,
+ .valid = {
+ .min_access_size = 4,
+ .max_access_size = 4,
+ },
};
static uint32_t bonito_ldma_readl(void *opaque, target_phys_addr_t addr)
@@ -700,13 +697,10 @@ static int bonito_initfn(PCIDevice *dev)
sysbus_mmio_map(sysbus, 0, BONITO_INTERNAL_REG_BASE);
/* set the north bridge pci configure mapping */
- s->bonito_pciconf_handle = cpu_register_io_memory(bonito_pciconf_read,
- bonito_pciconf_write, s,
- DEVICE_NATIVE_ENDIAN);
- s->bonito_pciconf_start = BONITO_PCICONFIG_BASE;
- s->bonito_pciconf_length = BONITO_PCICONFIG_SIZE;
- cpu_register_physical_memory(s->bonito_pciconf_start,
s->bonito_pciconf_length,
- s->bonito_pciconf_handle);
+ memory_region_init_io(&s->iomem_pciconf, &bonito_pciconf_ops, s,
+ "north-bridge-pci-config", BONITO_PCICONFIG_SIZE);
+ sysbus_init_mmio_region(sysbus, &s->iomem_pciconf);
+ sysbus_mmio_map(sysbus, 1, BONITO_PCICONFIG_BASE);
/* set the south bridge pci configure mapping */
s->bonito_spciconf_handle = cpu_register_io_memory(bonito_spciconf_read,
--
1.7.7.3
- Re: [Qemu-devel] [PATCH 02/11] mcf_uart: convert to memory API, (continued)
- [Qemu-devel] [PATCH 04/11] mcf_intc: convert to memory API, Benoît Canet, 2011/11/22
- [Qemu-devel] [PATCH 03/11] mcf_fec: convert to memory API, Benoît Canet, 2011/11/22
- [Qemu-devel] [PATCH 09/11] bonito: convert south bridge pci config to memory API, Benoît Canet, 2011/11/22
- [Qemu-devel] [PATCH 07/11] bonito: convert north bridge register mapping to memory API, Benoît Canet, 2011/11/22
- [Qemu-devel] [PATCH 10/11] bonito: convert ldma to memory API, Benoît Canet, 2011/11/22
- [Qemu-devel] [PATCH 05/11] lm32_uart: convert to memory API, Benoît Canet, 2011/11/22
- [Qemu-devel] [PATCH 06/11] lm32_sys: convert to memory API, Benoît Canet, 2011/11/22
- [Qemu-devel] [PATCH 11/11] bonito: convert cop to memory API, Benoît Canet, 2011/11/22
- [Qemu-devel] [PATCH 08/11] bonito: convert north bridge pci config to memory API,
Benoît Canet <=