Re: [Qemu-devel] [PATCH] sh4: sh_pci. Register resouces both at A7 and P4.

[Aurelien Jarno]

On Mon, Dec 15, 2008 at 03:08:34AM +0900, address@hidden wrote:
> Add resource registration both for P4 and A7.
> This is needed because of #5935 SH4: Eliminate P4 to A7 mangling.
> Additionally, {reg,iop,mem}base which is no longer used are removed.
> 
> Signed-off-by: Takashi YOSHII <address@hidden>
> ---
>  hw/sh_pci.c |   17 +++++++----------
>  1 files changed, 7 insertions(+), 10 deletions(-)

Thanks, applied.

> diff --git a/hw/sh_pci.c b/hw/sh_pci.c
> index 5524c59..9f89f2d 100644
> --- a/hw/sh_pci.c
> +++ b/hw/sh_pci.c
> @@ -29,9 +29,6 @@
>  typedef struct {
>      PCIBus *bus;
>      PCIDevice *dev;
> -    uint32_t regbase;
> -    uint32_t iopbase;
> -    uint32_t membase;
>      uint32_t par;
>      uint32_t mbr;
>      uint32_t iobr;
> @@ -181,15 +178,15 @@ PCIBus *sh_pci_register_bus(pci_set_irq_fn set_irq, 
> pci_map_irq_fn map_irq,
>  
>      p->dev = pci_register_device(p->bus, "SH PCIC", sizeof(PCIDevice),
>                                   -1, NULL, NULL);
> -    p->regbase = 0x1e200000;
> -    p->iopbase = 0x1e240000;
> -    p->membase = 0xfd000000;
>      reg = cpu_register_io_memory(0, sh_pci_reg.r, sh_pci_reg.w, p);
> -    mem = cpu_register_io_memory(0, sh_pci_mem.r, sh_pci_mem.w, p);
>      iop = cpu_register_io_memory(0, sh_pci_iop.r, sh_pci_iop.w, p);
> -    cpu_register_physical_memory(p->regbase, 0x224, reg);
> -    cpu_register_physical_memory(p->iopbase, 0x40000, iop);
> -    cpu_register_physical_memory(p->membase, 0x1000000, mem);
> +    mem = cpu_register_io_memory(0, sh_pci_mem.r, sh_pci_mem.w, p);
> +    cpu_register_physical_memory(0x1e200000, 0x224, reg);
> +    cpu_register_physical_memory(0x1e240000, 0x40000, iop);
> +    cpu_register_physical_memory(0x1d000000, 0x1000000, mem);
> +    cpu_register_physical_memory(0xfe200000, 0x224, reg);
> +    cpu_register_physical_memory(0xfe240000, 0x40000, iop);
> +    cpu_register_physical_memory(0xfd000000, 0x1000000, mem);
>  
>      p->dev->config[0x00] = 0x54; // HITACHI
>      p->dev->config[0x01] = 0x10; //
> -- 
> 1.5.6.3
> 
> 
> /yoshii
> 
> 
> 

-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
address@hidden                 http://www.aurel32.net