leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HID: alps: a few cleanups

Browse Source 
Remove an unnecessary codes.
Change input_ivent() function to appropriate function.
Add the device ID of "HID_DEVICE_ID_ALPS_U1_DUAL".

[jkosina@suse.cz: removed unnecessary bitshifts of values passed
 input_report_key() as spotted by Dmitry]
Signed-off-by: Masaki Ota <masaki.ota@jp.alps.com>
Reviewed-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Masaki Ota 2016-06-22 13:11:08 +09:00 committed by Jiri Kosina
parent ded69bba56
commit 819d64e51d
3 changed files with 50 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
drivers/hid/hid-alps.c
View File

@ -98,8 +98,6 @@ struct u1_dev {
u32 sp_btn_cnt; u32 sp_btn_cnt;
}; };
static struct u1_dev *priv;
static int u1_read_write_register(struct hid_device *hdev, u32 address, static int u1_read_write_register(struct hid_device *hdev, u32 address,
u8 *read_val, u8 write_val, bool read_flag) u8 *read_val, u8 write_val, bool read_flag)
{ {
@ -108,16 +106,10 @@ static int u1_read_write_register(struct hid_device *hdev, u32 address,
u8 *input; u8 *input;
u8 *readbuf; u8 *readbuf;
input = kzalloc(sizeof(u8)*U1_FEATURE_REPORT_LEN, GFP_KERNEL); input = kzalloc(U1_FEATURE_REPORT_LEN, GFP_KERNEL);
if (!input) if (!input)
return -ENOMEM; return -ENOMEM;
readbuf = kzalloc(sizeof(u8)*U1_FEATURE_REPORT_LEN, GFP_KERNEL);
if (!readbuf) {
kfree(input);
return -ENOMEM;
}
input[0] = U1_FEATURE_REPORT_ID; input[0] = U1_FEATURE_REPORT_ID;
if (read_flag) { if (read_flag) {
input[1] = U1_CMD_REGISTER_READ; input[1] = U1_CMD_REGISTER_READ;
@ -136,8 +128,8 @@ static int u1_read_write_register(struct hid_device *hdev, u32 address,
input[7] = check_sum; input[7] = check_sum;
ret = hid_hw_raw_request(hdev, U1_FEATURE_REPORT_ID, input, ret = hid_hw_raw_request(hdev, U1_FEATURE_REPORT_ID, input,
sizeof(u8)*U1_FEATURE_REPORT_LEN, HID_FEATURE_REPORT, U1_FEATURE_REPORT_LEN,
HID_REQ_SET_REPORT); HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
if (ret < 0) { if (ret < 0) {
dev_err(&hdev->dev, "failed to read command (%d)\n", ret); dev_err(&hdev->dev, "failed to read command (%d)\n", ret);
@ -145,8 +137,14 @@ static int u1_read_write_register(struct hid_device *hdev, u32 address,
} }
if (read_flag) { if (read_flag) {
readbuf = kzalloc(U1_FEATURE_REPORT_LEN, GFP_KERNEL);
if (!readbuf) {
kfree(input);
return -ENOMEM;
}
ret = hid_hw_raw_request(hdev, U1_FEATURE_REPORT_ID, readbuf, ret = hid_hw_raw_request(hdev, U1_FEATURE_REPORT_ID, readbuf,
sizeof(u8)*U1_FEATURE_REPORT_LEN, U1_FEATURE_REPORT_LEN,
HID_FEATURE_REPORT, HID_REQ_GET_REPORT); HID_FEATURE_REPORT, HID_REQ_GET_REPORT);
if (ret < 0) { if (ret < 0) {
@ -155,24 +153,23 @@ static int u1_read_write_register(struct hid_device *hdev, u32 address,
} }
*read_val = readbuf[6]; *read_val = readbuf[6];
kfree(readbuf);
} }
kfree(input); ret = 0;
kfree(readbuf);
return 0;
exit: exit:
kfree(input); kfree(input);
kfree(readbuf);
return ret; return ret;
} }
static int alps_raw_event(struct hid_device *hdev, static int alps_raw_event(struct hid_device *hdev,
struct hid_report *report, u8 *data, int size) struct hid_report *report, u8 *data, int size)
{ {
int x[MAX_TOUCHES], y[MAX_TOUCHES], z[MAX_TOUCHES]; unsigned int x, y, z;
int i, left, right, middle; int i;
short sp_x, sp_y, sp_z; short sp_x, sp_y;
struct u1_dev *hdata = hid_get_drvdata(hdev); struct u1_dev *hdata = hid_get_drvdata(hdev);
switch (data[0]) { switch (data[0]) {
@ -182,16 +179,15 @@ static int alps_raw_event(struct hid_device *hdev,
break; break;
case U1_ABSOLUTE_REPORT_ID: case U1_ABSOLUTE_REPORT_ID:
for (i = 0; i < MAX_TOUCHES; i++) { for (i = 0; i < MAX_TOUCHES; i++) {
x[i] = (data[3+(5*i)] | (data[4+(5*i)] << 8)); u8 *contact = &data[i * 5];
y[i] = (data[5+(5*i)] | (data[6+(5*i)] << 8));
z[i] = data[7+(5*i)] & 0x7F; x = get_unaligned_le16(contact + 3);
left = data[1] & 0x1; y = get_unaligned_le16(contact + 5);
right = (data[1] & 0x2) >> 1; z = contact[7] & 0x7F;
middle = (data[1] & 0x4) >> 2;
input_mt_slot(hdata->input, i); input_mt_slot(hdata->input, i);
if (z[i] != 0) { if (z != 0) {
input_mt_report_slot_state(hdata->input, input_mt_report_slot_state(hdata->input,
MT_TOOL_FINGER, 1); MT_TOOL_FINGER, 1);
} else { } else {
@ -200,42 +196,43 @@ static int alps_raw_event(struct hid_device *hdev,
break; break;
} }
input_event(hdata->input, EV_ABS, input_report_abs(hdata->input, ABS_MT_POSITION_X, x);
ABS_MT_POSITION_X, x[i]); input_report_abs(hdata->input, ABS_MT_POSITION_Y, y);
input_event(hdata->input, EV_ABS, input_report_abs(hdata->input, ABS_MT_PRESSURE, z);
ABS_MT_POSITION_Y, y[i]);
input_event(hdata->input, EV_ABS,
ABS_MT_PRESSURE, z[i]);
} }
input_mt_sync_frame(hdata->input); input_mt_sync_frame(hdata->input);
input_sync(hdata->input);
input_event(hdata->input, EV_KEY, BTN_LEFT, left); input_report_key(hdata->input, BTN_LEFT,
input_event(hdata->input, EV_KEY, BTN_RIGHT, right); data[1] & 0x1);
input_event(hdata->input, EV_KEY, BTN_MIDDLE, middle); input_report_key(hdata->input, BTN_RIGHT,
(data[1] & 0x2));
input_report_key(hdata->input, BTN_MIDDLE,
(data[1] & 0x4));
input_sync(hdata->input);
return 1; return 1;
case U1_SP_ABSOLUTE_REPORT_ID: case U1_SP_ABSOLUTE_REPORT_ID:
sp_x = (data[2] | (data[3] << 8)); sp_x = get_unaligned_le16(data+2);
sp_y = (data[4] | (data[5] << 8)); sp_y = get_unaligned_le16(data+4);
sp_z = (data[6] | data[7]) & 0x7FFF;
left = data[1] & 0x1;
right = (data[1] & 0x2) >> 1;
middle = (data[1] & 0x4) >> 2;
sp_x = sp_x / 8; sp_x = sp_x / 8;
sp_y = sp_y / 8; sp_y = sp_y / 8;
input_event(priv->input2, EV_REL, REL_X, sp_x); input_report_rel(hdata->input2, REL_X, sp_x);
input_event(priv->input2, EV_REL, REL_Y, sp_y); input_report_rel(hdata->input2, REL_Y, sp_y);
input_event(priv->input2, EV_KEY, BTN_LEFT, left); input_report_key(hdata->input2, BTN_LEFT,
input_event(priv->input2, EV_KEY, BTN_RIGHT, right); data[1] & 0x1);
input_event(priv->input2, EV_KEY, BTN_MIDDLE, middle); input_report_key(hdata->input2, BTN_RIGHT,
(data[1] & 0x2));
input_report_key(hdata->input2, BTN_MIDDLE,
(data[1] & 0x4));
input_sync(priv->input2); input_sync(hdata->input2);
return 1; return 1;
} }
@ -265,15 +262,6 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi)
int ret; int ret;
int res_x, res_y, i; int res_x, res_y, i;
/* Check device product ID */
switch (hdev->product) {
case HID_PRODUCT_ID_U1:
case HID_PRODUCT_ID_U1_DUAL:
break;
default:
return 0;
}
data->input = input; data->input = input;
hid_dbg(hdev, "Opening low level driver\n"); hid_dbg(hdev, "Opening low level driver\n");
@ -393,20 +381,13 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi)
/* Stick device initialization */ /* Stick device initialization */
if (devInfo.dev_type & U1_DEVTYPE_SP_SUPPORT) { if (devInfo.dev_type & U1_DEVTYPE_SP_SUPPORT) {
priv = kzalloc(sizeof(struct u1_dev), GFP_KERNEL);
if (!priv) {
hid_device_io_stop(hdev);
hid_hw_close(hdev);
return -ENOMEM;
}
input2 = input_allocate_device(); input2 = input_allocate_device();
if (!input2) { if (!input2) {
input_free_device(input2); input_free_device(input2);
goto exit; goto exit;
} }
priv->input2 = input2; data->input2 = input2;
devInfo.dev_ctrl |= U1_SP_ABS_MODE; devInfo.dev_ctrl |= U1_SP_ABS_MODE;
ret = u1_read_write_register(hdev, ADDRESS_U1_DEV_CTRL_1, ret = u1_read_write_register(hdev, ADDRESS_U1_DEV_CTRL_1,
@ -444,7 +425,7 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi)
__set_bit(INPUT_PROP_POINTER, input2->propbit); __set_bit(INPUT_PROP_POINTER, input2->propbit);
__set_bit(INPUT_PROP_POINTING_STICK, input2->propbit); __set_bit(INPUT_PROP_POINTING_STICK, input2->propbit);
if (input_register_device(priv->input2)) { if (input_register_device(data->input2)) {
input_free_device(input2); input_free_device(input2);
goto exit; goto exit;
} }
@ -495,12 +476,11 @@ static int alps_probe(struct hid_device *hdev, const struct hid_device_id *id)
static void alps_remove(struct hid_device *hdev) static void alps_remove(struct hid_device *hdev)
{ {
hid_hw_stop(hdev); hid_hw_stop(hdev);
kfree(priv);
} }
static const struct hid_device_id alps_id[] = { static const struct hid_device_id alps_id[] = {
{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, { HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY,
USB_VENDOR_ID_ALPS_JP, HID_ANY_ID) }, USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1_DUAL) },
{ } { }
}; };
MODULE_DEVICE_TABLE(hid, alps_id); MODULE_DEVICE_TABLE(hid, alps_id);

2
drivers/hid/hid-core.c
View File

@ -1772,7 +1772,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_RP_649) }, { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_RP_649) },
{ HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802) }, { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802) },
{ HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0xf705) }, { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0xf705) },
{ HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_ALPS_JP, HID_ANY_ID) }, { HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1_DUAL) },
{ HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE) }, { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE) },
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICMOUSE) }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICMOUSE) },
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICTRACKPAD) }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICTRACKPAD) },

1
drivers/hid/hid-ids.h
View File

@ -71,6 +71,7 @@
#define USB_DEVICE_ID_IBM_GAMEPAD 0x1101 #define USB_DEVICE_ID_IBM_GAMEPAD 0x1101
#define USB_VENDOR_ID_ALPS_JP 0x044E #define USB_VENDOR_ID_ALPS_JP 0x044E
#define HID_DEVICE_ID_ALPS_U1_DUAL 0x120B
#define USB_VENDOR_ID_ANTON 0x1130 #define USB_VENDOR_ID_ANTON 0x1130
#define USB_DEVICE_ID_ANTON_TOUCH_PAD 0x3101 #define USB_DEVICE_ID_ANTON_TOUCH_PAD 0x3101