projects
/
qemu
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add PowerPC power-management state check callback.
[qemu]
/
hw
/
arm_gic.c
diff --git
a/hw/arm_gic.c
b/hw/arm_gic.c
index
eee5b7c
..
8cd7182
100644
(file)
--- a/
hw/arm_gic.c
+++ b/
hw/arm_gic.c
@@
-1,4
+1,4
@@
-/*
+/*
* ARM AMBA Generic/Distributed Interrupt Controller
*
* Copyright (c) 2006 CodeSourcery.
* ARM AMBA Generic/Distributed Interrupt Controller
*
* Copyright (c) 2006 CodeSourcery.
@@
-115,7
+115,7
@@
static void gic_set_irq(void *opaque, int irq, int level)
gic_state *s = (gic_state *)opaque;
/* The first external input line is internal interrupt 32. */
irq += 32;
gic_state *s = (gic_state *)opaque;
/* The first external input line is internal interrupt 32. */
irq += 32;
- if (level == GIC_TEST_LEVEL(irq))
+ if (level == GIC_TEST_LEVEL(irq))
return;
if (level) {
return;
if (level) {
@@
-460,7
+460,7
@@
static uint32_t gic_cpu_read(void *opaque, target_phys_addr_t offset)
case 0x18: /* Highest Pending Interrupt */
return s->current_pending;
default:
case 0x18: /* Highest Pending Interrupt */
return s->current_pending;
default:
- cpu_abort (cpu_single_env, "gic_cpu_writeb: Bad offset %x\n", offset);
+ cpu_abort (cpu_single_env, "gic_cpu_read: Bad offset %x\n", offset);
return 0;
}
}
return 0;
}
}
@@
-484,7
+484,7
@@
static void gic_cpu_write(void *opaque, target_phys_addr_t offset,
case 0x10: /* End Of Interrupt */
return gic_complete_irq(s, value & 0x3ff);
default:
case 0x10: /* End Of Interrupt */
return gic_complete_irq(s, value & 0x3ff);
default:
- cpu_abort (cpu_single_env, "gic_cpu_writeb: Bad offset %x\n", offset);
+ cpu_abort (cpu_single_env, "gic_cpu_write: Bad offset %x\n", offset);
return;
}
gic_update(s);
return;
}
gic_update(s);
@@
-532,10
+532,10
@@
qemu_irq *arm_gic_init(uint32_t base, qemu_irq parent_irq)
if (base != 0xffffffff) {
iomemtype = cpu_register_io_memory(0, gic_cpu_readfn,
gic_cpu_writefn, s);
if (base != 0xffffffff) {
iomemtype = cpu_register_io_memory(0, gic_cpu_readfn,
gic_cpu_writefn, s);
- cpu_register_physical_memory(base, 0x00000fff, iomemtype);
+ cpu_register_physical_memory(base, 0x00001000, iomemtype);
iomemtype = cpu_register_io_memory(0, gic_dist_readfn,
gic_dist_writefn, s);
iomemtype = cpu_register_io_memory(0, gic_dist_readfn,
gic_dist_writefn, s);
- cpu_register_physical_memory(base + 0x1000, 0x00000fff, iomemtype);
+ cpu_register_physical_memory(base + 0x1000, 0x00001000, iomemtype);
s->base = base;
} else {
s->base = 0;
s->base = base;
} else {
s->base = 0;