qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Andrzej Zaborowski <balrogg@gmail.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [5928] SH: Don't subtract bases from access addresses in PCIC.
Date: Sun, 07 Dec 2008 19:13:12 +0000	[thread overview]
Message-ID: <E1L9P44-0000pO-Pi@cvs.savannah.gnu.org> (raw)

Revision: 5928
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5928
Author:   balrog
Date:     2008-12-07 19:13:12 +0000 (Sun, 07 Dec 2008)

Log Message:
-----------
SH: Don't subtract bases from access addresses in PCIC.

Modified Paths:
--------------
    trunk/hw/sh_pci.c

Modified: trunk/hw/sh_pci.c
===================================================================
--- trunk/hw/sh_pci.c	2008-12-07 19:08:45 UTC (rev 5927)
+++ trunk/hw/sh_pci.c	2008-12-07 19:13:12 UTC (rev 5928)
@@ -40,7 +40,6 @@
 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 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 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 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)

                 reply	other threads:[~2008-12-07 19:13 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=E1L9P44-0000pO-Pi@cvs.savannah.gnu.org \
    --to=balrogg@gmail.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).