[Qemu-devel] [5917] PXA: Account for offset from page start in a subpage mapping.

[Andrzej Zaborowski]

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

Log Message:
-----------
PXA: Account for offset from page start in a subpage mapping.

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

Modified: trunk/hw/pxa2xx.c
===================================================================
--- trunk/hw/pxa2xx.c   2008-12-07 16:04:13 UTC (rev 5916)
+++ trunk/hw/pxa2xx.c   2008-12-07 16:08:49 UTC (rev 5917)
@@ -1487,7 +1487,7 @@
     s->slave.recv = pxa2xx_i2c_rx;
     s->slave.send = pxa2xx_i2c_tx;
     s->bus = i2c_init_bus();
-    s->offset = base & region_size;
+    s->offset = base - (base & (~region_size) & TARGET_PAGE_MASK);
 
     iomemtype = cpu_register_io_memory(0, pxa2xx_i2c_readfn,
                     pxa2xx_i2c_writefn, s);