diff for duplicates of <20160914153247.GL25951@mail.corp.redhat.com> diff --git a/a/1.txt b/N1/1.txt index 2583382..ea69180 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -158,7 +158,7 @@ have to give it a name first). > + struct hid_input *hi, struct hid_field *field, > + struct hid_usage *usage, unsigned long **bit, int *max) > +{ -> + if ((usage->hid & HID_USAGE_PAGE) == HID_UP_CONSUMER) { +> + if ((usage->hid & HID_USAGE_PAGE) = HID_UP_CONSUMER) { > + switch (usage->hid & HID_USAGE) { > + case 0x0001: // Unknown keys -> Idenditied by usage index! @@ -289,11 +289,11 @@ Rince, wash repeat for the rest of the cases. Would be even better to use the enum. > + -> + if (led_cdev == &drv_data->led_mute) +> + if (led_cdev = &drv_data->led_mute) > + led_nr = 0; -> + else if (led_cdev == &drv_data->led_micmute) +> + else if (led_cdev = &drv_data->led_micmute) > + led_nr = 1; -> + else if (led_cdev == &drv_data->led_fnlock) +> + else if (led_cdev = &drv_data->led_fnlock) > + led_nr = 2; > + else > + return LED_OFF; @@ -316,7 +316,7 @@ Likewise, the enum would be nice > + int led_nr_hw = -1; > + -> + if (led_cdev == &drv_data->led_mute) { +> + if (led_cdev = &drv_data->led_mute) { > + led_nr = 0; > + led_nr_hw = 0x64; @@ -327,10 +327,10 @@ If you reorder the enum, I'd say the led_nr_hw could be represented as: So I think this is too much to be just a coincidence. -> + } else if (led_cdev == &drv_data->led_micmute) { +> + } else if (led_cdev = &drv_data->led_micmute) { > + led_nr = 1; > + led_nr_hw = 0x74; -> + } else if (led_cdev == &drv_data->led_fnlock) { +> + } else if (led_cdev = &drv_data->led_fnlock) { > + led_nr = 2; > + led_nr_hw = 0x54; > + } else { @@ -338,7 +338,7 @@ So I think this is too much to be just a coincidence. > + return; > + } > + -> + if (value == LED_OFF) +> + if (value = LED_OFF) > + drv_data->led_state &= ~(1 << led_nr); > + else > + drv_data->led_state |= 1 << led_nr; @@ -357,15 +357,15 @@ So I think this is too much to be just a coincidence. > +{ > + int ret = 0; > + -> + if ((usage->hid & HID_USAGE_PAGE) == HID_UP_CONSUMER -> + && (usage->hid & HID_USAGE) == 0x0001) { +> + if ((usage->hid & HID_USAGE_PAGE) = HID_UP_CONSUMER +> + && (usage->hid & HID_USAGE) = 0x0001) { > + -> + if (usage->usage_index == 0x8 && value == 1) { +> + if (usage->usage_index = 0x8 && value = 1) { > + struct lenovo_drvdata_tpx1cover *drv_data = hid_get_drvdata(hdev); > + > + if (drv_data && drv_data->led_present) { > + drv_data->fnlock_state = lenovo_led_brightness_get_tpx1cover( -> + &drv_data->led_fnlock) == LED_OFF ? 1 : 0; +> + &drv_data->led_fnlock) = LED_OFF ? 1 : 0; > + lenovo_led_brightness_set_tpx1cover( > + &drv_data->led_fnlock, > + drv_data->fnlock_state ? LED_FULL : LED_OFF); @@ -379,7 +379,7 @@ Anyway, if this needs to be there, it should have its own patch > + } > + -> + if (usage->usage_index == 0x9 && value == 1) { +> + if (usage->usage_index = 0x9 && value = 1) { > + input_event(field->hidinput->input, EV_KEY, KEY_MICMUTE, 1); > + input_sync(field->hidinput->input); > + input_event(field->hidinput->input, EV_KEY, KEY_MICMUTE, 0); @@ -398,7 +398,7 @@ Rince wash repeat > + } > + -> + if (usage->usage_index == 0xa && value == 1) { +> + if (usage->usage_index = 0xa && value = 1) { > + input_event(field->hidinput->input, EV_KEY, KEY_CONFIG, 1); > + input_sync(field->hidinput->input); > + input_event(field->hidinput->input, EV_KEY, KEY_CONFIG, 0); @@ -407,7 +407,7 @@ Rince wash repeat > + ret = 1; > + } > + -> + if (usage->usage_index == 0xb && value == 1) { +> + if (usage->usage_index = 0xb && value = 1) { > + input_event(field->hidinput->input, EV_KEY, KEY_SEARCH, 1); > + input_sync(field->hidinput->input); > + input_event(field->hidinput->input, EV_KEY, KEY_SEARCH, 0); @@ -416,7 +416,7 @@ Rince wash repeat > + ret = 1; > + } > + -> + if (usage->usage_index == 0xc && value == 1) { +> + if (usage->usage_index = 0xc && value = 1) { > + input_event(field->hidinput->input, EV_KEY, KEY_SETUP, 1); > + input_sync(field->hidinput->input); > + input_event(field->hidinput->input, EV_KEY, KEY_SETUP, 0); @@ -425,7 +425,7 @@ Rince wash repeat > + ret = 1; > + } > + -> + if (usage->usage_index == 0xd && value == 1) { +> + if (usage->usage_index = 0xd && value = 1) { > + input_event(field->hidinput->input, EV_KEY, KEY_SWITCHVIDEOMODE, 1); > + input_sync(field->hidinput->input); > + input_event(field->hidinput->input, EV_KEY, KEY_SWITCHVIDEOMODE, 0); @@ -434,7 +434,7 @@ Rince wash repeat > + ret = 1; > + } > + -> + if (usage->usage_index == 0xe && value == 1) { +> + if (usage->usage_index = 0xe && value = 1) { > + input_event(field->hidinput->input, EV_KEY, KEY_RFKILL, 1); > + input_sync(field->hidinput->input); > + input_event(field->hidinput->input, EV_KEY, KEY_RFKILL, 0); diff --git a/a/content_digest b/N1/content_digest index 2c1ea3c..4f7fbe7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0b8f9c56c-2dfc-8895-2f2a-e17a34be06d2@secunet.com\0" "From\0Benjamin Tissoires <benjamin.tissoires@redhat.com>\0" "Subject\0Re: [PATCH v2 1/2] hid-lenovo: Add support for X1 Tablet special keys and LED control\0" - "Date\0Wed, 14 Sep 2016 17:32:47 +0200\0" + "Date\0Wed, 14 Sep 2016 15:32:47 +0000\0" "To\0Dennis Wassenberg <dennis.wassenberg@secunet.com>\0" "Cc\0linux-input@vger.kernel.org" linux-sound@vger.kernel.org @@ -176,7 +176,7 @@ "> +\t\tstruct hid_input *hi, struct hid_field *field,\n" "> +\t\tstruct hid_usage *usage, unsigned long **bit, int *max)\n" "> +{\n" - "> +\tif ((usage->hid & HID_USAGE_PAGE) == HID_UP_CONSUMER) {\n" + "> +\tif ((usage->hid & HID_USAGE_PAGE) = HID_UP_CONSUMER) {\n" "> +\t\tswitch (usage->hid & HID_USAGE) {\n" "> +\t\tcase 0x0001: // Unknown keys -> Idenditied by usage index!\n" "\n" @@ -307,11 +307,11 @@ "Would be even better to use the enum.\n" "\n" "> +\n" - "> +\tif (led_cdev == &drv_data->led_mute)\n" + "> +\tif (led_cdev = &drv_data->led_mute)\n" "> +\t\tled_nr = 0;\n" - "> +\telse if (led_cdev == &drv_data->led_micmute)\n" + "> +\telse if (led_cdev = &drv_data->led_micmute)\n" "> +\t\tled_nr = 1;\n" - "> +\telse if (led_cdev == &drv_data->led_fnlock)\n" + "> +\telse if (led_cdev = &drv_data->led_fnlock)\n" "> +\t\tled_nr = 2;\n" "> +\telse\n" "> +\t\treturn LED_OFF;\n" @@ -334,7 +334,7 @@ "\n" "> +\tint led_nr_hw = -1;\n" "> +\n" - "> +\tif (led_cdev == &drv_data->led_mute) {\n" + "> +\tif (led_cdev = &drv_data->led_mute) {\n" "> +\t\tled_nr = 0;\n" "> +\t\tled_nr_hw = 0x64;\n" "\n" @@ -345,10 +345,10 @@ "\n" "So I think this is too much to be just a coincidence.\n" "\n" - "> +\t} else if (led_cdev == &drv_data->led_micmute) {\n" + "> +\t} else if (led_cdev = &drv_data->led_micmute) {\n" "> +\t\tled_nr = 1;\n" "> +\t\tled_nr_hw = 0x74;\n" - "> +\t} else if (led_cdev == &drv_data->led_fnlock) {\n" + "> +\t} else if (led_cdev = &drv_data->led_fnlock) {\n" "> +\t\tled_nr = 2;\n" "> +\t\tled_nr_hw = 0x54;\n" "> +\t} else {\n" @@ -356,7 +356,7 @@ "> +\t\treturn;\n" "> +\t}\n" "> +\n" - "> +\tif (value == LED_OFF)\n" + "> +\tif (value = LED_OFF)\n" "> +\t\tdrv_data->led_state &= ~(1 << led_nr);\n" "> +\telse\n" "> +\t\tdrv_data->led_state |= 1 << led_nr;\n" @@ -375,15 +375,15 @@ "> +{\n" "> +\tint ret = 0;\n" "> +\n" - "> +\tif ((usage->hid & HID_USAGE_PAGE) == HID_UP_CONSUMER\n" - "> +\t\t&& (usage->hid & HID_USAGE) == 0x0001) {\n" + "> +\tif ((usage->hid & HID_USAGE_PAGE) = HID_UP_CONSUMER\n" + "> +\t\t&& (usage->hid & HID_USAGE) = 0x0001) {\n" "> +\n" - "> +\t\tif (usage->usage_index == 0x8 && value == 1) {\n" + "> +\t\tif (usage->usage_index = 0x8 && value = 1) {\n" "> +\t\t\tstruct lenovo_drvdata_tpx1cover *drv_data = hid_get_drvdata(hdev);\n" "> +\n" "> +\t\t\tif (drv_data && drv_data->led_present) {\n" "> +\t\t\t\tdrv_data->fnlock_state = lenovo_led_brightness_get_tpx1cover(\n" - "> +\t\t\t\t\t\t&drv_data->led_fnlock) == LED_OFF ? 1 : 0;\n" + "> +\t\t\t\t\t\t&drv_data->led_fnlock) = LED_OFF ? 1 : 0;\n" "> +\t\t\t\tlenovo_led_brightness_set_tpx1cover(\n" "> +\t\t\t\t\t&drv_data->led_fnlock,\n" "> +\t\t\t\t\tdrv_data->fnlock_state ? LED_FULL : LED_OFF);\n" @@ -397,7 +397,7 @@ "\n" "> +\t\t}\n" "> +\n" - "> +\t\tif (usage->usage_index == 0x9 && value == 1) {\n" + "> +\t\tif (usage->usage_index = 0x9 && value = 1) {\n" "> +\t\t\tinput_event(field->hidinput->input, EV_KEY, KEY_MICMUTE, 1);\n" "> +\t\t\tinput_sync(field->hidinput->input);\n" "> +\t\t\tinput_event(field->hidinput->input, EV_KEY, KEY_MICMUTE, 0);\n" @@ -416,7 +416,7 @@ "\n" "> +\t\t}\n" "> +\n" - "> +\t\tif (usage->usage_index == 0xa && value == 1) {\n" + "> +\t\tif (usage->usage_index = 0xa && value = 1) {\n" "> +\t\t\tinput_event(field->hidinput->input, EV_KEY, KEY_CONFIG, 1);\n" "> +\t\t\tinput_sync(field->hidinput->input);\n" "> +\t\t\tinput_event(field->hidinput->input, EV_KEY, KEY_CONFIG, 0);\n" @@ -425,7 +425,7 @@ "> +\t\t\tret = 1;\n" "> +\t\t}\n" "> +\n" - "> +\t\tif (usage->usage_index == 0xb && value == 1) {\n" + "> +\t\tif (usage->usage_index = 0xb && value = 1) {\n" "> +\t\t\tinput_event(field->hidinput->input, EV_KEY, KEY_SEARCH, 1);\n" "> +\t\t\tinput_sync(field->hidinput->input);\n" "> +\t\t\tinput_event(field->hidinput->input, EV_KEY, KEY_SEARCH, 0);\n" @@ -434,7 +434,7 @@ "> +\t\t\tret = 1;\n" "> +\t\t}\n" "> +\n" - "> +\t\tif (usage->usage_index == 0xc && value == 1) {\n" + "> +\t\tif (usage->usage_index = 0xc && value = 1) {\n" "> +\t\t\tinput_event(field->hidinput->input, EV_KEY, KEY_SETUP, 1);\n" "> +\t\t\tinput_sync(field->hidinput->input);\n" "> +\t\t\tinput_event(field->hidinput->input, EV_KEY, KEY_SETUP, 0);\n" @@ -443,7 +443,7 @@ "> +\t\t\tret = 1;\n" "> +\t\t}\n" "> +\n" - "> +\t\tif (usage->usage_index == 0xd && value == 1) {\n" + "> +\t\tif (usage->usage_index = 0xd && value = 1) {\n" "> +\t\t\tinput_event(field->hidinput->input, EV_KEY, KEY_SWITCHVIDEOMODE, 1);\n" "> +\t\t\tinput_sync(field->hidinput->input);\n" "> +\t\t\tinput_event(field->hidinput->input, EV_KEY, KEY_SWITCHVIDEOMODE, 0);\n" @@ -452,7 +452,7 @@ "> +\t\t\tret = 1;\n" "> +\t\t}\n" "> +\n" - "> +\t\tif (usage->usage_index == 0xe && value == 1) {\n" + "> +\t\tif (usage->usage_index = 0xe && value = 1) {\n" "> +\t\t\tinput_event(field->hidinput->input, EV_KEY, KEY_RFKILL, 1);\n" "> +\t\t\tinput_sync(field->hidinput->input);\n" "> +\t\t\tinput_event(field->hidinput->input, EV_KEY, KEY_RFKILL, 0);\n" @@ -894,4 +894,4 @@ "Cheers,\n" Benjamin -6f1889bbdc11c6a5d5b6db92c88948b186ecb4773a04abb2e27091286183b26d +0ee2ff8c1e8faa11d9a5f81d5379ed0a7a11bb85f795cf302dfbb4433557b1cb
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.