redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

Input: iforce - do not combine arguments for iforce_process_packet() 

Current code combines packet type and data length into single argument to
iforce_process_packet() and then has to untangle it. It is much clearer to
simply use separate arguments.

Tested-by: Tim Schumacher <timschumi@gmx.de>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
alistair/sunxi64-5.4-dsi
Dmitry Torokhov 2018-08-09 17:50:39 -07:00
parent 8a25e05890
commit d3cc100069
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/input/joystick/iforce/iforce-packets.c
View File

@ -166,7 +166,8 @@ static void iforce_report_hats_buttons(struct iforce *iforce, u8 *data)
}
}
void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data)
void iforce_process_packet(struct iforce *iforce,
u8 packet_id, u8 *data, size_t len)
{
struct input_dev *dev = iforce->dev;
int i, j;
@ -176,14 +177,14 @@ void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data)
if (!iforce->type)
return;
switch (HI(cmd)) {
switch (packet_id) {
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))
if (len >= 8 && test_bit(ABS_RUDDER ,dev->absbit))
input_report_abs(dev, ABS_RUDDER, (__s8)data[7]);
iforce_report_hats_buttons(iforce, data);
@ -217,7 +218,7 @@ void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data)
input_report_ff_status(dev, i, FF_STATUS_STOPPED);
}
for (j = 3; j < LO(cmd); j += 2)
for (j = 3; j < len; j += 2)
mark_core_as_ready(iforce, data[j] | (data[j + 1] << 8));
break;

8
drivers/input/joystick/iforce/iforce-serio.c
View File

@ -163,16 +163,16 @@ static irqreturn_t iforce_serio_irq(struct serio *serio,
}
if (iforce_serio->idx == iforce_serio->len) {
u16 cmd = (iforce_serio->id << 8) | iforce_serio->idx;
/* Handle command completion */
if (iforce_serio->expect_packet == iforce_serio->id) {
iforce_serio->expect_packet = 0;
iforce->ecmd = cmd;
iforce->ecmd = (iforce_serio->id << 8) |
iforce_serio->idx;
memcpy(iforce->edata, iforce->data, IFORCE_MAX_LENGTH);
}
iforce_process_packet(iforce, cmd, iforce->data);
iforce_process_packet(iforce, iforce_serio->id,
iforce->data, iforce_serio->len);
iforce_serio->pkt = 0;
iforce_serio->id = 0;

4
drivers/input/joystick/iforce/iforce-usb.c
View File

@ -170,8 +170,8 @@ static void iforce_usb_irq(struct urb *urb)
goto exit;
}
iforce_process_packet(iforce,
(iforce->data[0] << 8) | (urb->actual_length - 1), iforce->data + 1);
iforce_process_packet(iforce, iforce->data[0],
iforce->data + 1, urb->actual_length - 1);
exit:
status = usb_submit_urb(urb, GFP_ATOMIC);

3
drivers/input/joystick/iforce/iforce.h
View File

@ -147,7 +147,8 @@ int iforce_init_device(struct device *parent, u16 bustype,
/* iforce-packets.c */
int iforce_control_playback(struct iforce*, u16 id, unsigned int);
void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data);
void iforce_process_packet(struct iforce *iforce,
u8 packet_id, u8 *data, size_t len);
int iforce_send_packet(struct iforce *iforce, u16 cmd, unsigned char* data);
void iforce_dump_packet(struct iforce *iforce, char *msg, u16 cmd, unsigned char *data);