diff options
| author | Alexander Graf <agraf@suse.de> | 2010-12-08 12:05:38 +0100 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2010-12-11 15:24:25 +0000 |
| commit | 6bef04365589b1b82be1a1c3aa223f4bddb3dabb (patch) | |
| tree | 73c3d79035f5196037236cd2117bdc8dcb8ed6ad /hw | |
| parent | 2507c12ab026b2286b0a47035c629f3d568c96f4 (diff) | |
Make simple io mem handler endian aware
As an alternative to the 3 individual handlers, there is also a simplified
io mem hook function. To be consistent, let's add an endianness parameter
there too.
Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/apb_pci.c | 3 | ||||
| -rw-r--r-- | hw/pci_host.c | 12 | ||||
| -rw-r--r-- | hw/unin_pci.c | 6 |
3 files changed, 14 insertions, 7 deletions
diff --git a/hw/apb_pci.c b/hw/apb_pci.c index bf00c71d63..84e9af76a2 100644 --- a/hw/apb_pci.c +++ b/hw/apb_pci.c @@ -418,7 +418,8 @@ static int pci_pbm_init_device(SysBusDevice *dev) /* PCI configuration space */ s->pci_config_handler.read = apb_pci_config_read; s->pci_config_handler.write = apb_pci_config_write; - pci_config = cpu_register_io_memory_simple(&s->pci_config_handler); + pci_config = cpu_register_io_memory_simple(&s->pci_config_handler, + DEVICE_NATIVE_ENDIAN); assert(pci_config >= 0); /* at region 1 */ sysbus_init_mmio(dev, 0x1000000ULL, pci_config); diff --git a/hw/pci_host.c b/hw/pci_host.c index bc5b77193d..a6e39c915c 100644 --- a/hw/pci_host.c +++ b/hw/pci_host.c @@ -187,9 +187,11 @@ int pci_host_conf_register_mmio(PCIHostState *s, int swap) { pci_host_init(s); if (swap) { - return cpu_register_io_memory_simple(&s->conf_handler); + return cpu_register_io_memory_simple(&s->conf_handler, + DEVICE_NATIVE_ENDIAN); } else { - return cpu_register_io_memory_simple(&s->conf_noswap_handler); + return cpu_register_io_memory_simple(&s->conf_noswap_handler, + DEVICE_NATIVE_ENDIAN); } } @@ -203,9 +205,11 @@ int pci_host_data_register_mmio(PCIHostState *s, int swap) { pci_host_init(s); if (swap) { - return cpu_register_io_memory_simple(&s->data_handler); + return cpu_register_io_memory_simple(&s->data_handler, + DEVICE_NATIVE_ENDIAN); } else { - return cpu_register_io_memory_simple(&s->data_noswap_handler); + return cpu_register_io_memory_simple(&s->data_noswap_handler, + DEVICE_NATIVE_ENDIAN); } } diff --git a/hw/unin_pci.c b/hw/unin_pci.c index 1310211aec..53791dd070 100644 --- a/hw/unin_pci.c +++ b/hw/unin_pci.c @@ -154,7 +154,8 @@ static int pci_unin_main_init_device(SysBusDevice *dev) pci_mem_config = pci_host_conf_register_mmio(&s->host_state, 1); s->data_handler.read = unin_data_read; s->data_handler.write = unin_data_write; - pci_mem_data = cpu_register_io_memory_simple(&s->data_handler); + pci_mem_data = cpu_register_io_memory_simple(&s->data_handler, + DEVICE_NATIVE_ENDIAN); sysbus_init_mmio(dev, 0x1000, pci_mem_config); sysbus_init_mmio(dev, 0x1000, pci_mem_data); @@ -175,7 +176,8 @@ static int pci_u3_agp_init_device(SysBusDevice *dev) pci_mem_config = pci_host_conf_register_mmio(&s->host_state, 1); s->data_handler.read = unin_data_read; s->data_handler.write = unin_data_write; - pci_mem_data = cpu_register_io_memory_simple(&s->data_handler); + pci_mem_data = cpu_register_io_memory_simple(&s->data_handler, + DEVICE_NATIVE_ENDIAN); sysbus_init_mmio(dev, 0x1000, pci_mem_config); sysbus_init_mmio(dev, 0x1000, pci_mem_data); |