ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pxa2xx_gpio: Store ARMCPU in PXA2xxGPIOInfo 

Prepares for moving halted field into CPUState.

Add missing braces.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Andreas Färber 2012-05-04 00:23:14 +02:00
parent e9d872cfe1
commit 95d42bb5d7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/pxa2xx_gpio.c
View File

@ -20,7 +20,7 @@ struct PXA2xxGPIOInfo {
qemu_irq irq0, irq1, irqX; qemu_irq irq0, irq1, irqX;
int lines; int lines;
int ncpu; int ncpu;
CPUARMState *cpu_env; ARMCPU *cpu;
/* XXX: GNU C vectors are more suitable */ /* XXX: GNU C vectors are more suitable */
uint32_t ilevel[PXA2XX_GPIO_BANKS]; uint32_t ilevel[PXA2XX_GPIO_BANKS];
@ -118,8 +118,9 @@ static void pxa2xx_gpio_set(void *opaque, int line, int level)
pxa2xx_gpio_irq_update(s); pxa2xx_gpio_irq_update(s);
/* Wake-up GPIOs */ /* Wake-up GPIOs */
if (s->cpu_env->halted && (mask & ~s->dir[bank] & pxa2xx_gpio_wake[bank])) if (s->cpu->env.halted && (mask & ~s->dir[bank] & pxa2xx_gpio_wake[bank])) {
cpu_interrupt(s->cpu_env, CPU_INTERRUPT_EXITTB); cpu_interrupt(&s->cpu->env, CPU_INTERRUPT_EXITTB);
}
} }
static void pxa2xx_gpio_handler_update(PXA2xxGPIOInfo *s) { static void pxa2xx_gpio_handler_update(PXA2xxGPIOInfo *s) {
@ -275,7 +276,7 @@ static int pxa2xx_gpio_initfn(SysBusDevice *dev)
s = FROM_SYSBUS(PXA2xxGPIOInfo, dev); s = FROM_SYSBUS(PXA2xxGPIOInfo, dev);
s->cpu_env = qemu_get_cpu(s->ncpu); s->cpu = arm_env_get_cpu(qemu_get_cpu(s->ncpu));
qdev_init_gpio_in(&dev->qdev, pxa2xx_gpio_set, s->lines); qdev_init_gpio_in(&dev->qdev, pxa2xx_gpio_set, s->lines);
qdev_init_gpio_out(&dev->qdev, s->handler, s->lines); qdev_init_gpio_out(&dev->qdev, s->handler, s->lines);