diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2018-08-03 15:23:40 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-06-22 23:54:39 -0700 |
| commit | 9381758466f9939d84f6f70097c8883da9639379 (patch) | |
| tree | 797bf15805dfbfcb06604138f22eb8f352f9b9d9 /drivers/input/joystick | |
| parent | 2a1433ff08a1b23e3003483ee2883d327f78db9e (diff) | |
Input: iforce - move command completion handling to serio code
Continue teasing apart protocol-specific bits from core into transport
modules. This time move RS232-specific command completion handling
from core to iforce-serio module.
Tested-by: Tim Schumacher <timschumi@gmx.de>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/joystick')
| -rw-r--r-- | drivers/input/joystick/iforce/iforce-packets.c | 7 | ||||
| -rw-r--r-- | drivers/input/joystick/iforce/iforce-serio.c | 12 |
2 files changed, 11 insertions, 8 deletions
diff --git a/drivers/input/joystick/iforce/iforce-packets.c b/drivers/input/joystick/iforce/iforce-packets.c index e677562efc9a..8a9a152bb595 100644 --- a/drivers/input/joystick/iforce/iforce-packets.c +++ b/drivers/input/joystick/iforce/iforce-packets.c @@ -134,13 +134,6 @@ void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data) struct input_dev *dev = iforce->dev; int i; -#ifdef CONFIG_JOYSTICK_IFORCE_232 - if (HI(iforce->expect_packet) == HI(cmd)) { - iforce->expect_packet = 0; - iforce->ecmd = cmd; - memcpy(iforce->edata, data, IFORCE_MAX_LENGTH); - } -#endif wake_up(&iforce->wait); if (!iforce->type) diff --git a/drivers/input/joystick/iforce/iforce-serio.c b/drivers/input/joystick/iforce/iforce-serio.c index fa45ce425d47..eca2f6eca7f0 100644 --- a/drivers/input/joystick/iforce/iforce-serio.c +++ b/drivers/input/joystick/iforce/iforce-serio.c @@ -130,7 +130,17 @@ static irqreturn_t iforce_serio_irq(struct serio *serio, } if (iforce->idx == iforce->len) { - iforce_process_packet(iforce, (iforce->id << 8) | iforce->idx, iforce->data); + u16 cmd = (iforce->id << 8) | iforce->idx; + + /* Handle command completion */ + if (HI(iforce->expect_packet) == HI(cmd)) { + iforce->expect_packet = 0; + iforce->ecmd = cmd; + memcpy(iforce->edata, iforce->data, IFORCE_MAX_LENGTH); + } + + iforce_process_packet(iforce, cmd, iforce->data); + iforce->pkt = 0; iforce->id = 0; iforce->len = 0; |