From: Peter Nelson <pnelson+kernel@andrew.cmu.edu>
To: linux-kernel@vger.kernel.org, vojtech@suse.cz
Subject: [PATCH TRIVIAL] joysticks/gamecon: Fix GPF and GC_DDR bug
Date: Mon, 20 Sep 2004 16:22:57 -0400 [thread overview]
Message-ID: <414F3C21.60209@andrew.cmu.edu> (raw)
Linus recently accepted my patch that has been in Vojtech's tree for a
while but I have just been able to get my development machine working
again and found two bugs. The first causes a General Protection Fault
because of a missing ',' when initializing the gc_names array (took
forever to track down). The second causes no data to be processed when
the type is set to GC_DDR. Some of the PSX functions check the status
bits against only GC_PSX instead of both (since DDR is a subset of PSX).
-Peter Nelson
---
===== drivers/input/joystick/gamecon.c 1.18 vs edited =====
--- 1.18/drivers/input/joystick/gamecon.c 2004-06-24 11:55:22 -04:00
+++ edited/drivers/input/joystick/gamecon.c 2004-09-20 13:58:40 -04:00
@@ -89,7 +89,7 @@ static struct gc *gc_base[3];
static int gc_status_bit[] = { 0x40, 0x80, 0x20, 0x10, 0x08 };
static char *gc_names[] = { NULL, "SNES pad", "NES pad", "NES FourPort", "Multisystem joystick",
- "Multisystem 2-button joystick", "N64 controller", "PSX controller"
+ "Multisystem 2-button joystick", "N64 controller", "PSX controller",
"PSX DDR controller" };
/*
* N64 support.
@@ -271,7 +271,8 @@ static void gc_psx_command(struct gc *gc
udelay(gc_psx_delay);
read = parport_read_status(gc->pd->port) ^ 0x80;
for (j = 0; j < 5; j++)
- data[j] |= (read & gc_status_bit[j] & gc->pads[GC_PSX]) ? (1 << i) : 0;
+ data[j] |= (read & gc_status_bit[j] & (gc->pads[GC_PSX] | gc->pads[GC_DDR]))
+ ? (1 << i) : 0;
parport_write_data(gc->pd->port, cmd | GC_PSX_CLOCK | GC_PSX_POWER);
udelay(gc_psx_delay);
}
@@ -300,7 +301,8 @@ static void gc_psx_read_packet(struct gc
gc_psx_command(gc, 0, data2); /* Dump status */
for (i =0; i < 5; i++) /* Find the longest pad */
- if((gc_status_bit[i] & gc->pads[GC_PSX]) && (GC_PSX_LEN(id[i]) > max_len))
+ if((gc_status_bit[i] & (gc->pads[GC_PSX] | gc->pads[GC_DDR]))
+ && (GC_PSX_LEN(id[i]) > max_len))
max_len = GC_PSX_LEN(id[i]);
for (i = 0; i < max_len * 2; i++) { /* Read in all the data */
reply other threads:[~2004-09-20 20:27 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=414F3C21.60209@andrew.cmu.edu \
--to=pnelson+kernel@andrew.cmu.edu \
--cc=linux-kernel@vger.kernel.org \
--cc=vojtech@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox