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

Commit a4ff3e32 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ultrasound: Add a new input device configuration"

parents 104cba26 baa43153

arch/arm/mach-msm/include/mach/qdsp6v2/usf.h

+5 −2
Original line number Diff line number Diff line
@@ -73,7 +73,8 @@ enum us_detect_mode_enum { 
#define USF_TSC_PTR_EVENT_IND  1

#define USF_MOUSE_EVENT_IND    2

#define USF_KEYBOARD_EVENT_IND 3

#define USF_MAX_EVENT_IND      4

#define USF_TSC_EXT_EVENT_IND  4

#define USF_MAX_EVENT_IND      5



/* Types of events, produced by the calculators */

#define USF_NO_EVENT 0
@@ -81,10 +82,12 @@ enum us_detect_mode_enum { 
#define USF_TSC_PTR_EVENT  (1 << USF_TSC_PTR_EVENT_IND)

#define USF_MOUSE_EVENT    (1 << USF_MOUSE_EVENT_IND)

#define USF_KEYBOARD_EVENT (1 << USF_KEYBOARD_EVENT_IND)

#define USF_TSC_EXT_EVENT  (1 << USF_TSC_EXT_EVENT_IND)

#define USF_ALL_EVENTS         (USF_TSC_EVENT |\

				USF_TSC_PTR_EVENT |\

				USF_MOUSE_EVENT |\

				USF_KEYBOARD_EVENT)

				USF_KEYBOARD_EVENT |\

				USF_TSC_EXT_EVENT)



/* min, max array dimension */

#define MIN_MAX_DIM 2

arch/arm/mach-msm/qdsp6v2/ultrasound/usf.c

+2 −0
Original line number Diff line number Diff line
@@ -342,6 +342,8 @@ static struct usf_input_dev_type s_usf_input_devs[] = { 
		prepare_mouse_input_device, notify_mouse_event},

	{USF_KEYBOARD_EVENT, "usf_kb",

		prepare_keyboard_input_device, notify_key_event},

	{USF_TSC_EXT_EVENT, "usf_tsc_ext",

		prepare_tsc_input_device, notify_tsc_event},

};



static void usf_rx_cb(uint32_t opcode, uint32_t token,