diff options
author | Vladimir Chtchetkine <vchtchetkine@google.com> | 2011-09-29 15:54:52 -0700 |
---|---|---|
committer | Vladimir Chtchetkine <vchtchetkine@google.com> | 2011-09-29 15:59:16 -0700 |
commit | d0b482eb3e8cb699a2090bc773364d3a7d369a25 (patch) | |
tree | 1cf7d757ec81b83c463d489b087f3436940b9e92 /hw/goldfish_device.h | |
parent | 6e93697bf74fe127356e98bceabf67597c0e1084 (diff) | |
download | external_qemu-d0b482eb3e8cb699a2090bc773364d3a7d369a25.zip external_qemu-d0b482eb3e8cb699a2090bc773364d3a7d369a25.tar.gz external_qemu-d0b482eb3e8cb699a2090bc773364d3a7d369a25.tar.bz2 |
Fix IRQ allocation for goldfish devices.
There were two issues fixed here:
1. IRQ allocation (for a device) has never been checked on going out of bounds.
2. In x86 platform some IRQs were reserved (for kbd, mouse, and exception), but IRQ allocation
for goldfish devices didn't check for those reserved IRQs being assigned to a device.
Change-Id: I9d48485d973bcc8fd8a3dd1b78fbfa6a05aeea22
Diffstat (limited to 'hw/goldfish_device.h')
-rw-r--r-- | hw/goldfish_device.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/hw/goldfish_device.h b/hw/goldfish_device.h index 19f4b32..a9e3f83 100644 --- a/hw/goldfish_device.h +++ b/hw/goldfish_device.h @@ -55,4 +55,18 @@ void trace_dev_init(); void events_dev_init(uint32_t base, qemu_irq irq); void nand_dev_init(uint32_t base); +#ifdef TARGET_I386 +/* Maximum IRQ number available for a device on x86. */ +#define GFD_MAX_IRQ 16 +/* IRQ reserved for keyboard. */ +#define GFD_KBD_IRQ 1 +/* IRQ reserved for mouse. */ +#define GFD_MOUSE_IRQ 12 +/* IRQ reserved for error (raising an exception in TB code). */ +#define GFD_ERR_IRQ 13 +#else +/* Maximum IRQ number available for a device on ARM. */ +#define GFD_MAX_IRQ 32 #endif + +#endif /* GOLDFISH_DEVICE_H */ |