Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a25e058 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: iforce - factor out hat handling when parsing packets 



This makes code clearer a bit.

Tested-by: default avatarTim Schumacher <timschumi@gmx.de>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 43e61fc7

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

+57 −44
Original line number Diff line number Diff line
@@ -130,61 +130,75 @@ static int mark_core_as_ready(struct iforce *iforce, unsigned short addr) 
	return -1;

}



void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data)

static void iforce_report_hats_buttons(struct iforce *iforce, u8 *data)

{

	struct input_dev *dev = iforce->dev;

	int i;



	wake_up(&iforce->wait);



	if (!iforce->type)

		return;



	switch (HI(cmd)) {



	case 0x01:	/* joystick position data */

	case 0x03:	/* wheel position data */

		if (HI(cmd) == 1) {

			input_report_abs(dev, ABS_X, (__s16) (((__s16)data[1] << 8) | data[0]));

			input_report_abs(dev, ABS_Y, (__s16) (((__s16)data[3] << 8) | data[2]));

			input_report_abs(dev, ABS_THROTTLE, 255 - data[4]);

			if (LO(cmd) >= 8 && test_bit(ABS_RUDDER ,dev->absbit))

				input_report_abs(dev, ABS_RUDDER, (__s8)data[7]);

		} else {

			input_report_abs(dev, ABS_WHEEL, (__s16) (((__s16)data[1] << 8) | data[0]));

			input_report_abs(dev, ABS_GAS,   255 - data[2]);

			input_report_abs(dev, ABS_BRAKE, 255 - data[3]);

		}



	input_report_abs(dev, ABS_HAT0X, iforce_hat_to_axis[data[6] >> 4].x);

	input_report_abs(dev, ABS_HAT0Y, iforce_hat_to_axis[data[6] >> 4].y);



	for (i = 0; iforce->type->btn[i] >= 0; i++)

			input_report_key(dev, iforce->type->btn[i], data[(i >> 3) + 5] & (1 << (i & 7)));

		input_report_key(dev, iforce->type->btn[i],

				 data[(i >> 3) + 5] & (1 << (i & 7)));



	/* If there are untouched bits left, interpret them as the second hat */

	if (i <= 8) {

			int btns = data[6];

		u8 btns = data[6];



		if (test_bit(ABS_HAT1X, dev->absbit)) {

				if (btns & 8)

			if (btns & BIT(3))

				input_report_abs(dev, ABS_HAT1X, -1);

				else if (btns & 2)

			else if (btns & BIT(1))

				input_report_abs(dev, ABS_HAT1X, 1);

			else

				input_report_abs(dev, ABS_HAT1X, 0);

		}



		if (test_bit(ABS_HAT1Y, dev->absbit)) {

				if (btns & 1)

			if (btns & BIT(0))

				input_report_abs(dev, ABS_HAT1Y, -1);

				else if (btns & 4)

			else if (btns & BIT(2))

				input_report_abs(dev, ABS_HAT1Y, 1);

			else

				input_report_abs(dev, ABS_HAT1Y, 0);

		}

	}

}



void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data)

{

	struct input_dev *dev = iforce->dev;

	int i, j;



	wake_up(&iforce->wait);



	if (!iforce->type)

		return;



	switch (HI(cmd)) {



	case 0x01:	/* joystick position data */

		input_report_abs(dev, ABS_X, (__s16) (((__s16)data[1] << 8) | data[0]));

		input_report_abs(dev, ABS_Y, (__s16) (((__s16)data[3] << 8) | data[2]));

		input_report_abs(dev, ABS_THROTTLE, 255 - data[4]);



		if (LO(cmd) >= 8 && test_bit(ABS_RUDDER ,dev->absbit))

			input_report_abs(dev, ABS_RUDDER, (__s8)data[7]);



		iforce_report_hats_buttons(iforce, data);



		input_sync(dev);

		break;



	case 0x03:	/* wheel position data */

		input_report_abs(dev, ABS_WHEEL, (__s16) (((__s16)data[1] << 8) | data[0]));

		input_report_abs(dev, ABS_GAS,   255 - data[2]);

		input_report_abs(dev, ABS_BRAKE, 255 - data[3]);



		iforce_report_hats_buttons(iforce, data);



		input_sync(dev);

		break;



	case 0x02:	/* status report */
@@ -202,11 +216,10 @@ void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data) 
			/* Report stop event */

			input_report_ff_status(dev, i, FF_STATUS_STOPPED);

		}

		if (LO(cmd) > 3) {

			int j;



		for (j = 3; j < LO(cmd); j += 2)

			mark_core_as_ready(iforce, data[j] | (data[j + 1] << 8));

		}



		break;

	}

}