Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4bc6926 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

HID: make translation table selection more clear 



Reshuffle the code a little bit so that the translation table selection
is more obvious and there is only one place performing the actual
translation using the selected table.

Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 99b9f758

drivers/hid/hid-apple.c

+10 −9
Original line number Original line Diff line number Diff line
@@ -167,7 +167,7 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, 
		struct hid_usage *usage, __s32 value)

		struct hid_usage *usage, __s32 value)

{

{

	struct apple_sc *asc = hid_get_drvdata(hid);

	struct apple_sc *asc = hid_get_drvdata(hid);

	const struct apple_key_translation *trans;

	const struct apple_key_translation *trans, *table;





	if (usage->code == KEY_FN) {

	if (usage->code == KEY_FN) {

		asc->fn_on = !!value;

		asc->fn_on = !!value;
@@ -179,13 +179,14 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input, 
		int do_translate;

		int do_translate;





		if (hid->product >= USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI &&

		if (hid->product >= USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI &&

				hid->product <= USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS) {

				hid->product <= USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS)

			trans = apple_find_translation(macbookair_fn_keys, usage->code);

			table = macbookair_fn_keys;

		} else if (hid->product < 0x21d || hid->product >= 0x300) {

		else if (hid->product < 0x21d || hid->product >= 0x300)

			trans = apple_find_translation(powerbook_fn_keys, usage->code);

			table = powerbook_fn_keys;

		} else {

		else

			trans = apple_find_translation(apple_fn_keys, usage->code);

			table = apple_fn_keys;

		}



		trans = apple_find_translation (table, usage->code);





		if (trans) {

		if (trans) {

			if (test_bit(usage->code, asc->pressed_fn))

			if (test_bit(usage->code, asc->pressed_fn))