diff options
| author | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-12-07 19:13:12 +0000 |
|---|---|---|
| committer | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-12-07 19:13:12 +0000 |
| commit | d0ef528a3ecf8d554052ed6e3799b53c6c935300 (patch) | |
| tree | a3486d6a2cc82e6223c72684acb86da4b1d27138 /hw | |
| parent | 1e5459a3fa01824c18272fb840f43e3c138dee76 (diff) | |
| download | qemu-d0ef528a3ecf8d554052ed6e3799b53c6c935300.zip | |
SH: Don't subtract bases from access addresses in PCIC.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5928 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/sh_pci.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/hw/sh_pci.c b/hw/sh_pci.c index e849634bd5..f24d32a927 100644 --- a/hw/sh_pci.c +++ b/hw/sh_pci.c @@ -40,7 +40,6 @@ typedef struct { static void sh_pci_reg_write (void *p, target_phys_addr_t addr, uint32_t val) { SHPCIC *pcic = p; - addr -= pcic->regbase; switch(addr) { case 0 ... 0xfc: cpu_to_le32w((uint32_t*)(pcic->dev->config + addr), val); @@ -63,7 +62,6 @@ static void sh_pci_reg_write (void *p, target_phys_addr_t addr, uint32_t val) static uint32_t sh_pci_reg_read (void *p, target_phys_addr_t addr) { SHPCIC *pcic = p; - addr -= pcic->regbase; switch(addr) { case 0 ... 0xfc: return le32_to_cpup((uint32_t*)(pcic->dev->config + addr)); @@ -78,13 +76,13 @@ static uint32_t sh_pci_reg_read (void *p, target_phys_addr_t addr) static void sh_pci_data_write (SHPCIC *pcic, target_phys_addr_t addr, uint32_t val, int size) { - pci_data_write(pcic->bus, addr - pcic->membase + pcic->mbr, val, size); + pci_data_write(pcic->bus, addr + pcic->mbr, val, size); } static uint32_t sh_pci_mem_read (SHPCIC *pcic, target_phys_addr_t addr, int size) { - return pci_data_read(pcic->bus, addr - pcic->membase + pcic->mbr, size); + return pci_data_read(pcic->bus, addr + pcic->mbr, size); } static void sh_pci_writeb (void *p, target_phys_addr_t addr, uint32_t val) @@ -119,7 +117,7 @@ static uint32_t sh_pci_readl (void *p, target_phys_addr_t addr) static int sh_pci_addr2port(SHPCIC *pcic, target_phys_addr_t addr) { - return addr - pcic->iopbase + pcic->iobr; + return addr + pcic->iobr; } static void sh_pci_outb (void *p, target_phys_addr_t addr, uint32_t val) |