aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/joystick/gamecon.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/input/joystick/gamecon.c')
-rw-r--r--drivers/input/joystick/gamecon.c673
1 files changed, 438 insertions, 235 deletions
diff --git a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c
index 07a32aff5a31..e68e49786483 100644
--- a/drivers/input/joystick/gamecon.c
+++ b/drivers/input/joystick/gamecon.c
@@ -30,6 +30,8 @@
30 * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic 30 * Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
31 */ 31 */
32 32
33#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
34
33#include <linux/kernel.h> 35#include <linux/kernel.h>
34#include <linux/delay.h> 36#include <linux/delay.h>
35#include <linux/module.h> 37#include <linux/module.h>
@@ -37,6 +39,7 @@
37#include <linux/parport.h> 39#include <linux/parport.h>
38#include <linux/input.h> 40#include <linux/input.h>
39#include <linux/mutex.h> 41#include <linux/mutex.h>
42#include <linux/slab.h>
40 43
41MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>"); 44MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
42MODULE_DESCRIPTION("NES, SNES, N64, MultiSystem, PSX gamepad driver"); 45MODULE_DESCRIPTION("NES, SNES, N64, MultiSystem, PSX gamepad driver");
@@ -61,48 +64,72 @@ MODULE_PARM_DESC(map3, "Describes third set of devices");
61 64
62/* see also gs_psx_delay parameter in PSX support section */ 65/* see also gs_psx_delay parameter in PSX support section */
63 66
64#define GC_SNES 1 67enum gc_type {
65#define GC_NES 2 68 GC_NONE = 0,
66#define GC_NES4 3 69 GC_SNES,
67#define GC_MULTI 4 70 GC_NES,
68#define GC_MULTI2 5 71 GC_NES4,
69#define GC_N64 6 72 GC_MULTI,
70#define GC_PSX 7 73 GC_MULTI2,
71#define GC_DDR 8 74 GC_N64,
72#define GC_SNESMOUSE 9 75 GC_PSX,
73 76 GC_DDR,
74#define GC_MAX 9 77 GC_SNESMOUSE,
78 GC_MAX
79};
75 80
76#define GC_REFRESH_TIME HZ/100 81#define GC_REFRESH_TIME HZ/100
77 82
83struct gc_pad {
84 struct input_dev *dev;
85 enum gc_type type;
86 char phys[32];
87};
88
78struct gc { 89struct gc {
79 struct pardevice *pd; 90 struct pardevice *pd;
80 struct input_dev *dev[GC_MAX_DEVICES]; 91 struct gc_pad pads[GC_MAX_DEVICES];
81 struct timer_list timer; 92 struct timer_list timer;
82 unsigned char pads[GC_MAX + 1]; 93 int pad_count[GC_MAX];
83 int used; 94 int used;
84 struct mutex mutex; 95 struct mutex mutex;
85 char phys[GC_MAX_DEVICES][32]; 96};
97
98struct gc_subdev {
99 unsigned int idx;
86}; 100};
87 101
88static struct gc *gc_base[3]; 102static struct gc *gc_base[3];
89 103
90static int gc_status_bit[] = { 0x40, 0x80, 0x20, 0x10, 0x08 }; 104static const int gc_status_bit[] = { 0x40, 0x80, 0x20, 0x10, 0x08 };
105
106static const char *gc_names[] = {
107 NULL, "SNES pad", "NES pad", "NES FourPort", "Multisystem joystick",
108 "Multisystem 2-button joystick", "N64 controller", "PSX controller",
109 "PSX DDR controller", "SNES mouse"
110};
91 111
92static char *gc_names[] = { NULL, "SNES pad", "NES pad", "NES FourPort", "Multisystem joystick",
93 "Multisystem 2-button joystick", "N64 controller", "PSX controller",
94 "PSX DDR controller", "SNES mouse" };
95/* 112/*
96 * N64 support. 113 * N64 support.
97 */ 114 */
98 115
99static unsigned char gc_n64_bytes[] = { 0, 1, 13, 15, 14, 12, 10, 11, 2, 3 }; 116static const unsigned char gc_n64_bytes[] = { 0, 1, 13, 15, 14, 12, 10, 11, 2, 3 };
100static short gc_n64_btn[] = { BTN_A, BTN_B, BTN_C, BTN_X, BTN_Y, BTN_Z, BTN_TL, BTN_TR, BTN_TRIGGER, BTN_START }; 117static const short gc_n64_btn[] = {
118 BTN_A, BTN_B, BTN_C, BTN_X, BTN_Y, BTN_Z,
119 BTN_TL, BTN_TR, BTN_TRIGGER, BTN_START
120};
101 121
102#define GC_N64_LENGTH 32 /* N64 bit length, not including stop bit */ 122#define GC_N64_LENGTH 32 /* N64 bit length, not including stop bit */
103#define GC_N64_REQUEST_LENGTH 37 /* transmit request sequence is 9 bits long */ 123#define GC_N64_STOP_LENGTH 5 /* Length of encoded stop bit */
124#define GC_N64_CMD_00 0x11111111UL
125#define GC_N64_CMD_01 0xd1111111UL
126#define GC_N64_CMD_03 0xdd111111UL
127#define GC_N64_CMD_1b 0xdd1dd111UL
128#define GC_N64_CMD_c0 0x111111ddUL
129#define GC_N64_CMD_80 0x1111111dUL
130#define GC_N64_STOP_BIT 0x1d /* Encoded stop bit */
131#define GC_N64_REQUEST_DATA GC_N64_CMD_01 /* the request data command */
104#define GC_N64_DELAY 133 /* delay between transmit request, and response ready (us) */ 132#define GC_N64_DELAY 133 /* delay between transmit request, and response ready (us) */
105#define GC_N64_REQUEST 0x1dd1111111ULL /* the request data command (encoded for 000000011) */
106#define GC_N64_DWS 3 /* delay between write segments (required for sound playback because of ISA DMA) */ 133#define GC_N64_DWS 3 /* delay between write segments (required for sound playback because of ISA DMA) */
107 /* GC_N64_DWS > 24 is known to fail */ 134 /* GC_N64_DWS > 24 is known to fail */
108#define GC_N64_POWER_W 0xe2 /* power during write (transmit request) */ 135#define GC_N64_POWER_W 0xe2 /* power during write (transmit request) */
@@ -114,8 +141,40 @@ static short gc_n64_btn[] = { BTN_A, BTN_B, BTN_C, BTN_X, BTN_Y, BTN_Z, BTN_TL,
114#define GC_N64_CLOCK 0x02 /* clock bits for read */ 141#define GC_N64_CLOCK 0x02 /* clock bits for read */
115 142
116/* 143/*
144 * Used for rumble code.
145 */
146
147/* Send encoded command */
148static void gc_n64_send_command(struct gc *gc, unsigned long cmd,
149 unsigned char target)
150{
151 struct parport *port = gc->pd->port;
152 int i;
153
154 for (i = 0; i < GC_N64_LENGTH; i++) {
155 unsigned char data = (cmd >> i) & 1 ? target : 0;
156 parport_write_data(port, GC_N64_POWER_W | data);
157 udelay(GC_N64_DWS);
158 }
159}
160
161/* Send stop bit */
162static void gc_n64_send_stop_bit(struct gc *gc, unsigned char target)
163{
164 struct parport *port = gc->pd->port;
165 int i;
166
167 for (i = 0; i < GC_N64_STOP_LENGTH; i++) {
168 unsigned char data = (GC_N64_STOP_BIT >> i) & 1 ? target : 0;
169 parport_write_data(port, GC_N64_POWER_W | data);
170 udelay(GC_N64_DWS);
171 }
172}
173
174/*
117 * gc_n64_read_packet() reads an N64 packet. 175 * gc_n64_read_packet() reads an N64 packet.
118 * Each pad uses one bit per byte. So all pads connected to this port are read in parallel. 176 * Each pad uses one bit per byte. So all pads connected to this port
177 * are read in parallel.
119 */ 178 */
120 179
121static void gc_n64_read_packet(struct gc *gc, unsigned char *data) 180static void gc_n64_read_packet(struct gc *gc, unsigned char *data)
@@ -128,14 +187,13 @@ static void gc_n64_read_packet(struct gc *gc, unsigned char *data)
128 */ 187 */
129 188
130 local_irq_save(flags); 189 local_irq_save(flags);
131 for (i = 0; i < GC_N64_REQUEST_LENGTH; i++) { 190 gc_n64_send_command(gc, GC_N64_REQUEST_DATA, GC_N64_OUT);
132 parport_write_data(gc->pd->port, GC_N64_POWER_W | ((GC_N64_REQUEST >> i) & 1 ? GC_N64_OUT : 0)); 191 gc_n64_send_stop_bit(gc, GC_N64_OUT);
133 udelay(GC_N64_DWS);
134 }
135 local_irq_restore(flags); 192 local_irq_restore(flags);
136 193
137/* 194/*
138 * Wait for the pad response to be loaded into the 33-bit register of the adapter 195 * Wait for the pad response to be loaded into the 33-bit register
196 * of the adapter.
139 */ 197 */
140 198
141 udelay(GC_N64_DELAY); 199 udelay(GC_N64_DELAY);
@@ -146,13 +204,15 @@ static void gc_n64_read_packet(struct gc *gc, unsigned char *data)
146 204
147 for (i = 0; i < GC_N64_LENGTH; i++) { 205 for (i = 0; i < GC_N64_LENGTH; i++) {
148 parport_write_data(gc->pd->port, GC_N64_POWER_R); 206 parport_write_data(gc->pd->port, GC_N64_POWER_R);
207 udelay(2);
149 data[i] = parport_read_status(gc->pd->port); 208 data[i] = parport_read_status(gc->pd->port);
150 parport_write_data(gc->pd->port, GC_N64_POWER_R | GC_N64_CLOCK); 209 parport_write_data(gc->pd->port, GC_N64_POWER_R | GC_N64_CLOCK);
151 } 210 }
152 211
153/* 212/*
154 * We must wait 200 ms here for the controller to reinitialize before the next read request. 213 * We must wait 200 ms here for the controller to reinitialize before
155 * No worries as long as gc_read is polled less frequently than this. 214 * the next read request. No worries as long as gc_read is polled less
215 * frequently than this.
156 */ 216 */
157 217
158} 218}
@@ -160,45 +220,112 @@ static void gc_n64_read_packet(struct gc *gc, unsigned char *data)
160static void gc_n64_process_packet(struct gc *gc) 220static void gc_n64_process_packet(struct gc *gc)
161{ 221{
162 unsigned char data[GC_N64_LENGTH]; 222 unsigned char data[GC_N64_LENGTH];
163 signed char axes[2];
164 struct input_dev *dev; 223 struct input_dev *dev;
165 int i, j, s; 224 int i, j, s;
225 signed char x, y;
166 226
167 gc_n64_read_packet(gc, data); 227 gc_n64_read_packet(gc, data);
168 228
169 for (i = 0; i < GC_MAX_DEVICES; i++) { 229 for (i = 0; i < GC_MAX_DEVICES; i++) {
170 230
171 dev = gc->dev[i]; 231 if (gc->pads[i].type != GC_N64)
172 if (!dev)
173 continue; 232 continue;
174 233
234 dev = gc->pads[i].dev;
175 s = gc_status_bit[i]; 235 s = gc_status_bit[i];
176 236
177 if (s & gc->pads[GC_N64] & ~(data[8] | data[9])) { 237 if (s & ~(data[8] | data[9])) {
178 238
179 axes[0] = axes[1] = 0; 239 x = y = 0;
180 240
181 for (j = 0; j < 8; j++) { 241 for (j = 0; j < 8; j++) {
182 if (data[23 - j] & s) 242 if (data[23 - j] & s)
183 axes[0] |= 1 << j; 243 x |= 1 << j;
184 if (data[31 - j] & s) 244 if (data[31 - j] & s)
185 axes[1] |= 1 << j; 245 y |= 1 << j;
186 } 246 }
187 247
188 input_report_abs(dev, ABS_X, axes[0]); 248 input_report_abs(dev, ABS_X, x);
189 input_report_abs(dev, ABS_Y, -axes[1]); 249 input_report_abs(dev, ABS_Y, -y);
190 250
191 input_report_abs(dev, ABS_HAT0X, !(s & data[6]) - !(s & data[7])); 251 input_report_abs(dev, ABS_HAT0X,
192 input_report_abs(dev, ABS_HAT0Y, !(s & data[4]) - !(s & data[5])); 252 !(s & data[6]) - !(s & data[7]));
253 input_report_abs(dev, ABS_HAT0Y,
254 !(s & data[4]) - !(s & data[5]));
193 255
194 for (j = 0; j < 10; j++) 256 for (j = 0; j < 10; j++)
195 input_report_key(dev, gc_n64_btn[j], s & data[gc_n64_bytes[j]]); 257 input_report_key(dev, gc_n64_btn[j],
258 s & data[gc_n64_bytes[j]]);
196 259
197 input_sync(dev); 260 input_sync(dev);
198 } 261 }
199 } 262 }
200} 263}
201 264
265static int gc_n64_play_effect(struct input_dev *dev, void *data,
266 struct ff_effect *effect)
267{
268 int i;
269 unsigned long flags;
270 struct gc *gc = input_get_drvdata(dev);
271 struct gc_subdev *sdev = data;
272 unsigned char target = 1 << sdev->idx; /* select desired pin */
273
274 if (effect->type == FF_RUMBLE) {
275 struct ff_rumble_effect *rumble = &effect->u.rumble;
276 unsigned int cmd =
277 rumble->strong_magnitude || rumble->weak_magnitude ?
278 GC_N64_CMD_01 : GC_N64_CMD_00;
279
280 local_irq_save(flags);
281
282 /* Init Rumble - 0x03, 0x80, 0x01, (34)0x80 */
283 gc_n64_send_command(gc, GC_N64_CMD_03, target);
284 gc_n64_send_command(gc, GC_N64_CMD_80, target);
285 gc_n64_send_command(gc, GC_N64_CMD_01, target);
286 for (i = 0; i < 32; i++)
287 gc_n64_send_command(gc, GC_N64_CMD_80, target);
288 gc_n64_send_stop_bit(gc, target);
289
290 udelay(GC_N64_DELAY);
291
292 /* Now start or stop it - 0x03, 0xc0, 0zx1b, (32)0x01/0x00 */
293 gc_n64_send_command(gc, GC_N64_CMD_03, target);
294 gc_n64_send_command(gc, GC_N64_CMD_c0, target);
295 gc_n64_send_command(gc, GC_N64_CMD_1b, target);
296 for (i = 0; i < 32; i++)
297 gc_n64_send_command(gc, cmd, target);
298 gc_n64_send_stop_bit(gc, target);
299
300 local_irq_restore(flags);
301
302 }
303
304 return 0;
305}
306
307static int __init gc_n64_init_ff(struct input_dev *dev, int i)
308{
309 struct gc_subdev *sdev;
310 int err;
311
312 sdev = kmalloc(sizeof(*sdev), GFP_KERNEL);
313 if (!sdev)
314 return -ENOMEM;
315
316 sdev->idx = i;
317
318 input_set_capability(dev, EV_FF, FF_RUMBLE);
319
320 err = input_ff_create_memless(dev, sdev, gc_n64_play_effect);
321 if (err) {
322 kfree(sdev);
323 return err;
324 }
325
326 return 0;
327}
328
202/* 329/*
203 * NES/SNES support. 330 * NES/SNES support.
204 */ 331 */
@@ -214,9 +341,11 @@ static void gc_n64_process_packet(struct gc *gc)
214#define GC_NES_CLOCK 0x01 341#define GC_NES_CLOCK 0x01
215#define GC_NES_LATCH 0x02 342#define GC_NES_LATCH 0x02
216 343
217static unsigned char gc_nes_bytes[] = { 0, 1, 2, 3 }; 344static const unsigned char gc_nes_bytes[] = { 0, 1, 2, 3 };
218static unsigned char gc_snes_bytes[] = { 8, 0, 2, 3, 9, 1, 10, 11 }; 345static const unsigned char gc_snes_bytes[] = { 8, 0, 2, 3, 9, 1, 10, 11 };
219static short gc_snes_btn[] = { BTN_A, BTN_B, BTN_SELECT, BTN_START, BTN_X, BTN_Y, BTN_TL, BTN_TR }; 346static const short gc_snes_btn[] = {
347 BTN_A, BTN_B, BTN_SELECT, BTN_START, BTN_X, BTN_Y, BTN_TL, BTN_TR
348};
220 349
221/* 350/*
222 * gc_nes_read_packet() reads a NES/SNES packet. 351 * gc_nes_read_packet() reads a NES/SNES packet.
@@ -244,40 +373,51 @@ static void gc_nes_read_packet(struct gc *gc, int length, unsigned char *data)
244static void gc_nes_process_packet(struct gc *gc) 373static void gc_nes_process_packet(struct gc *gc)
245{ 374{
246 unsigned char data[GC_SNESMOUSE_LENGTH]; 375 unsigned char data[GC_SNESMOUSE_LENGTH];
376 struct gc_pad *pad;
247 struct input_dev *dev; 377 struct input_dev *dev;
248 int i, j, s, len; 378 int i, j, s, len;
249 char x_rel, y_rel; 379 char x_rel, y_rel;
250 380
251 len = gc->pads[GC_SNESMOUSE] ? GC_SNESMOUSE_LENGTH : 381 len = gc->pad_count[GC_SNESMOUSE] ? GC_SNESMOUSE_LENGTH :
252 (gc->pads[GC_SNES] ? GC_SNES_LENGTH : GC_NES_LENGTH); 382 (gc->pad_count[GC_SNES] ? GC_SNES_LENGTH : GC_NES_LENGTH);
253 383
254 gc_nes_read_packet(gc, len, data); 384 gc_nes_read_packet(gc, len, data);
255 385
256 for (i = 0; i < GC_MAX_DEVICES; i++) { 386 for (i = 0; i < GC_MAX_DEVICES; i++) {
257 387
258 dev = gc->dev[i]; 388 pad = &gc->pads[i];
259 if (!dev) 389 dev = pad->dev;
260 continue;
261
262 s = gc_status_bit[i]; 390 s = gc_status_bit[i];
263 391
264 if (s & (gc->pads[GC_NES] | gc->pads[GC_SNES])) { 392 switch (pad->type) {
393
394 case GC_NES:
395
265 input_report_abs(dev, ABS_X, !(s & data[6]) - !(s & data[7])); 396 input_report_abs(dev, ABS_X, !(s & data[6]) - !(s & data[7]));
266 input_report_abs(dev, ABS_Y, !(s & data[4]) - !(s & data[5])); 397 input_report_abs(dev, ABS_Y, !(s & data[4]) - !(s & data[5]));
267 }
268 398
269 if (s & gc->pads[GC_NES])
270 for (j = 0; j < 4; j++) 399 for (j = 0; j < 4; j++)
271 input_report_key(dev, gc_snes_btn[j], s & data[gc_nes_bytes[j]]); 400 input_report_key(dev, gc_snes_btn[j],
401 s & data[gc_nes_bytes[j]]);
402 input_sync(dev);
403 break;
404
405 case GC_SNES:
406
407 input_report_abs(dev, ABS_X, !(s & data[6]) - !(s & data[7]));
408 input_report_abs(dev, ABS_Y, !(s & data[4]) - !(s & data[5]));
272 409
273 if (s & gc->pads[GC_SNES])
274 for (j = 0; j < 8; j++) 410 for (j = 0; j < 8; j++)
275 input_report_key(dev, gc_snes_btn[j], s & data[gc_snes_bytes[j]]); 411 input_report_key(dev, gc_snes_btn[j],
412 s & data[gc_snes_bytes[j]]);
413 input_sync(dev);
414 break;
276 415
277 if (s & gc->pads[GC_SNESMOUSE]) { 416 case GC_SNESMOUSE:
278 /* 417 /*
279 * The 4 unused bits from SNES controllers appear to be ID bits 418 * The 4 unused bits from SNES controllers appear
280 * so use them to make sure iwe are dealing with a mouse. 419 * to be ID bits so use them to make sure we are
420 * dealing with a mouse.
281 * gamepad is connected. This is important since 421 * gamepad is connected. This is important since
282 * my SNES gamepad sends 1's for bits 16-31, which 422 * my SNES gamepad sends 1's for bits 16-31, which
283 * cause the mouse pointer to quickly move to the 423 * cause the mouse pointer to quickly move to the
@@ -310,9 +450,14 @@ static void gc_nes_process_packet(struct gc *gc)
310 y_rel = -y_rel; 450 y_rel = -y_rel;
311 input_report_rel(dev, REL_Y, y_rel); 451 input_report_rel(dev, REL_Y, y_rel);
312 } 452 }
453
454 input_sync(dev);
313 } 455 }
456 break;
457
458 default:
459 break;
314 } 460 }
315 input_sync(dev);
316 } 461 }
317} 462}
318 463
@@ -340,29 +485,35 @@ static void gc_multi_read_packet(struct gc *gc, int length, unsigned char *data)
340static void gc_multi_process_packet(struct gc *gc) 485static void gc_multi_process_packet(struct gc *gc)
341{ 486{
342 unsigned char data[GC_MULTI2_LENGTH]; 487 unsigned char data[GC_MULTI2_LENGTH];
488 int data_len = gc->pad_count[GC_MULTI2] ? GC_MULTI2_LENGTH : GC_MULTI_LENGTH;
489 struct gc_pad *pad;
343 struct input_dev *dev; 490 struct input_dev *dev;
344 int i, s; 491 int i, s;
345 492
346 gc_multi_read_packet(gc, gc->pads[GC_MULTI2] ? GC_MULTI2_LENGTH : GC_MULTI_LENGTH, data); 493 gc_multi_read_packet(gc, data_len, data);
347 494
348 for (i = 0; i < GC_MAX_DEVICES; i++) { 495 for (i = 0; i < GC_MAX_DEVICES; i++) {
349 496 pad = &gc->pads[i];
350 dev = gc->dev[i]; 497 dev = pad->dev;
351 if (!dev)
352 continue;
353
354 s = gc_status_bit[i]; 498 s = gc_status_bit[i];
355 499
356 if (s & (gc->pads[GC_MULTI] | gc->pads[GC_MULTI2])) { 500 switch (pad->type) {
357 input_report_abs(dev, ABS_X, !(s & data[2]) - !(s & data[3])); 501 case GC_MULTI2:
358 input_report_abs(dev, ABS_Y, !(s & data[0]) - !(s & data[1]));
359 input_report_key(dev, BTN_TRIGGER, s & data[4]);
360 }
361
362 if (s & gc->pads[GC_MULTI2])
363 input_report_key(dev, BTN_THUMB, s & data[5]); 502 input_report_key(dev, BTN_THUMB, s & data[5]);
503 /* fall through */
364 504
365 input_sync(dev); 505 case GC_MULTI:
506 input_report_abs(dev, ABS_X,
507 !(s & data[2]) - !(s & data[3]));
508 input_report_abs(dev, ABS_Y,
509 !(s & data[0]) - !(s & data[1]));
510 input_report_key(dev, BTN_TRIGGER, s & data[4]);
511 input_sync(dev);
512 break;
513
514 default:
515 break;
516 }
366 } 517 }
367} 518}
368 519
@@ -370,9 +521,8 @@ static void gc_multi_process_packet(struct gc *gc)
370 * PSX support 521 * PSX support
371 * 522 *
372 * See documentation at: 523 * See documentation at:
373 * http://www.dim.com/~mackys/psxmemcard/ps-eng2.txt 524 * http://www.geocities.co.jp/Playtown/2004/psx/ps_eng.txt
374 * http://www.gamesx.com/controldata/psxcont/psxcont.htm 525 * http://www.gamesx.com/controldata/psxcont/psxcont.htm
375 * ftp://milano.usal.es/pablo/
376 * 526 *
377 */ 527 */
378 528
@@ -398,30 +548,41 @@ static int gc_psx_delay = GC_PSX_DELAY;
398module_param_named(psx_delay, gc_psx_delay, uint, 0); 548module_param_named(psx_delay, gc_psx_delay, uint, 0);
399MODULE_PARM_DESC(psx_delay, "Delay when accessing Sony PSX controller (usecs)"); 549MODULE_PARM_DESC(psx_delay, "Delay when accessing Sony PSX controller (usecs)");
400 550
401static short gc_psx_abs[] = { ABS_X, ABS_Y, ABS_RX, ABS_RY, ABS_HAT0X, ABS_HAT0Y }; 551static const short gc_psx_abs[] = {
402static short gc_psx_btn[] = { BTN_TL, BTN_TR, BTN_TL2, BTN_TR2, BTN_A, BTN_B, BTN_X, BTN_Y, 552 ABS_X, ABS_Y, ABS_RX, ABS_RY, ABS_HAT0X, ABS_HAT0Y
403 BTN_START, BTN_SELECT, BTN_THUMBL, BTN_THUMBR }; 553};
404static short gc_psx_ddr_btn[] = { BTN_0, BTN_1, BTN_2, BTN_3 }; 554static const short gc_psx_btn[] = {
555 BTN_TL, BTN_TR, BTN_TL2, BTN_TR2, BTN_A, BTN_B, BTN_X, BTN_Y,
556 BTN_START, BTN_SELECT, BTN_THUMBL, BTN_THUMBR
557};
558static const short gc_psx_ddr_btn[] = { BTN_0, BTN_1, BTN_2, BTN_3 };
405 559
406/* 560/*
407 * gc_psx_command() writes 8bit command and reads 8bit data from 561 * gc_psx_command() writes 8bit command and reads 8bit data from
408 * the psx pad. 562 * the psx pad.
409 */ 563 */
410 564
411static void gc_psx_command(struct gc *gc, int b, unsigned char data[GC_MAX_DEVICES]) 565static void gc_psx_command(struct gc *gc, int b, unsigned char *data)
412{ 566{
567 struct parport *port = gc->pd->port;
413 int i, j, cmd, read; 568 int i, j, cmd, read;
414 569
415 for (i = 0; i < GC_MAX_DEVICES; i++) 570 memset(data, 0, GC_MAX_DEVICES);
416 data[i] = 0;
417 571
418 for (i = 0; i < GC_PSX_LENGTH; i++, b >>= 1) { 572 for (i = 0; i < GC_PSX_LENGTH; i++, b >>= 1) {
419 cmd = (b & 1) ? GC_PSX_COMMAND : 0; 573 cmd = (b & 1) ? GC_PSX_COMMAND : 0;
420 parport_write_data(gc->pd->port, cmd | GC_PSX_POWER); 574 parport_write_data(port, cmd | GC_PSX_POWER);
421 udelay(gc_psx_delay); 575 udelay(gc_psx_delay);
422 read = parport_read_status(gc->pd->port) ^ 0x80; 576
423 for (j = 0; j < GC_MAX_DEVICES; j++) 577 read = parport_read_status(port) ^ 0x80;
424 data[j] |= (read & gc_status_bit[j] & (gc->pads[GC_PSX] | gc->pads[GC_DDR])) ? (1 << i) : 0; 578
579 for (j = 0; j < GC_MAX_DEVICES; j++) {
580 struct gc_pad *pad = &gc->pads[j];
581
582 if (pad->type == GC_PSX || pad->type == GC_DDR)
583 data[j] |= (read & gc_status_bit[j]) ? (1 << i) : 0;
584 }
585
425 parport_write_data(gc->pd->port, cmd | GC_PSX_CLOCK | GC_PSX_POWER); 586 parport_write_data(gc->pd->port, cmd | GC_PSX_CLOCK | GC_PSX_POWER);
426 udelay(gc_psx_delay); 587 udelay(gc_psx_delay);
427 } 588 }
@@ -432,31 +593,40 @@ static void gc_psx_command(struct gc *gc, int b, unsigned char data[GC_MAX_DEVIC
432 * device identifier code. 593 * device identifier code.
433 */ 594 */
434 595
435static void gc_psx_read_packet(struct gc *gc, unsigned char data[GC_MAX_DEVICES][GC_PSX_BYTES], 596static void gc_psx_read_packet(struct gc *gc,
597 unsigned char data[GC_MAX_DEVICES][GC_PSX_BYTES],
436 unsigned char id[GC_MAX_DEVICES]) 598 unsigned char id[GC_MAX_DEVICES])
437{ 599{
438 int i, j, max_len = 0; 600 int i, j, max_len = 0;
439 unsigned long flags; 601 unsigned long flags;
440 unsigned char data2[GC_MAX_DEVICES]; 602 unsigned char data2[GC_MAX_DEVICES];
441 603
442 parport_write_data(gc->pd->port, GC_PSX_CLOCK | GC_PSX_SELECT | GC_PSX_POWER); /* Select pad */ 604 /* Select pad */
605 parport_write_data(gc->pd->port, GC_PSX_CLOCK | GC_PSX_SELECT | GC_PSX_POWER);
443 udelay(gc_psx_delay); 606 udelay(gc_psx_delay);
444 parport_write_data(gc->pd->port, GC_PSX_CLOCK | GC_PSX_POWER); /* Deselect, begin command */ 607 /* Deselect, begin command */
608 parport_write_data(gc->pd->port, GC_PSX_CLOCK | GC_PSX_POWER);
445 udelay(gc_psx_delay); 609 udelay(gc_psx_delay);
446 610
447 local_irq_save(flags); 611 local_irq_save(flags);
448 612
449 gc_psx_command(gc, 0x01, data2); /* Access pad */ 613 gc_psx_command(gc, 0x01, data2); /* Access pad */
450 gc_psx_command(gc, 0x42, id); /* Get device ids */ 614 gc_psx_command(gc, 0x42, id); /* Get device ids */
451 gc_psx_command(gc, 0, data2); /* Dump status */ 615 gc_psx_command(gc, 0, data2); /* Dump status */
452 616
453 for (i =0; i < GC_MAX_DEVICES; i++) /* Find the longest pad */ 617 /* Find the longest pad */
454 if((gc_status_bit[i] & (gc->pads[GC_PSX] | gc->pads[GC_DDR])) 618 for (i = 0; i < GC_MAX_DEVICES; i++) {
455 && (GC_PSX_LEN(id[i]) > max_len) 619 struct gc_pad *pad = &gc->pads[i];
456 && (GC_PSX_LEN(id[i]) <= GC_PSX_BYTES)) 620
621 if ((pad->type == GC_PSX || pad->type == GC_DDR) &&
622 GC_PSX_LEN(id[i]) > max_len &&
623 GC_PSX_LEN(id[i]) <= GC_PSX_BYTES) {
457 max_len = GC_PSX_LEN(id[i]); 624 max_len = GC_PSX_LEN(id[i]);
625 }
626 }
458 627
459 for (i = 0; i < max_len; i++) { /* Read in all the data */ 628 /* Read in all the data */
629 for (i = 0; i < max_len; i++) {
460 gc_psx_command(gc, 0, data2); 630 gc_psx_command(gc, 0, data2);
461 for (j = 0; j < GC_MAX_DEVICES; j++) 631 for (j = 0; j < GC_MAX_DEVICES; j++)
462 data[j][i] = data2[j]; 632 data[j][i] = data2[j];
@@ -466,86 +636,104 @@ static void gc_psx_read_packet(struct gc *gc, unsigned char data[GC_MAX_DEVICES]
466 636
467 parport_write_data(gc->pd->port, GC_PSX_CLOCK | GC_PSX_SELECT | GC_PSX_POWER); 637 parport_write_data(gc->pd->port, GC_PSX_CLOCK | GC_PSX_SELECT | GC_PSX_POWER);
468 638
469 for(i = 0; i < GC_MAX_DEVICES; i++) /* Set id's to the real value */ 639 /* Set id's to the real value */
640 for (i = 0; i < GC_MAX_DEVICES; i++)
470 id[i] = GC_PSX_ID(id[i]); 641 id[i] = GC_PSX_ID(id[i]);
471} 642}
472 643
473static void gc_psx_process_packet(struct gc *gc) 644static void gc_psx_report_one(struct gc_pad *pad, unsigned char psx_type,
645 unsigned char *data)
474{ 646{
475 unsigned char data[GC_MAX_DEVICES][GC_PSX_BYTES]; 647 struct input_dev *dev = pad->dev;
476 unsigned char id[GC_MAX_DEVICES]; 648 int i;
477 struct input_dev *dev;
478 int i, j;
479 649
480 gc_psx_read_packet(gc, data, id); 650 switch (psx_type) {
481 651
482 for (i = 0; i < GC_MAX_DEVICES; i++) { 652 case GC_PSX_RUMBLE:
483 653
484 dev = gc->dev[i]; 654 input_report_key(dev, BTN_THUMBL, ~data[0] & 0x04);
485 if (!dev) 655 input_report_key(dev, BTN_THUMBR, ~data[0] & 0x02);
486 continue;
487 656
488 switch (id[i]) { 657 case GC_PSX_NEGCON:
658 case GC_PSX_ANALOG:
489 659
490 case GC_PSX_RUMBLE: 660 if (pad->type == GC_DDR) {
661 for (i = 0; i < 4; i++)
662 input_report_key(dev, gc_psx_ddr_btn[i],
663 ~data[0] & (0x10 << i));
664 } else {
665 for (i = 0; i < 4; i++)
666 input_report_abs(dev, gc_psx_abs[i + 2],
667 data[i + 2]);
491 668
492 input_report_key(dev, BTN_THUMBL, ~data[i][0] & 0x04); 669 input_report_abs(dev, ABS_X,
493 input_report_key(dev, BTN_THUMBR, ~data[i][0] & 0x02); 670 !!(data[0] & 0x80) * 128 + !(data[0] & 0x20) * 127);
671 input_report_abs(dev, ABS_Y,
672 !!(data[0] & 0x10) * 128 + !(data[0] & 0x40) * 127);
673 }
494 674
495 case GC_PSX_NEGCON: 675 for (i = 0; i < 8; i++)
496 case GC_PSX_ANALOG: 676 input_report_key(dev, gc_psx_btn[i], ~data[1] & (1 << i));
497 677
498 if (gc->pads[GC_DDR] & gc_status_bit[i]) { 678 input_report_key(dev, BTN_START, ~data[0] & 0x08);
499 for(j = 0; j < 4; j++) 679 input_report_key(dev, BTN_SELECT, ~data[0] & 0x01);
500 input_report_key(dev, gc_psx_ddr_btn[j], ~data[i][0] & (0x10 << j));
501 } else {
502 for (j = 0; j < 4; j++)
503 input_report_abs(dev, gc_psx_abs[j + 2], data[i][j + 2]);
504 680
505 input_report_abs(dev, ABS_X, 128 + !(data[i][0] & 0x20) * 127 - !(data[i][0] & 0x80) * 128); 681 input_sync(dev);
506 input_report_abs(dev, ABS_Y, 128 + !(data[i][0] & 0x40) * 127 - !(data[i][0] & 0x10) * 128);
507 }
508 682
509 for (j = 0; j < 8; j++) 683 break;
510 input_report_key(dev, gc_psx_btn[j], ~data[i][1] & (1 << j));
511 684
512 input_report_key(dev, BTN_START, ~data[i][0] & 0x08); 685 case GC_PSX_NORMAL:
513 input_report_key(dev, BTN_SELECT, ~data[i][0] & 0x01);
514 686
515 input_sync(dev); 687 if (pad->type == GC_DDR) {
688 for (i = 0; i < 4; i++)
689 input_report_key(dev, gc_psx_ddr_btn[i],
690 ~data[0] & (0x10 << i));
691 } else {
692 input_report_abs(dev, ABS_X,
693 !!(data[0] & 0x80) * 128 + !(data[0] & 0x20) * 127);
694 input_report_abs(dev, ABS_Y,
695 !!(data[0] & 0x10) * 128 + !(data[0] & 0x40) * 127);
516 696
517 break; 697 /*
518 698 * For some reason if the extra axes are left unset
519 case GC_PSX_NORMAL: 699 * they drift.
520 if (gc->pads[GC_DDR] & gc_status_bit[i]) { 700 * for (i = 0; i < 4; i++)
521 for(j = 0; j < 4; j++) 701 input_report_abs(dev, gc_psx_abs[i + 2], 128);
522 input_report_key(dev, gc_psx_ddr_btn[j], ~data[i][0] & (0x10 << j)); 702 * This needs to be debugged properly,
523 } else { 703 * maybe fuzz processing needs to be done
524 input_report_abs(dev, ABS_X, 128 + !(data[i][0] & 0x20) * 127 - !(data[i][0] & 0x80) * 128); 704 * in input_sync()
525 input_report_abs(dev, ABS_Y, 128 + !(data[i][0] & 0x40) * 127 - !(data[i][0] & 0x10) * 128); 705 * --vojtech
526 706 */
527 /* for some reason if the extra axes are left unset they drift */ 707 }
528 /* for (j = 0; j < 4; j++)
529 input_report_abs(dev, gc_psx_abs[j + 2], 128);
530 * This needs to be debugged properly,
531 * maybe fuzz processing needs to be done in input_sync()
532 * --vojtech
533 */
534 }
535 708
536 for (j = 0; j < 8; j++) 709 for (i = 0; i < 8; i++)
537 input_report_key(dev, gc_psx_btn[j], ~data[i][1] & (1 << j)); 710 input_report_key(dev, gc_psx_btn[i], ~data[1] & (1 << i));
538 711
539 input_report_key(dev, BTN_START, ~data[i][0] & 0x08); 712 input_report_key(dev, BTN_START, ~data[0] & 0x08);
540 input_report_key(dev, BTN_SELECT, ~data[i][0] & 0x01); 713 input_report_key(dev, BTN_SELECT, ~data[0] & 0x01);
541 714
542 input_sync(dev); 715 input_sync(dev);
543 716
544 break; 717 break;
545 718
546 case 0: /* not a pad, ignore */ 719 default: /* not a pad, ignore */
547 break; 720 break;
548 } 721 }
722}
723
724static void gc_psx_process_packet(struct gc *gc)
725{
726 unsigned char data[GC_MAX_DEVICES][GC_PSX_BYTES];
727 unsigned char id[GC_MAX_DEVICES];
728 struct gc_pad *pad;
729 int i;
730
731 gc_psx_read_packet(gc, data, id);
732
733 for (i = 0; i < GC_MAX_DEVICES; i++) {
734 pad = &gc->pads[i];
735 if (pad->type == GC_PSX || pad->type == GC_DDR)
736 gc_psx_report_one(pad, id[i], data[i]);
549 } 737 }
550} 738}
551 739
@@ -561,28 +749,31 @@ static void gc_timer(unsigned long private)
561 * N64 pads - must be read first, any read confuses them for 200 us 749 * N64 pads - must be read first, any read confuses them for 200 us
562 */ 750 */
563 751
564 if (gc->pads[GC_N64]) 752 if (gc->pad_count[GC_N64])
565 gc_n64_process_packet(gc); 753 gc_n64_process_packet(gc);
566 754
567/* 755/*
568 * NES and SNES pads or mouse 756 * NES and SNES pads or mouse
569 */ 757 */
570 758
571 if (gc->pads[GC_NES] || gc->pads[GC_SNES] || gc->pads[GC_SNESMOUSE]) 759 if (gc->pad_count[GC_NES] ||
760 gc->pad_count[GC_SNES] ||
761 gc->pad_count[GC_SNESMOUSE]) {
572 gc_nes_process_packet(gc); 762 gc_nes_process_packet(gc);
763 }
573 764
574/* 765/*
575 * Multi and Multi2 joysticks 766 * Multi and Multi2 joysticks
576 */ 767 */
577 768
578 if (gc->pads[GC_MULTI] || gc->pads[GC_MULTI2]) 769 if (gc->pad_count[GC_MULTI] || gc->pad_count[GC_MULTI2])
579 gc_multi_process_packet(gc); 770 gc_multi_process_packet(gc);
580 771
581/* 772/*
582 * PSX controllers 773 * PSX controllers
583 */ 774 */
584 775
585 if (gc->pads[GC_PSX] || gc->pads[GC_DDR]) 776 if (gc->pad_count[GC_PSX] || gc->pad_count[GC_DDR])
586 gc_psx_process_packet(gc); 777 gc_psx_process_packet(gc);
587 778
588 mod_timer(&gc->timer, jiffies + GC_REFRESH_TIME); 779 mod_timer(&gc->timer, jiffies + GC_REFRESH_TIME);
@@ -622,25 +813,29 @@ static void gc_close(struct input_dev *dev)
622 813
623static int __init gc_setup_pad(struct gc *gc, int idx, int pad_type) 814static int __init gc_setup_pad(struct gc *gc, int idx, int pad_type)
624{ 815{
816 struct gc_pad *pad = &gc->pads[idx];
625 struct input_dev *input_dev; 817 struct input_dev *input_dev;
626 int i; 818 int i;
819 int err;
627 820
628 if (!pad_type) 821 if (pad_type < 1 || pad_type >= GC_MAX) {
629 return 0; 822 pr_err("Pad type %d unknown\n", pad_type);
630
631 if (pad_type < 1 || pad_type > GC_MAX) {
632 printk(KERN_WARNING "gamecon.c: Pad type %d unknown\n", pad_type);
633 return -EINVAL; 823 return -EINVAL;
634 } 824 }
635 825
636 gc->dev[idx] = input_dev = input_allocate_device(); 826 pad->dev = input_dev = input_allocate_device();
637 if (!input_dev) { 827 if (!input_dev) {
638 printk(KERN_ERR "gamecon.c: Not enough memory for input device\n"); 828 pr_err("Not enough memory for input device\n");
639 return -ENOMEM; 829 return -ENOMEM;
640 } 830 }
641 831
832 pad->type = pad_type;
833
834 snprintf(pad->phys, sizeof(pad->phys),
835 "%s/input%d", gc->pd->port->name, idx);
836
642 input_dev->name = gc_names[pad_type]; 837 input_dev->name = gc_names[pad_type];
643 input_dev->phys = gc->phys[idx]; 838 input_dev->phys = pad->phys;
644 input_dev->id.bustype = BUS_PARPORT; 839 input_dev->id.bustype = BUS_PARPORT;
645 input_dev->id.vendor = 0x0001; 840 input_dev->id.vendor = 0x0001;
646 input_dev->id.product = pad_type; 841 input_dev->id.product = pad_type;
@@ -659,61 +854,76 @@ static int __init gc_setup_pad(struct gc *gc, int idx, int pad_type)
659 } else 854 } else
660 input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL); 855 input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);
661 856
662 gc->pads[0] |= gc_status_bit[idx]; 857 gc->pad_count[pad_type]++;
663 gc->pads[pad_type] |= gc_status_bit[idx];
664 858
665 switch (pad_type) { 859 switch (pad_type) {
666 860
667 case GC_N64: 861 case GC_N64:
668 for (i = 0; i < 10; i++) 862 for (i = 0; i < 10; i++)
669 set_bit(gc_n64_btn[i], input_dev->keybit); 863 __set_bit(gc_n64_btn[i], input_dev->keybit);
670 864
671 for (i = 0; i < 2; i++) { 865 for (i = 0; i < 2; i++) {
672 input_set_abs_params(input_dev, ABS_X + i, -127, 126, 0, 2); 866 input_set_abs_params(input_dev, ABS_X + i, -127, 126, 0, 2);
673 input_set_abs_params(input_dev, ABS_HAT0X + i, -1, 1, 0, 0); 867 input_set_abs_params(input_dev, ABS_HAT0X + i, -1, 1, 0, 0);
674 } 868 }
675
676 break;
677
678 case GC_SNESMOUSE:
679 set_bit(BTN_LEFT, input_dev->keybit);
680 set_bit(BTN_RIGHT, input_dev->keybit);
681 set_bit(REL_X, input_dev->relbit);
682 set_bit(REL_Y, input_dev->relbit);
683 break;
684
685 case GC_SNES:
686 for (i = 4; i < 8; i++)
687 set_bit(gc_snes_btn[i], input_dev->keybit);
688 case GC_NES:
689 for (i = 0; i < 4; i++)
690 set_bit(gc_snes_btn[i], input_dev->keybit);
691 break;
692
693 case GC_MULTI2:
694 set_bit(BTN_THUMB, input_dev->keybit);
695 case GC_MULTI:
696 set_bit(BTN_TRIGGER, input_dev->keybit);
697 break;
698
699 case GC_PSX:
700 for (i = 0; i < 6; i++)
701 input_set_abs_params(input_dev, gc_psx_abs[i], 4, 252, 0, 2);
702 for (i = 0; i < 12; i++)
703 set_bit(gc_psx_btn[i], input_dev->keybit);
704
705 break;
706 869
707 case GC_DDR: 870 err = gc_n64_init_ff(input_dev, idx);
708 for (i = 0; i < 4; i++) 871 if (err) {
709 set_bit(gc_psx_ddr_btn[i], input_dev->keybit); 872 pr_warning("Failed to initiate rumble for N64 device %d\n", idx);
710 for (i = 0; i < 12; i++) 873 goto err_free_dev;
711 set_bit(gc_psx_btn[i], input_dev->keybit); 874 }
712 875
713 break; 876 break;
877
878 case GC_SNESMOUSE:
879 __set_bit(BTN_LEFT, input_dev->keybit);
880 __set_bit(BTN_RIGHT, input_dev->keybit);
881 __set_bit(REL_X, input_dev->relbit);
882 __set_bit(REL_Y, input_dev->relbit);
883 break;
884
885 case GC_SNES:
886 for (i = 4; i < 8; i++)
887 __set_bit(gc_snes_btn[i], input_dev->keybit);
888 case GC_NES:
889 for (i = 0; i < 4; i++)
890 __set_bit(gc_snes_btn[i], input_dev->keybit);
891 break;
892
893 case GC_MULTI2:
894 __set_bit(BTN_THUMB, input_dev->keybit);
895 case GC_MULTI:
896 __set_bit(BTN_TRIGGER, input_dev->keybit);
897 break;
898
899 case GC_PSX:
900 for (i = 0; i < 6; i++)
901 input_set_abs_params(input_dev,
902 gc_psx_abs[i], 4, 252, 0, 2);
903 for (i = 0; i < 12; i++)
904 __set_bit(gc_psx_btn[i], input_dev->keybit);
905
906 break;
907
908 case GC_DDR:
909 for (i = 0; i < 4; i++)
910 __set_bit(gc_psx_ddr_btn[i], input_dev->keybit);
911 for (i = 0; i < 12; i++)
912 __set_bit(gc_psx_btn[i], input_dev->keybit);
913
914 break;
714 } 915 }
715 916
917 err = input_register_device(pad->dev);
918 if (err)
919 goto err_free_dev;
920
716 return 0; 921 return 0;
922
923err_free_dev:
924 input_free_device(pad->dev);
925 pad->dev = NULL;
926 return err;
717} 927}
718 928
719static struct gc __init *gc_probe(int parport, int *pads, int n_pads) 929static struct gc __init *gc_probe(int parport, int *pads, int n_pads)
@@ -722,52 +932,47 @@ static struct gc __init *gc_probe(int parport, int *pads, int n_pads)
722 struct parport *pp; 932 struct parport *pp;
723 struct pardevice *pd; 933 struct pardevice *pd;
724 int i; 934 int i;
935 int count = 0;
725 int err; 936 int err;
726 937
727 pp = parport_find_number(parport); 938 pp = parport_find_number(parport);
728 if (!pp) { 939 if (!pp) {
729 printk(KERN_ERR "gamecon.c: no such parport\n"); 940 pr_err("no such parport %d\n", parport);
730 err = -EINVAL; 941 err = -EINVAL;
731 goto err_out; 942 goto err_out;
732 } 943 }
733 944
734 pd = parport_register_device(pp, "gamecon", NULL, NULL, NULL, PARPORT_DEV_EXCL, NULL); 945 pd = parport_register_device(pp, "gamecon", NULL, NULL, NULL, PARPORT_DEV_EXCL, NULL);
735 if (!pd) { 946 if (!pd) {
736 printk(KERN_ERR "gamecon.c: parport busy already - lp.o loaded?\n"); 947 pr_err("parport busy already - lp.o loaded?\n");
737 err = -EBUSY; 948 err = -EBUSY;
738 goto err_put_pp; 949 goto err_put_pp;
739 } 950 }
740 951
741 gc = kzalloc(sizeof(struct gc), GFP_KERNEL); 952 gc = kzalloc(sizeof(struct gc), GFP_KERNEL);
742 if (!gc) { 953 if (!gc) {
743 printk(KERN_ERR "gamecon.c: Not enough memory\n"); 954 pr_err("Not enough memory\n");
744 err = -ENOMEM; 955 err = -ENOMEM;
745 goto err_unreg_pardev; 956 goto err_unreg_pardev;
746 } 957 }
747 958
748 mutex_init(&gc->mutex); 959 mutex_init(&gc->mutex);
749 gc->pd = pd; 960 gc->pd = pd;
750 init_timer(&gc->timer); 961 setup_timer(&gc->timer, gc_timer, (long) gc);
751 gc->timer.data = (long) gc;
752 gc->timer.function = gc_timer;
753 962
754 for (i = 0; i < n_pads && i < GC_MAX_DEVICES; i++) { 963 for (i = 0; i < n_pads && i < GC_MAX_DEVICES; i++) {
755 if (!pads[i]) 964 if (!pads[i])
756 continue; 965 continue;
757 966
758 snprintf(gc->phys[i], sizeof(gc->phys[i]),
759 "%s/input%d", gc->pd->port->name, i);
760 err = gc_setup_pad(gc, i, pads[i]); 967 err = gc_setup_pad(gc, i, pads[i]);
761 if (err) 968 if (err)
762 goto err_unreg_devs; 969 goto err_unreg_devs;
763 970
764 err = input_register_device(gc->dev[i]); 971 count++;
765 if (err)
766 goto err_free_dev;
767 } 972 }
768 973
769 if (!gc->pads[0]) { 974 if (count == 0) {
770 printk(KERN_ERR "gamecon.c: No valid devices specified\n"); 975 pr_err("No valid devices specified\n");
771 err = -EINVAL; 976 err = -EINVAL;
772 goto err_free_gc; 977 goto err_free_gc;
773 } 978 }
@@ -775,12 +980,10 @@ static struct gc __init *gc_probe(int parport, int *pads, int n_pads)
775 parport_put_port(pp); 980 parport_put_port(pp);
776 return gc; 981 return gc;
777 982
778 err_free_dev:
779 input_free_device(gc->dev[i]);
780 err_unreg_devs: 983 err_unreg_devs:
781 while (--i >= 0) 984 while (--i >= 0)
782 if (gc->dev[i]) 985 if (gc->pads[i].dev)
783 input_unregister_device(gc->dev[i]); 986 input_unregister_device(gc->pads[i].dev);
784 err_free_gc: 987 err_free_gc:
785 kfree(gc); 988 kfree(gc);
786 err_unreg_pardev: 989 err_unreg_pardev:
@@ -796,8 +999,8 @@ static void gc_remove(struct gc *gc)
796 int i; 999 int i;
797 1000
798 for (i = 0; i < GC_MAX_DEVICES; i++) 1001 for (i = 0; i < GC_MAX_DEVICES; i++)
799 if (gc->dev[i]) 1002 if (gc->pads[i].dev)
800 input_unregister_device(gc->dev[i]); 1003 input_unregister_device(gc->pads[i].dev);
801 parport_unregister_device(gc->pd); 1004 parport_unregister_device(gc->pd);
802 kfree(gc); 1005 kfree(gc);
803} 1006}
@@ -813,7 +1016,7 @@ static int __init gc_init(void)
813 continue; 1016 continue;
814 1017
815 if (gc_cfg[i].nargs < 2) { 1018 if (gc_cfg[i].nargs < 2) {
816 printk(KERN_ERR "gamecon.c: at least one device must be specified\n"); 1019 pr_err("at least one device must be specified\n");
817 err = -EINVAL; 1020 err = -EINVAL;
818 break; 1021 break;
819 } 1022 }
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-04 06:43:53 -0500