X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;ds=sidebyside;f=hw%2Fpxa2xx_pcmcia.c;h=f1399f467fcc4c9c0c4ef89b2eda18466aed1714;hb=cd346349b45ef056f138a184f660b8c34c3213cc;hp=171d902796fab70bcdbea7c07f15c964890c60a5;hpb=a171fe394a82e3a2dad76e901959d859b1966541;p=qemu diff --git a/hw/pxa2xx_pcmcia.c b/hw/pxa2xx_pcmcia.c index 171d902..f1399f4 100644 --- a/hw/pxa2xx_pcmcia.c +++ b/hw/pxa2xx_pcmcia.c @@ -149,7 +149,7 @@ struct pxa2xx_pcmcia_s *pxa2xx_pcmcia_init(target_phys_addr_t base) s->io_base = base | 0x00000000; iomemtype = cpu_register_io_memory(0, pxa2xx_pcmcia_io_readfn, pxa2xx_pcmcia_io_writefn, s); - cpu_register_physical_memory(s->io_base, 0x03ffffff, iomemtype); + cpu_register_physical_memory(s->io_base, 0x04000000, iomemtype); /* Then next 64 MB is reserved */ @@ -157,13 +157,13 @@ struct pxa2xx_pcmcia_s *pxa2xx_pcmcia_init(target_phys_addr_t base) s->attr_base = base | 0x08000000; iomemtype = cpu_register_io_memory(0, pxa2xx_pcmcia_attr_readfn, pxa2xx_pcmcia_attr_writefn, s); - cpu_register_physical_memory(s->attr_base, 0x03ffffff, iomemtype); + cpu_register_physical_memory(s->attr_base, 0x04000000, iomemtype); /* Socket Common Memory Space */ s->common_base = base | 0x0c000000; iomemtype = cpu_register_io_memory(0, pxa2xx_pcmcia_common_readfn, pxa2xx_pcmcia_common_writefn, s); - cpu_register_physical_memory(s->common_base, 0x03ffffff, iomemtype); + cpu_register_physical_memory(s->common_base, 0x04000000, iomemtype); if (base == 0x30000000) s->slot.slot_string = "PXA PC Card Socket 1"; @@ -171,6 +171,7 @@ struct pxa2xx_pcmcia_s *pxa2xx_pcmcia_init(target_phys_addr_t base) s->slot.slot_string = "PXA PC Card Socket 0"; s->slot.irq = qemu_allocate_irqs(pxa2xx_pcmcia_set_irq, s, 1)[0]; pcmcia_socket_register(&s->slot); + return s; }