[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/22] lsi53c895a: use DO_UPCAST to cast from PCIDev
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 13/22] lsi53c895a: use DO_UPCAST to cast from PCIDevice |
Date: |
Mon, 24 Aug 2009 13:03:34 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
hw/lsi53c895a.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/lsi53c895a.c b/hw/lsi53c895a.c
index f8501d4..7ebf452 100644
--- a/hw/lsi53c895a.c
+++ b/hw/lsi53c895a.c
@@ -1927,7 +1927,7 @@ static void lsi_io_writel(void *opaque, uint32_t addr,
uint32_t val)
static void lsi_io_mapfunc(PCIDevice *pci_dev, int region_num,
uint32_t addr, uint32_t size, int type)
{
- LSIState *s = (LSIState *)pci_dev;
+ LSIState *s = DO_UPCAST(LSIState, pci_dev, pci_dev);
DPRINTF("Mapping IO at %08x\n", addr);
@@ -1942,7 +1942,7 @@ static void lsi_io_mapfunc(PCIDevice *pci_dev, int
region_num,
static void lsi_ram_mapfunc(PCIDevice *pci_dev, int region_num,
uint32_t addr, uint32_t size, int type)
{
- LSIState *s = (LSIState *)pci_dev;
+ LSIState *s = DO_UPCAST(LSIState, pci_dev, pci_dev);
DPRINTF("Mapping ram at %08x\n", addr);
s->script_ram_base = addr;
@@ -1952,7 +1952,7 @@ static void lsi_ram_mapfunc(PCIDevice *pci_dev, int
region_num,
static void lsi_mmio_mapfunc(PCIDevice *pci_dev, int region_num,
uint32_t addr, uint32_t size, int type)
{
- LSIState *s = (LSIState *)pci_dev;
+ LSIState *s = DO_UPCAST(LSIState, pci_dev, pci_dev);
DPRINTF("Mapping registers at %08x\n", addr);
cpu_register_physical_memory(addr + 0, 0x400, s->mmio_io_addr);
@@ -2153,7 +2153,7 @@ static int lsi_scsi_load(QEMUFile *f, void *opaque, int
version_id)
static int lsi_scsi_uninit(PCIDevice *d)
{
- LSIState *s = (LSIState *) d;
+ LSIState *s = DO_UPCAST(LSIState, pci_dev, d);
cpu_unregister_io_memory(s->mmio_io_addr);
cpu_unregister_io_memory(s->ram_io_addr);
@@ -2165,7 +2165,7 @@ static int lsi_scsi_uninit(PCIDevice *d)
static void lsi_scsi_init(PCIDevice *dev)
{
- LSIState *s = (LSIState *)dev;
+ LSIState *s = DO_UPCAST(LSIState, pci_dev, dev);
uint8_t *pci_conf;
pci_conf = s->pci_dev.config;
--
1.6.2.5
- [Qemu-devel] [PATCH 07/22] ne2000: Remove unneeded double indirection of PCINE2000State, (continued)
- [Qemu-devel] [PATCH 07/22] ne2000: Remove unneeded double indirection of PCINE2000State, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 05/22] ne2000: remove casts from void *, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 06/22] ne2000: pci_dev has this very value with the right type, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 09/22] pci: remove casts from void *, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 08/22] ne2000: change pci_dev to is_pci, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 11/22] rtl8139: remove pointless cast from void *, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 10/22] rtl8139: Remove unneeded double indirection of PCIRTL8139State, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 12/22] lsi53c895a: remove pointless cast from void *, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 13/22] lsi53c895a: use DO_UPCAST to cast from PCIDevice,
Juan Quintela <=
- [Qemu-devel] [PATCH 14/22] lsi53c895a: rename PCIDevice field from pci_dev to dev (consistence), Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 15/22] lsi53c895a: LSIState is a PCIDevice is a DeviceHost, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 16/22] usb-ohci: Remove unneeded double indirection of OHCIPCIState, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 17/22] cirrus_vga: Remove unneeded double indirection of PCICirrusVGAState, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 18/22] cirrus_vga: remove pointless cast from void *, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 19/22] cirrus_vga: change use of pci_dev for is_pci, Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 20/22] Introduce vga_common_reset() to be able to typcheck vga_reset(), Juan Quintela, 2009/08/24
- [Qemu-devel] [PATCH 21/22] vga: Rename vga_state -> vga, Juan Quintela, 2009/08/24