Add samsung specific changes
This commit is contained in:
@@ -513,6 +513,21 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
|
||||
code = trans->to;
|
||||
}
|
||||
}
|
||||
|
||||
if (asc->quirks & APPLE_NUMLOCK_EMULATION &&
|
||||
(test_bit(code, asc->pressed_numlock) ||
|
||||
test_bit(LED_NUML, input->led))) {
|
||||
trans = apple_find_translation(powerbook_numlock_keys, code);
|
||||
|
||||
if (trans) {
|
||||
if (value)
|
||||
set_bit(code, asc->pressed_numlock);
|
||||
else
|
||||
clear_bit(code, asc->pressed_numlock);
|
||||
|
||||
code = trans->to;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (usage->code != code) {
|
||||
|
@@ -1140,15 +1140,8 @@
|
||||
#define USB_DEVICE_ID_SAITEK_X65 0x0b6a
|
||||
|
||||
#define USB_VENDOR_ID_SAMSUNG 0x0419
|
||||
#define USB_VENDOR_ID_SAMSUNG_ELECTRONICS 0x04e8
|
||||
#define USB_DEVICE_ID_SAMSUNG_IR_REMOTE 0x0001
|
||||
#define USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE 0x0600
|
||||
#define USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD 0x7021
|
||||
#define USB_DEVICE_ID_SAMSUNG_WIRELESS_GAMEPAD 0xa000
|
||||
#define USB_DEVICE_ID_SAMSUNG_WIRELESS_ACTIONMOUSE 0xa004
|
||||
#define USB_DEVICE_ID_SAMSUNG_WIRELESS_BOOKCOVER 0xa005
|
||||
#define USB_DEVICE_ID_SAMSUNG_WIRELESS_UNIVERSAL_KBD 0xa006
|
||||
#define USB_DEVICE_ID_SAMSUNG_WIRELESS_MULTI_HOGP_KBD 0xa064
|
||||
|
||||
#define USB_VENDOR_ID_SEMICO 0x1a2c
|
||||
#define USB_DEVICE_ID_SEMICO_USB_KEYKOARD 0x0023
|
||||
|
@@ -1899,7 +1899,6 @@ static void hidinput_close(struct input_dev *dev)
|
||||
hid_hw_close(hid);
|
||||
}
|
||||
|
||||
#if 0
|
||||
static bool __hidinput_change_resolution_multipliers(struct hid_device *hid,
|
||||
struct hid_report *report, bool use_logical_max)
|
||||
{
|
||||
@@ -1980,7 +1979,6 @@ static void hidinput_change_resolution_multipliers(struct hid_device *hid)
|
||||
/* refresh our structs */
|
||||
hid_setup_resolution_multiplier(hid);
|
||||
}
|
||||
#endif
|
||||
|
||||
static void report_features(struct hid_device *hid)
|
||||
{
|
||||
@@ -2346,7 +2344,7 @@ int hidinput_connect(struct hid_device *hid, unsigned int force)
|
||||
}
|
||||
}
|
||||
|
||||
//hidinput_change_resolution_multipliers(hid);
|
||||
hidinput_change_resolution_multipliers(hid);
|
||||
|
||||
list_for_each_entry_safe(hidinput, next, &hid->inputs, list) {
|
||||
if (drv->input_configured &&
|
||||
|
@@ -4656,6 +4656,35 @@ static const struct hid_device_id hidpp_devices[] = {
|
||||
{ /* G935 Gaming Headset */
|
||||
HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, 0x0a87),
|
||||
.driver_data = HIDPP_QUIRK_WIRELESS_STATUS },
|
||||
|
||||
{ /* MX5000 keyboard over Bluetooth */
|
||||
HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb305),
|
||||
.driver_data = HIDPP_QUIRK_HIDPP_CONSUMER_VENDOR_KEYS },
|
||||
{ /* Dinovo Edge keyboard over Bluetooth */
|
||||
HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb309),
|
||||
.driver_data = HIDPP_QUIRK_HIDPP_CONSUMER_VENDOR_KEYS },
|
||||
{ /* MX5500 keyboard over Bluetooth */
|
||||
HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb30b),
|
||||
.driver_data = HIDPP_QUIRK_HIDPP_CONSUMER_VENDOR_KEYS },
|
||||
{ /* Logitech G915 TKL keyboard over Bluetooth */
|
||||
HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb35f) },
|
||||
{ /* M-RCQ142 V470 Cordless Laser Mouse over Bluetooth */
|
||||
HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb008) },
|
||||
{ /* MX Master mouse over Bluetooth */
|
||||
HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb012) },
|
||||
{ /* M720 Triathlon mouse over Bluetooth */
|
||||
HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb015) },
|
||||
{ /* MX Ergo trackball over Bluetooth */
|
||||
HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb01d) },
|
||||
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb01e) },
|
||||
{ /* Signature M650 over Bluetooth */
|
||||
HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb02a) },
|
||||
{ /* MX Master 3 mouse over Bluetooth */
|
||||
HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb023) },
|
||||
{ /* MX Anywhere 3 mouse over Bluetooth */
|
||||
HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb025) },
|
||||
{ /* MX Master 3S mouse over Bluetooth */
|
||||
HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, 0xb034) },
|
||||
{}
|
||||
};
|
||||
|
||||
|
@@ -546,16 +546,6 @@ static const struct hid_device_id hid_have_special_driver[] = {
|
||||
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE) },
|
||||
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO, USB_DEVICE_ID_NINTENDO_WIIMOTE2) },
|
||||
#endif
|
||||
#if IS_ENABLED(CONFIG_HID_NINTENDO)
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_NINTENDO,
|
||||
USB_DEVICE_ID_NINTENDO_PROCON) },
|
||||
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO,
|
||||
USB_DEVICE_ID_NINTENDO_PROCON) },
|
||||
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO,
|
||||
USB_DEVICE_ID_NINTENDO_JOYCONL) },
|
||||
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_NINTENDO,
|
||||
USB_DEVICE_ID_NINTENDO_JOYCONR) },
|
||||
#endif
|
||||
#if IS_ENABLED(CONFIG_HID_NTI)
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_NTI, USB_DEVICE_ID_USB_SUN) },
|
||||
#endif
|
||||
@@ -659,12 +649,6 @@ static const struct hid_device_id hid_have_special_driver[] = {
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_JOY_BOX_3_PRO) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_DUAL_BOX_PRO) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_WISEGROUP_LTD, USB_DEVICE_ID_SUPER_JOY_BOX_5_PRO) },
|
||||
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SAMSUNG_ELECTRONICS, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD) },
|
||||
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SAMSUNG_ELECTRONICS, USB_DEVICE_ID_SAMSUNG_WIRELESS_GAMEPAD) },
|
||||
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SAMSUNG_ELECTRONICS, USB_DEVICE_ID_SAMSUNG_WIRELESS_ACTIONMOUSE) },
|
||||
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SAMSUNG_ELECTRONICS, USB_DEVICE_ID_SAMSUNG_WIRELESS_BOOKCOVER) },
|
||||
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SAMSUNG_ELECTRONICS, USB_DEVICE_ID_SAMSUNG_WIRELESS_UNIVERSAL_KBD) },
|
||||
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SAMSUNG_ELECTRONICS, USB_DEVICE_ID_SAMSUNG_WIRELESS_MULTI_HOGP_KBD) },
|
||||
#endif
|
||||
#if IS_ENABLED(CONFIG_HID_SONY)
|
||||
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_PS3) },
|
||||
|
@@ -125,358 +125,6 @@ static int samsung_kbd_mouse_input_mapping(struct hid_device *hdev,
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int samsung_kbd_input_mapping(struct hid_device *hdev,
|
||||
struct hid_input *hi, struct hid_field *field, struct hid_usage *usage,
|
||||
unsigned long **bit, int *max)
|
||||
{
|
||||
if (!(HID_UP_CONSUMER == (usage->hid & HID_USAGE_PAGE) ||
|
||||
HID_UP_KEYBOARD == (usage->hid & HID_USAGE_PAGE)))
|
||||
return 0;
|
||||
|
||||
dbg_hid("samsung wireless keyboard input mapping event [0x%x]\n",
|
||||
usage->hid & HID_USAGE);
|
||||
|
||||
if (HID_UP_KEYBOARD == (usage->hid & HID_USAGE_PAGE)) {
|
||||
switch (usage->hid & HID_USAGE) {
|
||||
set_bit(EV_REP, hi->input->evbit);
|
||||
/* Only for UK keyboard */
|
||||
/* key found */
|
||||
#ifdef CONFIG_HID_KK_UPGRADE
|
||||
case 0x32:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_KBDILLUMTOGGLE);
|
||||
break;
|
||||
case 0x64:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_BACKSLASH);
|
||||
break;
|
||||
#else
|
||||
case 0x32:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_BACKSLASH);
|
||||
break;
|
||||
case 0x64:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_102ND);
|
||||
break;
|
||||
#endif
|
||||
/* Only for BR keyboard */
|
||||
case 0x87:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_RO);
|
||||
break;
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
if (HID_UP_CONSUMER == (usage->hid & HID_USAGE_PAGE)) {
|
||||
switch (usage->hid & HID_USAGE) {
|
||||
/* report 2 */
|
||||
/* MENU */
|
||||
case 0x040:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_MENU);
|
||||
break;
|
||||
case 0x18a:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_MAIL);
|
||||
break;
|
||||
case 0x196:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_WWW);
|
||||
break;
|
||||
case 0x19e:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_SCREENLOCK);
|
||||
break;
|
||||
case 0x221:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_SEARCH);
|
||||
break;
|
||||
case 0x223:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_HOMEPAGE);
|
||||
break;
|
||||
/* Smtart Voice Key */
|
||||
case 0x300:
|
||||
samsung_kbd_mouse_map_key_clear(BTN_TRIGGER_HAPPY13);
|
||||
break;
|
||||
/* RECENTAPPS */
|
||||
case 0x301:
|
||||
samsung_kbd_mouse_map_key_clear(BTN_TRIGGER_HAPPY1);
|
||||
break;
|
||||
/* APPLICATION */
|
||||
case 0x302:
|
||||
samsung_kbd_mouse_map_key_clear(BTN_TRIGGER_HAPPY2);
|
||||
break;
|
||||
/* Voice search */
|
||||
case 0x305:
|
||||
samsung_kbd_mouse_map_key_clear(BTN_TRIGGER_HAPPY4);
|
||||
break;
|
||||
/* QPANEL on/off */
|
||||
case 0x306:
|
||||
samsung_kbd_mouse_map_key_clear(BTN_TRIGGER_HAPPY5);
|
||||
break;
|
||||
/* SIP on/off */
|
||||
case 0x307:
|
||||
samsung_kbd_mouse_map_key_clear(BTN_TRIGGER_HAPPY3);
|
||||
break;
|
||||
/* LANG */
|
||||
case 0x308:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_LANGUAGE);
|
||||
break;
|
||||
case 0x30a:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_BRIGHTNESSDOWN);
|
||||
break;
|
||||
case 0x30b:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_BRIGHTNESSUP);
|
||||
break;
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int samsung_gamepad_input_mapping(struct hid_device *hdev,
|
||||
struct hid_input *hi, struct hid_field *field, struct hid_usage *usage,
|
||||
unsigned long **bit, int *max)
|
||||
{
|
||||
if (!(HID_UP_BUTTON == (usage->hid & HID_USAGE_PAGE) ||
|
||||
HID_UP_CONSUMER == (usage->hid & HID_USAGE_PAGE)))
|
||||
return 0;
|
||||
|
||||
dbg_hid("samsung wireless gamepad input mapping event [0x%x], %ld, %ld, [0x%x]\n",
|
||||
usage->hid & HID_USAGE, hi->input->evbit[0], hi->input->absbit[0], usage->hid & HID_USAGE_PAGE);
|
||||
|
||||
if (HID_UP_BUTTON == (usage->hid & HID_USAGE_PAGE)) {
|
||||
switch (usage->hid & HID_USAGE) {
|
||||
case 0x01:
|
||||
samsung_kbd_mouse_map_key_clear(BTN_A);
|
||||
break;
|
||||
case 0x02:
|
||||
samsung_kbd_mouse_map_key_clear(BTN_B);
|
||||
break;
|
||||
case 0x03:
|
||||
samsung_kbd_mouse_map_key_clear(BTN_C);
|
||||
break;
|
||||
case 0x04:
|
||||
samsung_kbd_mouse_map_key_clear(BTN_X);
|
||||
break;
|
||||
case 0x05:
|
||||
samsung_kbd_mouse_map_key_clear(BTN_Y);
|
||||
break;
|
||||
case 0x06:
|
||||
samsung_kbd_mouse_map_key_clear(BTN_Z);
|
||||
break;
|
||||
case 0x07:
|
||||
samsung_kbd_mouse_map_key_clear(BTN_TL);
|
||||
break;
|
||||
case 0x08:
|
||||
samsung_kbd_mouse_map_key_clear(BTN_TR);
|
||||
break;
|
||||
case 0x09:
|
||||
samsung_kbd_mouse_map_key_clear(BTN_TL2);
|
||||
break;
|
||||
case 0x0a:
|
||||
samsung_kbd_mouse_map_key_clear(BTN_TR2);
|
||||
break;
|
||||
case 0x0b:
|
||||
samsung_kbd_mouse_map_key_clear(BTN_SELECT);
|
||||
break;
|
||||
case 0x0c:
|
||||
samsung_kbd_mouse_map_key_clear(BTN_START);
|
||||
break;
|
||||
case 0x0d:
|
||||
samsung_kbd_mouse_map_key_clear(BTN_MODE);
|
||||
break;
|
||||
case 0x0e:
|
||||
samsung_kbd_mouse_map_key_clear(BTN_THUMBL);
|
||||
break;
|
||||
case 0x0f:
|
||||
samsung_kbd_mouse_map_key_clear(BTN_THUMBR);
|
||||
break;
|
||||
case 0x10:
|
||||
samsung_kbd_mouse_map_key_clear(BTN_GAME);
|
||||
break;
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
if (HID_UP_CONSUMER == (usage->hid & HID_USAGE_PAGE)) {
|
||||
switch (usage->hid & HID_USAGE) {
|
||||
case 0x040:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_MENU);
|
||||
break;
|
||||
case 0x223:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_HOMEPAGE);
|
||||
break;
|
||||
case 0x224:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_BACK);
|
||||
break;
|
||||
|
||||
/* Screen Capture */
|
||||
case 0x303:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_SYSRQ);
|
||||
break;
|
||||
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int samsung_actionmouse_input_mapping(struct hid_device *hdev,
|
||||
struct hid_input *hi, struct hid_field *field, struct hid_usage *usage,
|
||||
unsigned long **bit, int *max)
|
||||
{
|
||||
|
||||
dbg_hid("samsung wireless actionmouse input mapping event [0x%x], [0x%x], %ld, %ld, [0x%x]\n",
|
||||
usage->hid, usage->hid & HID_USAGE, hi->input->evbit[0], hi->input->absbit[0],
|
||||
usage->hid & HID_USAGE_PAGE);
|
||||
|
||||
if (((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER) && ((usage->hid & HID_USAGE_PAGE) != HID_UP_BUTTON))
|
||||
return 0;
|
||||
|
||||
switch (usage->hid & HID_USAGE) {
|
||||
case 0x301:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_RECENT);
|
||||
break;
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int samsung_universal_kbd_input_mapping(struct hid_device *hdev,
|
||||
struct hid_input *hi, struct hid_field *field, struct hid_usage *usage,
|
||||
unsigned long **bit, int *max)
|
||||
{
|
||||
if (!(HID_UP_CONSUMER == (usage->hid & HID_USAGE_PAGE) ||
|
||||
HID_UP_KEYBOARD == (usage->hid & HID_USAGE_PAGE)))
|
||||
return 0;
|
||||
|
||||
dbg_hid("samsung wireless keyboard input mapping event [0x%x]\n",
|
||||
usage->hid & HID_USAGE);
|
||||
|
||||
if (HID_UP_KEYBOARD == (usage->hid & HID_USAGE_PAGE)) {
|
||||
switch (usage->hid & HID_USAGE) {
|
||||
set_bit(EV_REP, hi->input->evbit);
|
||||
/* Only for UK keyboard */
|
||||
/* key found */
|
||||
#ifdef CONFIG_HID_KK_UPGRADE
|
||||
case 0x32:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_KBDILLUMTOGGLE);
|
||||
break;
|
||||
case 0x64:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_BACKSLASH);
|
||||
break;
|
||||
#else
|
||||
case 0x32:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_BACKSLASH);
|
||||
break;
|
||||
case 0x64:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_102ND);
|
||||
break;
|
||||
#endif
|
||||
/* Only for BR keyboard */
|
||||
case 0x87:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_RO);
|
||||
break;
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
if (HID_UP_CONSUMER == (usage->hid & HID_USAGE_PAGE)) {
|
||||
switch (usage->hid & HID_USAGE) {
|
||||
/* report 2 */
|
||||
/* MENU */
|
||||
case 0x040:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_MENU);
|
||||
break;
|
||||
case 0x18a:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_MAIL);
|
||||
break;
|
||||
case 0x196:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_WWW);
|
||||
break;
|
||||
case 0x19e:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_SCREENLOCK);
|
||||
break;
|
||||
case 0x221:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_SEARCH);
|
||||
break;
|
||||
case 0x223:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_HOMEPAGE);
|
||||
break;
|
||||
/* RECENTAPPS */
|
||||
case 0x301:
|
||||
samsung_kbd_mouse_map_key_clear(BTN_TRIGGER_HAPPY1);
|
||||
break;
|
||||
/* APPLICATION */
|
||||
case 0x302:
|
||||
samsung_kbd_mouse_map_key_clear(BTN_TRIGGER_HAPPY2);
|
||||
break;
|
||||
/* Voice search */
|
||||
case 0x305:
|
||||
samsung_kbd_mouse_map_key_clear(BTN_TRIGGER_HAPPY4);
|
||||
break;
|
||||
/* QPANEL on/off */
|
||||
case 0x306:
|
||||
samsung_kbd_mouse_map_key_clear(BTN_TRIGGER_HAPPY5);
|
||||
break;
|
||||
/* SIP on/off */
|
||||
case 0x307:
|
||||
samsung_kbd_mouse_map_key_clear(BTN_TRIGGER_HAPPY3);
|
||||
break;
|
||||
/* LANG */
|
||||
case 0x308:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_LANGUAGE);
|
||||
break;
|
||||
case 0x30a:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_BRIGHTNESSDOWN);
|
||||
break;
|
||||
case 0x070:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_BRIGHTNESSDOWN);
|
||||
break;
|
||||
case 0x30b:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_BRIGHTNESSUP);
|
||||
break;
|
||||
case 0x06f:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_BRIGHTNESSUP);
|
||||
break;
|
||||
/* S-Finder */
|
||||
case 0x304:
|
||||
samsung_kbd_mouse_map_key_clear(BTN_TRIGGER_HAPPY7);
|
||||
break;
|
||||
/* Screen Capture */
|
||||
case 0x303:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_SYSRQ);
|
||||
break;
|
||||
/* Multi Window */
|
||||
case 0x309:
|
||||
samsung_kbd_mouse_map_key_clear(BTN_TRIGGER_HAPPY9);
|
||||
break;
|
||||
/* HotKey App 1 */
|
||||
case 0x071:
|
||||
samsung_kbd_mouse_map_key_clear(BTN_HOTKEY_APP1);
|
||||
break;
|
||||
/* HotKey App 2 */
|
||||
case 0x072:
|
||||
samsung_kbd_mouse_map_key_clear(BTN_HOTKEY_APP2);
|
||||
break;
|
||||
/* HotKey App 3 */
|
||||
case 0x073:
|
||||
samsung_kbd_mouse_map_key_clear(BTN_HOTKEY_APP3);
|
||||
break;
|
||||
/* Dex */
|
||||
case 0x06e:
|
||||
samsung_kbd_mouse_map_key_clear(KEY_DEX_ON);
|
||||
break;
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
static __u8 *samsung_report_fixup(struct hid_device *hdev, __u8 *rdesc,
|
||||
unsigned int *rsize)
|
||||
{
|
||||
@@ -494,21 +142,6 @@ static int samsung_input_mapping(struct hid_device *hdev, struct hid_input *hi,
|
||||
if (USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE == hdev->product)
|
||||
ret = samsung_kbd_mouse_input_mapping(hdev,
|
||||
hi, field, usage, bit, max);
|
||||
else if (hdev->product == USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD)
|
||||
ret = samsung_kbd_input_mapping(hdev,
|
||||
hi, field, usage, bit, max);
|
||||
else if (hdev->product == USB_DEVICE_ID_SAMSUNG_WIRELESS_GAMEPAD)
|
||||
ret = samsung_gamepad_input_mapping(hdev,
|
||||
hi, field, usage, bit, max);
|
||||
else if (hdev->product == USB_DEVICE_ID_SAMSUNG_WIRELESS_ACTIONMOUSE)
|
||||
ret = samsung_actionmouse_input_mapping(hdev,
|
||||
hi, field, usage, bit, max);
|
||||
else if (hdev->product == USB_DEVICE_ID_SAMSUNG_WIRELESS_UNIVERSAL_KBD)
|
||||
ret = samsung_universal_kbd_input_mapping(hdev,
|
||||
hi, field, usage, bit, max);
|
||||
else if (hdev->product == USB_DEVICE_ID_SAMSUNG_WIRELESS_MULTI_HOGP_KBD)
|
||||
ret = samsung_universal_kbd_input_mapping(hdev,
|
||||
hi, field, usage, bit, max);
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -519,6 +152,9 @@ static int samsung_probe(struct hid_device *hdev,
|
||||
int ret;
|
||||
unsigned int cmask = HID_CONNECT_DEFAULT;
|
||||
|
||||
if (!hid_is_usb(hdev))
|
||||
return -EINVAL;
|
||||
|
||||
ret = hid_parse(hdev);
|
||||
if (ret) {
|
||||
hid_err(hdev, "parse failed\n");
|
||||
@@ -547,11 +183,6 @@ err_free:
|
||||
static const struct hid_device_id samsung_devices[] = {
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) },
|
||||
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SAMSUNG_ELECTRONICS, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD) },
|
||||
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SAMSUNG_ELECTRONICS, USB_DEVICE_ID_SAMSUNG_WIRELESS_GAMEPAD) },
|
||||
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SAMSUNG_ELECTRONICS, USB_DEVICE_ID_SAMSUNG_WIRELESS_ACTIONMOUSE) },
|
||||
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SAMSUNG_ELECTRONICS, USB_DEVICE_ID_SAMSUNG_WIRELESS_UNIVERSAL_KBD) },
|
||||
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SAMSUNG_ELECTRONICS, USB_DEVICE_ID_SAMSUNG_WIRELESS_MULTI_HOGP_KBD) },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(hid, samsung_devices);
|
||||
|
@@ -9,6 +9,7 @@
|
||||
|
||||
#include <linux/atomic.h>
|
||||
#include <linux/compat.h>
|
||||
#include <linux/cred.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/fs.h>
|
||||
#include <linux/hid.h>
|
||||
@@ -741,6 +742,17 @@ static ssize_t uhid_char_write(struct file *file, const char __user *buffer,
|
||||
|
||||
switch (uhid->input_buf.type) {
|
||||
case UHID_CREATE:
|
||||
/*
|
||||
* 'struct uhid_create_req' contains a __user pointer which is
|
||||
* copied from, so it's unsafe to allow this with elevated
|
||||
* privileges (e.g. from a setuid binary) or via kernel_write().
|
||||
*/
|
||||
if (file->f_cred != current_cred()) {
|
||||
pr_err_once("UHID_CREATE from different security context by process %d (%s), this is not allowed.\n",
|
||||
task_tgid_vnr(current), current->comm);
|
||||
ret = -EACCES;
|
||||
goto unlock;
|
||||
}
|
||||
ret = uhid_dev_create(uhid, &uhid->input_buf);
|
||||
break;
|
||||
case UHID_CREATE2:
|
||||
|
Reference in New Issue
Block a user