aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/input/joystick/gamecon.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c
index e9c6647e1f74..9ba65eae5f68 100644
--- a/drivers/input/joystick/gamecon.c
+++ b/drivers/input/joystick/gamecon.c
@@ -99,9 +99,9 @@ struct gc_subdev {
99 99
100static struct gc *gc_base[3]; 100static struct gc *gc_base[3];
101 101
102static int gc_status_bit[] = { 0x40, 0x80, 0x20, 0x10, 0x08 }; 102static const int gc_status_bit[] = { 0x40, 0x80, 0x20, 0x10, 0x08 };
103 103
104static char *gc_names[] = { 104static const char *gc_names[] = {
105 NULL, "SNES pad", "NES pad", "NES FourPort", "Multisystem joystick", 105 NULL, "SNES pad", "NES pad", "NES FourPort", "Multisystem joystick",
106 "Multisystem 2-button joystick", "N64 controller", "PSX controller", 106 "Multisystem 2-button joystick", "N64 controller", "PSX controller",
107 "PSX DDR controller", "SNES mouse" 107 "PSX DDR controller", "SNES mouse"
@@ -111,8 +111,8 @@ static char *gc_names[] = {
111 * N64 support. 111 * N64 support.
112 */ 112 */
113 113
114static unsigned char gc_n64_bytes[] = { 0, 1, 13, 15, 14, 12, 10, 11, 2, 3 }; 114static const unsigned char gc_n64_bytes[] = { 0, 1, 13, 15, 14, 12, 10, 11, 2, 3 };
115static short gc_n64_btn[] = { 115static const short gc_n64_btn[] = {
116 BTN_A, BTN_B, BTN_C, BTN_X, BTN_Y, BTN_Z, 116 BTN_A, BTN_B, BTN_C, BTN_X, BTN_Y, BTN_Z,
117 BTN_TL, BTN_TR, BTN_TRIGGER, BTN_START 117 BTN_TL, BTN_TR, BTN_TRIGGER, BTN_START
118}; 118};
@@ -339,9 +339,9 @@ static int __init gc_n64_init_ff(struct input_dev *dev, int i)
339#define GC_NES_CLOCK 0x01 339#define GC_NES_CLOCK 0x01
340#define GC_NES_LATCH 0x02 340#define GC_NES_LATCH 0x02
341 341
342static unsigned char gc_nes_bytes[] = { 0, 1, 2, 3 }; 342static const unsigned char gc_nes_bytes[] = { 0, 1, 2, 3 };
343static unsigned char gc_snes_bytes[] = { 8, 0, 2, 3, 9, 1, 10, 11 }; 343static const unsigned char gc_snes_bytes[] = { 8, 0, 2, 3, 9, 1, 10, 11 };
344static short gc_snes_btn[] = { 344static const short gc_snes_btn[] = {
345 BTN_A, BTN_B, BTN_SELECT, BTN_START, BTN_X, BTN_Y, BTN_TL, BTN_TR 345 BTN_A, BTN_B, BTN_SELECT, BTN_START, BTN_X, BTN_Y, BTN_TL, BTN_TR
346}; 346};
347 347
@@ -547,14 +547,14 @@ static int gc_psx_delay = GC_PSX_DELAY;
547module_param_named(psx_delay, gc_psx_delay, uint, 0); 547module_param_named(psx_delay, gc_psx_delay, uint, 0);
548MODULE_PARM_DESC(psx_delay, "Delay when accessing Sony PSX controller (usecs)"); 548MODULE_PARM_DESC(psx_delay, "Delay when accessing Sony PSX controller (usecs)");
549 549
550static short gc_psx_abs[] = { 550static const short gc_psx_abs[] = {
551 ABS_X, ABS_Y, ABS_RX, ABS_RY, ABS_HAT0X, ABS_HAT0Y 551 ABS_X, ABS_Y, ABS_RX, ABS_RY, ABS_HAT0X, ABS_HAT0Y
552}; 552};
553static short gc_psx_btn[] = { 553static const short gc_psx_btn[] = {
554 BTN_TL, BTN_TR, BTN_TL2, BTN_TR2, BTN_A, BTN_B, BTN_X, BTN_Y, 554 BTN_TL, BTN_TR, BTN_TL2, BTN_TR2, BTN_A, BTN_B, BTN_X, BTN_Y,
555 BTN_START, BTN_SELECT, BTN_THUMBL, BTN_THUMBR 555 BTN_START, BTN_SELECT, BTN_THUMBL, BTN_THUMBR
556}; 556};
557static short gc_psx_ddr_btn[] = { BTN_0, BTN_1, BTN_2, BTN_3 }; 557static const short gc_psx_ddr_btn[] = { BTN_0, BTN_1, BTN_2, BTN_3 };
558 558
559/* 559/*
560 * gc_psx_command() writes 8bit command and reads 8bit data from 560 * gc_psx_command() writes 8bit command and reads 8bit data from