Skip to content

L
linux-davinci
Commit 022e8c4d authored by Jiri Slaby's avatar Jiri Slaby Committed by Jiri Kosina
Browse files
Options

HID: move usage input mapping to hid.h 

This mapping are currently used on 2 placces and will be needed by more
quirk drivers, so move them to hid.h to allow them to use it.
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 990436a7
Show whitespace changes
Inline Side-by-side
Showing with 103 additions and 46 deletions
drivers/hid/hid-input-quirks.c
View file @ 022e8c4d
...@@ -16,16 +16,14 @@ ...@@ -16,16 +16,14 @@
#include <linux/input.h> #include <linux/input.h>
#include <linux/hid.h> #include <linux/hid.h>
#define map_abs(c) do { usage->code = c; usage->type = EV_ABS; *bit = input->absbit; *max = ABS_MAX; } while (0) #define map_rel(c) hid_map_usage(hidinput, usage, bit, max, EV_REL, (c))
#define map_rel(c) do { usage->code = c; usage->type = EV_REL; *bit = input->relbit; *max = REL_MAX; } while (0) #define map_key(c) hid_map_usage(hidinput, usage, bit, max, EV_KEY, (c))
#define map_key(c) do { usage->code = c; usage->type = EV_KEY; *bit = input->keybit; *max = KEY_MAX; } while (0)
#define map_led(c) do { usage->code = c; usage->type = EV_LED; *bit = input->ledbit; *max = LED_MAX; } while (0)
#define map_abs_clear(c) do { map_abs(c); clear_bit(c, *bit); } while (0) #define map_key_clear(c) hid_map_usage_clear(hidinput, usage, bit, \
#define map_key_clear(c) do { map_key(c); clear_bit(c, *bit); } while (0) max, EV_KEY, (c))
static int quirk_belkin_wkbd(struct hid_usage *usage, struct input_dev *input, static int quirk_belkin_wkbd(struct hid_usage *usage,
unsigned long **bit, int *max) struct hid_input *hidinput, unsigned long **bit, int *max)
{ {
if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER) if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
return 0; return 0;
...@@ -40,8 +38,8 @@ static int quirk_belkin_wkbd(struct hid_usage *usage, struct input_dev *input, ...@@ -40,8 +38,8 @@ static int quirk_belkin_wkbd(struct hid_usage *usage, struct input_dev *input,
return 1; return 1;
} }
static int quirk_cherry_cymotion(struct hid_usage *usage, struct input_dev *input, static int quirk_cherry_cymotion(struct hid_usage *usage,
unsigned long **bit, int *max) struct hid_input *hidinput, unsigned long **bit, int *max)
{ {
if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER) if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
return 0; return 0;
...@@ -56,13 +54,13 @@ static int quirk_cherry_cymotion(struct hid_usage *usage, struct input_dev *inpu ...@@ -56,13 +54,13 @@ static int quirk_cherry_cymotion(struct hid_usage *usage, struct input_dev *inpu
return 1; return 1;
} }
static int quirk_logitech_ultrax_remote(struct hid_usage *usage, struct input_dev *input, static int quirk_logitech_ultrax_remote(struct hid_usage *usage,
unsigned long **bit, int *max) struct hid_input *hidinput, unsigned long **bit, int *max)
{ {
if ((usage->hid & HID_USAGE_PAGE) != HID_UP_LOGIVENDOR) if ((usage->hid & HID_USAGE_PAGE) != HID_UP_LOGIVENDOR)
return 0; return 0;
set_bit(EV_REP, input->evbit); set_bit(EV_REP, hidinput->input->evbit);
switch(usage->hid & HID_USAGE) { switch(usage->hid & HID_USAGE) {
/* Reported on Logitech Ultra X Media Remote */ /* Reported on Logitech Ultra X Media Remote */
case 0x004: map_key_clear(KEY_AGAIN); break; case 0x004: map_key_clear(KEY_AGAIN); break;
...@@ -89,13 +87,13 @@ static int quirk_logitech_ultrax_remote(struct hid_usage *usage, struct input_de ...@@ -89,13 +87,13 @@ static int quirk_logitech_ultrax_remote(struct hid_usage *usage, struct input_de
return 1; return 1;
} }
static int quirk_gyration_remote(struct hid_usage *usage, struct input_dev *input, static int quirk_gyration_remote(struct hid_usage *usage,
unsigned long **bit, int *max) struct hid_input *hidinput, unsigned long **bit, int *max)
{ {
if ((usage->hid & HID_USAGE_PAGE) != HID_UP_LOGIVENDOR) if ((usage->hid & HID_USAGE_PAGE) != HID_UP_LOGIVENDOR)
return 0; return 0;
set_bit(EV_REP, input->evbit); set_bit(EV_REP, hidinput->input->evbit);
switch(usage->hid & HID_USAGE) { switch(usage->hid & HID_USAGE) {
/* Reported on Gyration MCE Remote */ /* Reported on Gyration MCE Remote */
case 0x00d: map_key_clear(KEY_HOME); break; case 0x00d: map_key_clear(KEY_HOME); break;
...@@ -112,13 +110,13 @@ static int quirk_gyration_remote(struct hid_usage *usage, struct input_dev *inpu ...@@ -112,13 +110,13 @@ static int quirk_gyration_remote(struct hid_usage *usage, struct input_dev *inpu
return 1; return 1;
} }
static int quirk_chicony_tactical_pad(struct hid_usage *usage, struct input_dev *input, static int quirk_chicony_tactical_pad(struct hid_usage *usage,
unsigned long **bit, int *max) struct hid_input *hidinput, unsigned long **bit, int *max)
{ {
if ((usage->hid & HID_USAGE_PAGE) != HID_UP_MSVENDOR) if ((usage->hid & HID_USAGE_PAGE) != HID_UP_MSVENDOR)
return 0; return 0;
set_bit(EV_REP, input->evbit); set_bit(EV_REP, hidinput->input->evbit);
switch (usage->hid & HID_USAGE) { switch (usage->hid & HID_USAGE) {
case 0xff01: map_key_clear(BTN_1); break; case 0xff01: map_key_clear(BTN_1); break;
case 0xff02: map_key_clear(BTN_2); break; case 0xff02: map_key_clear(BTN_2); break;
...@@ -137,9 +135,11 @@ static int quirk_chicony_tactical_pad(struct hid_usage *usage, struct input_dev ...@@ -137,9 +135,11 @@ static int quirk_chicony_tactical_pad(struct hid_usage *usage, struct input_dev
return 1; return 1;
} }
static int quirk_microsoft_ergonomy_kb(struct hid_usage *usage, struct input_dev *input, static int quirk_microsoft_ergonomy_kb(struct hid_usage *usage,
unsigned long **bit, int *max) struct hid_input *hidinput, unsigned long **bit, int *max)
{ {
struct input_dev *input = hidinput->input;
if ((usage->hid & HID_USAGE_PAGE) != HID_UP_MSVENDOR) if ((usage->hid & HID_USAGE_PAGE) != HID_UP_MSVENDOR)
return 0; return 0;
...@@ -160,13 +160,13 @@ static int quirk_microsoft_ergonomy_kb(struct hid_usage *usage, struct input_dev ...@@ -160,13 +160,13 @@ static int quirk_microsoft_ergonomy_kb(struct hid_usage *usage, struct input_dev
return 1; return 1;
} }
static int quirk_microsoft_presenter_8k(struct hid_usage *usage, struct input_dev *input, static int quirk_microsoft_presenter_8k(struct hid_usage *usage,
unsigned long **bit, int *max) struct hid_input *hidinput, unsigned long **bit, int *max)
{ {
if ((usage->hid & HID_USAGE_PAGE) != HID_UP_MSVENDOR) if ((usage->hid & HID_USAGE_PAGE) != HID_UP_MSVENDOR)
return 0; return 0;
set_bit(EV_REP, input->evbit); set_bit(EV_REP, hidinput->input->evbit);
switch(usage->hid & HID_USAGE) { switch(usage->hid & HID_USAGE) {
case 0xfd08: map_key_clear(KEY_FORWARD); break; case 0xfd08: map_key_clear(KEY_FORWARD); break;
case 0xfd09: map_key_clear(KEY_BACK); break; case 0xfd09: map_key_clear(KEY_BACK); break;
...@@ -179,8 +179,8 @@ static int quirk_microsoft_presenter_8k(struct hid_usage *usage, struct input_de ...@@ -179,8 +179,8 @@ static int quirk_microsoft_presenter_8k(struct hid_usage *usage, struct input_de
return 1; return 1;
} }
static int quirk_petalynx_remote(struct hid_usage *usage, struct input_dev *input, static int quirk_petalynx_remote(struct hid_usage *usage,
unsigned long **bit, int *max) struct hid_input *hidinput, unsigned long **bit, int *max)
{ {
if (((usage->hid & HID_USAGE_PAGE) != HID_UP_LOGIVENDOR) && if (((usage->hid & HID_USAGE_PAGE) != HID_UP_LOGIVENDOR) &&
((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)) ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER))
...@@ -207,8 +207,8 @@ static int quirk_petalynx_remote(struct hid_usage *usage, struct input_dev *inpu ...@@ -207,8 +207,8 @@ static int quirk_petalynx_remote(struct hid_usage *usage, struct input_dev *inpu
return 1; return 1;
} }
static int quirk_logitech_wireless(struct hid_usage *usage, struct input_dev *input, static int quirk_logitech_wireless(struct hid_usage *usage,
unsigned long **bit, int *max) struct hid_input *hidinput, unsigned long **bit, int *max)
{ {
if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER) if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
return 0; return 0;
...@@ -259,8 +259,8 @@ static int quirk_logitech_wireless(struct hid_usage *usage, struct input_dev *in ...@@ -259,8 +259,8 @@ static int quirk_logitech_wireless(struct hid_usage *usage, struct input_dev *in
return 1; return 1;
} }
static int quirk_cherry_genius_29e(struct hid_usage *usage, struct input_dev *input, static int quirk_cherry_genius_29e(struct hid_usage *usage,
unsigned long **bit, int *max) struct hid_input *hidinput, unsigned long **bit, int *max)
{ {
if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER) if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
return 0; return 0;
...@@ -277,7 +277,7 @@ static int quirk_cherry_genius_29e(struct hid_usage *usage, struct input_dev *in ...@@ -277,7 +277,7 @@ static int quirk_cherry_genius_29e(struct hid_usage *usage, struct input_dev *in
return 1; return 1;
} }
static int quirk_btc_8193(struct hid_usage *usage, struct input_dev *input, static int quirk_btc_8193(struct hid_usage *usage, struct hid_input *hidinput,
unsigned long **bit, int *max) unsigned long **bit, int *max)
{ {
if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER) if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
...@@ -299,8 +299,8 @@ static int quirk_btc_8193(struct hid_usage *usage, struct input_dev *input, ...@@ -299,8 +299,8 @@ static int quirk_btc_8193(struct hid_usage *usage, struct input_dev *input,
return 1; return 1;
} }
static int quirk_sunplus_wdesktop(struct hid_usage *usage, struct input_dev *input, static int quirk_sunplus_wdesktop(struct hid_usage *usage,
unsigned long **bit, int *max) struct hid_input *hidinput, unsigned long **bit, int *max)
{ {
if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER) if ((usage->hid & HID_USAGE_PAGE) != HID_UP_CONSUMER)
return 0; return 0;
...@@ -353,7 +353,8 @@ static int quirk_sunplus_wdesktop(struct hid_usage *usage, struct input_dev *inp ...@@ -353,7 +353,8 @@ static int quirk_sunplus_wdesktop(struct hid_usage *usage, struct input_dev *inp
static const struct hid_input_blacklist { static const struct hid_input_blacklist {
__u16 idVendor; __u16 idVendor;
__u16 idProduct; __u16 idProduct;
int (*quirk)(struct hid_usage *, struct input_dev *, unsigned long **, int *); int (*quirk)(struct hid_usage *, struct hid_input *, unsigned long **,
int *);
} hid_input_blacklist[] = { } hid_input_blacklist[] = {
{ VENDOR_ID_BELKIN, DEVICE_ID_BELKIN_WIRELESS_KEYBOARD, quirk_belkin_wkbd }, { VENDOR_ID_BELKIN, DEVICE_ID_BELKIN_WIRELESS_KEYBOARD, quirk_belkin_wkbd },
...@@ -385,16 +386,16 @@ static const struct hid_input_blacklist { ...@@ -385,16 +386,16 @@ static const struct hid_input_blacklist {
}; };
int hidinput_mapping_quirks(struct hid_usage *usage, int hidinput_mapping_quirks(struct hid_usage *usage,
struct input_dev *input, struct hid_input *hi, unsigned long **bit, int *max)
unsigned long **bit, int *max)
{ {
struct hid_device *device = input_get_drvdata(input); struct hid_device *device = input_get_drvdata(hi->input);
int i = 0; int i = 0;
while (hid_input_blacklist[i].quirk) { while (hid_input_blacklist[i].quirk) {
if (hid_input_blacklist[i].idVendor == device->vendor && if (hid_input_blacklist[i].idVendor == device->vendor &&
hid_input_blacklist[i].idProduct == device->product) hid_input_blacklist[i].idProduct == device->product)
return hid_input_blacklist[i].quirk(usage, input, bit, max); return hid_input_blacklist[i].quirk(usage, hi, bit,
max);
i++; i++;
} }
return 0; return 0;
......
drivers/hid/hid-input.c
View file @ 022e8c4d
...@@ -76,13 +76,15 @@ static const struct { ...@@ -76,13 +76,15 @@ static const struct {
__s32 y; __s32 y;
} hid_hat_to_axis[] = {{ 0, 0}, { 0,-1}, { 1,-1}, { 1, 0}, { 1, 1}, { 0, 1}, {-1, 1}, {-1, 0}, {-1,-1}}; } hid_hat_to_axis[] = {{ 0, 0}, { 0,-1}, { 1,-1}, { 1, 0}, { 1, 1}, { 0, 1}, {-1, 1}, {-1, 0}, {-1,-1}};
#define map_abs(c) do { usage->code = c; usage->type = EV_ABS; bit = input->absbit; max = ABS_MAX; } while (0) #define map_abs(c) hid_map_usage(hidinput, usage, &bit, &max, EV_ABS, (c))
#define map_rel(c) do { usage->code = c; usage->type = EV_REL; bit = input->relbit; max = REL_MAX; } while (0) #define map_rel(c) hid_map_usage(hidinput, usage, &bit, &max, EV_REL, (c))
#define map_key(c) do { usage->code = c; usage->type = EV_KEY; bit = input->keybit; max = KEY_MAX; } while (0) #define map_key(c) hid_map_usage(hidinput, usage, &bit, &max, EV_KEY, (c))
#define map_led(c) do { usage->code = c; usage->type = EV_LED; bit = input->ledbit; max = LED_MAX; } while (0) #define map_led(c) hid_map_usage(hidinput, usage, &bit, &max, EV_LED, (c))
#define map_abs_clear(c) do { map_abs(c); clear_bit(c, bit); } while (0) #define map_abs_clear(c) hid_map_usage_clear(hidinput, usage, &bit, \
#define map_key_clear(c) do { map_key(c); clear_bit(c, bit); } while (0) &max, EV_ABS, (c))
#define map_key_clear(c) hid_map_usage_clear(hidinput, usage, &bit, \
&max, EV_KEY, (c))
#ifdef CONFIG_USB_HIDINPUT_POWERBOOK #ifdef CONFIG_USB_HIDINPUT_POWERBOOK
...@@ -386,7 +388,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel ...@@ -386,7 +388,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
} }
/* handle input mappings for quirky devices */ /* handle input mappings for quirky devices */
ret = hidinput_mapping_quirks(usage, input, &bit, &max); ret = hidinput_mapping_quirks(usage, hidinput, &bit, &max);
if (ret) if (ret)
goto mapped; goto mapped;
......
include/linux/hid.h
View file @ 022e8c4d
...@@ -655,13 +655,67 @@ extern void hidinput_disconnect(struct hid_device *); ...@@ -655,13 +655,67 @@ extern void hidinput_disconnect(struct hid_device *);
int hid_set_field(struct hid_field *, unsigned, __s32); int hid_set_field(struct hid_field *, unsigned, __s32);
int hid_input_report(struct hid_device *, int type, u8 *, int, int); int hid_input_report(struct hid_device *, int type, u8 *, int, int);
int hidinput_find_field(struct hid_device *hid, unsigned int type, unsigned int code, struct hid_field **field); int hidinput_find_field(struct hid_device *hid, unsigned int type, unsigned int code, struct hid_field **field);
int hidinput_mapping_quirks(struct hid_usage *, struct input_dev *, unsigned long **, int *); int hidinput_mapping_quirks(struct hid_usage *, struct hid_input *,
unsigned long **, int *);
int hidinput_event_quirks(struct hid_device *, struct hid_field *, struct hid_usage *, __s32); int hidinput_event_quirks(struct hid_device *, struct hid_field *, struct hid_usage *, __s32);
int hidinput_apple_event(struct hid_device *, struct input_dev *, struct hid_usage *, __s32); int hidinput_apple_event(struct hid_device *, struct input_dev *, struct hid_usage *, __s32);
void hid_output_report(struct hid_report *report, __u8 *data); void hid_output_report(struct hid_report *report, __u8 *data);
struct hid_device *hid_allocate_device(void); struct hid_device *hid_allocate_device(void);
int hid_parse_report(struct hid_device *hid, __u8 *start, unsigned size); int hid_parse_report(struct hid_device *hid, __u8 *start, unsigned size);
/**
* hid_map_usage - map usage input bits
*
* @hidinput: hidinput which we are interested in
* @usage: usage to fill in
* @bit: pointer to input->{}bit (out parameter)
* @max: maximal valid usage->code to consider later (out parameter)
* @type: input event type (EV_KEY, EV_REL, ...)
* @c: code which corresponds to this usage and type
*/
static inline void hid_map_usage(struct hid_input *hidinput,
struct hid_usage *usage, unsigned long **bit, int *max,
__u8 type, __u16 c)
{
struct input_dev *input = hidinput->input;
usage->type = type;
usage->code = c;
switch (type) {
case EV_ABS:
*bit = input->absbit;
*max = ABS_MAX;
break;
case EV_REL:
*bit = input->relbit;
*max = REL_MAX;
break;
case EV_KEY:
*bit = input->keybit;
*max = KEY_MAX;
break;
case EV_LED:
*bit = input->ledbit;
*max = LED_MAX;
break;
}
}
/**
* hid_map_usage_clear - map usage input bits and clear the input bit
*
* The same as hid_map_usage, except the @c bit is also cleared in supported
* bits (@bit).
*/
static inline void hid_map_usage_clear(struct hid_input *hidinput,
struct hid_usage *usage, unsigned long **bit, int *max,
__u8 type, __u16 c)
{
hid_map_usage(hidinput, usage, bit, max, type, c);
clear_bit(c, *bit);
}
/** /**
* hid_parse - parse HW reports * hid_parse - parse HW reports
* *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment