Commit f1d1b3a9 authored by José Expósito's avatar José Expósito Committed by Jiri Kosina
Browse files

HID: apple: Refactor key translation setup 



The code used to map the apple_key_translation structs is duplicated.
Extract it to a common function.

Refactor, no functional changes.

Signed-off-by: default avatarJosé Expósito <jose.exposito89@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent a254a9da

drivers/hid/hid-apple.c

+17 −21
Original line number Diff line number Diff line
@@ -202,6 +202,15 @@ static const struct apple_key_translation swapped_fn_leftctrl_keys[] = { 
	{ }

};



static inline void apple_setup_key_translation(struct input_dev *input,

		const struct apple_key_translation *table)

{

	const struct apple_key_translation *trans;



	for (trans = table; trans->from; trans++)

		set_bit(trans->to, input->keybit);

}



static const struct apple_key_translation *apple_find_translation(

		const struct apple_key_translation *table, u16 from)

{
@@ -452,30 +461,17 @@ static __u8 *apple_report_fixup(struct hid_device *hdev, __u8 *rdesc, 


static void apple_setup_input(struct input_dev *input)

{

	const struct apple_key_translation *trans;



	set_bit(KEY_NUMLOCK, input->keybit);



	/* Enable all needed keys */

	for (trans = apple_fn_keys; trans->from; trans++)

		set_bit(trans->to, input->keybit);



	for (trans = powerbook_fn_keys; trans->from; trans++)

		set_bit(trans->to, input->keybit);



	for (trans = powerbook_numlock_keys; trans->from; trans++)

		set_bit(trans->to, input->keybit);



	for (trans = apple_iso_keyboard; trans->from; trans++)

		set_bit(trans->to, input->keybit);



	for (trans = apple2021_fn_keys; trans->from; trans++)

		set_bit(trans->to, input->keybit);



	if (swap_fn_leftctrl) {

		for (trans = swapped_fn_leftctrl_keys; trans->from; trans++)

			set_bit(trans->to, input->keybit);

	}

	apple_setup_key_translation(input, apple_fn_keys);

	apple_setup_key_translation(input, powerbook_fn_keys);

	apple_setup_key_translation(input, powerbook_numlock_keys);

	apple_setup_key_translation(input, apple_iso_keyboard);

	apple_setup_key_translation(input, apple2021_fn_keys);



	if (swap_fn_leftctrl)

		apple_setup_key_translation(input, swapped_fn_leftctrl_keys);

}



static int apple_input_mapping(struct hid_device *hdev, struct hid_input *hi,