Commit 93817584 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

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: default avatarTim Schumacher <timschumi@gmx.de>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 2a1433ff

drivers/input/joystick/iforce/iforce-packets.c

+0 −7
Original line number Diff line number Diff line
@@ -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)

drivers/input/joystick/iforce/iforce-serio.c

+11 −1
Original line number Diff line number Diff line
@@ -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;