[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/17] pxa27x: Add 'const' attribute to keyboard maps
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 15/17] pxa27x: Add 'const' attribute to keyboard maps |
Date: |
Sat, 28 Dec 2013 02:07:28 +0400 |
From: Stefan Weil <address@hidden>
The mapping is a hardware feature, so it is relatively constant.
Signed-off-by: Stefan Weil <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/arm/mainstone.c | 2 +-
hw/arm/z2.c | 2 +-
hw/input/pxa2xx_keypad.c | 6 +++---
include/hw/arm/pxa.h | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c
index 9402c84..276e359 100644
--- a/hw/arm/mainstone.c
+++ b/hw/arm/mainstone.c
@@ -45,7 +45,7 @@
#define S1_STSCHG_IRQ 14
#define S1_IRQ 15
-static struct keymap map[0xE0] = {
+static const struct keymap map[0xE0] = {
[0 ... 0xDF] = { -1, -1 },
[0x1e] = {0,0}, /* a */
[0x30] = {0,1}, /* b */
diff --git a/hw/arm/z2.c b/hw/arm/z2.c
index d52c501..97367b1 100644
--- a/hw/arm/z2.c
+++ b/hw/arm/z2.c
@@ -33,7 +33,7 @@
#define DPRINTF(fmt, ...)
#endif
-static struct keymap map[0x100] = {
+static const struct keymap map[0x100] = {
[0 ... 0xff] = { -1, -1 },
[0x3b] = {0, 0}, /* Option = F1 */
[0xc8] = {0, 1}, /* Up */
diff --git a/hw/input/pxa2xx_keypad.c b/hw/input/pxa2xx_keypad.c
index 846d137..b90b0ba 100644
--- a/hw/input/pxa2xx_keypad.c
+++ b/hw/input/pxa2xx_keypad.c
@@ -85,7 +85,7 @@
struct PXA2xxKeyPadState {
MemoryRegion iomem;
qemu_irq irq;
- struct keymap *map;
+ const struct keymap *map;
int pressed_cnt;
int alt_code;
@@ -322,8 +322,8 @@ PXA2xxKeyPadState *pxa27x_keypad_init(MemoryRegion *sysmem,
return s;
}
-void pxa27x_register_keypad(PXA2xxKeyPadState *kp, struct keymap *map,
- int size)
+void pxa27x_register_keypad(PXA2xxKeyPadState *kp,
+ const struct keymap *map, int size)
{
if(!map || size < 0x80) {
fprintf(stderr, "%s - No PXA keypad map defined\n", __FUNCTION__);
diff --git a/include/hw/arm/pxa.h b/include/hw/arm/pxa.h
index 6db1ff3..7ca330a 100644
--- a/include/hw/arm/pxa.h
+++ b/include/hw/arm/pxa.h
@@ -109,8 +109,8 @@ typedef struct PXA2xxKeyPadState PXA2xxKeyPadState;
PXA2xxKeyPadState *pxa27x_keypad_init(MemoryRegion *sysmem,
hwaddr base,
qemu_irq irq);
-void pxa27x_register_keypad(PXA2xxKeyPadState *kp, struct keymap *map,
- int size);
+void pxa27x_register_keypad(PXA2xxKeyPadState *kp,
+ const struct keymap *map, int size);
/* pxa2xx.c */
typedef struct PXA2xxI2CState PXA2xxI2CState;
--
1.7.10.4
- [Qemu-devel] [PULL 00/17] trivial patches for 2013-12-27, Michael Tokarev, 2013/12/27
- [Qemu-devel] [PULL 01/17] hw/arm/highbank: Simplify code (memory region in device state), Michael Tokarev, 2013/12/27
- [Qemu-devel] [PULL 05/17] exynos4210: Use macro ARRAY_SIZE where possible, Michael Tokarev, 2013/12/27
- [Qemu-devel] [PULL 03/17] misc: Use macro ARRAY_SIZE where possible, Michael Tokarev, 2013/12/27
- [Qemu-devel] [PULL 02/17] openrisc: Fix spelling in comment (transaltion -> translation), Michael Tokarev, 2013/12/27
- [Qemu-devel] [PULL 07/17] x86: only allow real mode to access 32bit without LMA, Michael Tokarev, 2013/12/27
- [Qemu-devel] [PULL 08/17] vl: make boot_strict variable static (not used outside vl.c), Michael Tokarev, 2013/12/27
- [Qemu-devel] [PULL 15/17] pxa27x: Add 'const' attribute to keyboard maps,
Michael Tokarev <=
- [Qemu-devel] [PULL 06/17] linux-user: Use macro TARGET_NSIG_WORDS where possible, Michael Tokarev, 2013/12/27
- [Qemu-devel] [PULL 11/17] configure: Rewrite code for help message, Michael Tokarev, 2013/12/27
- [Qemu-devel] [PULL 09/17] fix -boot strict regressed in commit 6ef4716, Michael Tokarev, 2013/12/27
- [Qemu-devel] [PULL 12/17] configure: Python tests must be done before help message, Michael Tokarev, 2013/12/27
- [Qemu-devel] [PULL 17/17] acpi unit-test: Remove temporary disk after test, Michael Tokarev, 2013/12/27
- [Qemu-devel] [PULL 04/17] ui/cocoa: Use macro ARRAY_SIZE where possible, Michael Tokarev, 2013/12/27
- [Qemu-devel] [PULL 14/17] pxa27x: Reduce size of keyboard matrix mapping, Michael Tokarev, 2013/12/27
- [Qemu-devel] [PULL 16/17] mainstone: Fix duplicate array values for key 'space', Michael Tokarev, 2013/12/27
- [Qemu-devel] [PULL 10/17] target-m68k: Replace qemu_assert by hw_error, Michael Tokarev, 2013/12/27
- [Qemu-devel] [PULL 13/17] doc: Mention chardev:id in available devices for -serial, Michael Tokarev, 2013/12/27