Revision f161bcd0
b/hw/pxa.h | ||
---|---|---|
65 | 65 |
# define PXA2XX_INTERNAL_SIZE 0x40000 |
66 | 66 |
|
67 | 67 |
/* pxa2xx_pic.c */ |
68 |
DeviceState *pxa2xx_pic_init(target_phys_addr_t base, CPUARMState *env);
|
|
68 |
DeviceState *pxa2xx_pic_init(target_phys_addr_t base, ARMCPU *cpu);
|
|
69 | 69 |
|
70 | 70 |
/* pxa2xx_gpio.c */ |
71 | 71 |
DeviceState *pxa2xx_gpio_init(target_phys_addr_t base, |
b/hw/pxa2xx.c | ||
---|---|---|
2081 | 2081 |
memory_region_add_subregion(address_space, PXA2XX_INTERNAL_BASE, |
2082 | 2082 |
&s->internal); |
2083 | 2083 |
|
2084 |
s->pic = pxa2xx_pic_init(0x40d00000, &s->cpu->env);
|
|
2084 |
s->pic = pxa2xx_pic_init(0x40d00000, s->cpu);
|
|
2085 | 2085 |
|
2086 | 2086 |
s->dma = pxa27x_dma_init(0x40000000, |
2087 | 2087 |
qdev_get_gpio_in(s->pic, PXA2XX_PIC_DMA)); |
... | ... | |
2213 | 2213 |
memory_region_add_subregion(address_space, PXA2XX_INTERNAL_BASE, |
2214 | 2214 |
&s->internal); |
2215 | 2215 |
|
2216 |
s->pic = pxa2xx_pic_init(0x40d00000, &s->cpu->env);
|
|
2216 |
s->pic = pxa2xx_pic_init(0x40d00000, s->cpu);
|
|
2217 | 2217 |
|
2218 | 2218 |
s->dma = pxa255_dma_init(0x40000000, |
2219 | 2219 |
qdev_get_gpio_in(s->pic, PXA2XX_PIC_DMA)); |
b/hw/pxa2xx_pic.c | ||
---|---|---|
245 | 245 |
return 0; |
246 | 246 |
} |
247 | 247 |
|
248 |
DeviceState *pxa2xx_pic_init(target_phys_addr_t base, CPUARMState *env)
|
|
248 |
DeviceState *pxa2xx_pic_init(target_phys_addr_t base, ARMCPU *cpu)
|
|
249 | 249 |
{ |
250 |
CPUARMState *env = &cpu->env; |
|
250 | 251 |
DeviceState *dev = qdev_create(NULL, "pxa2xx_pic"); |
251 | 252 |
PXA2xxPICState *s = FROM_SYSBUS(PXA2xxPICState, sysbus_from_qdev(dev)); |
252 | 253 |
|
Also available in: Unified diff