HID: add new multitouch and digitizer contants (89f536cc) · Commits · 戴 / test

drivers/hid/hid-debug.c

+21 −2

Original line number	Original line	Diff line number	Diff line
	@@ -137,6 +137,14 @@ static const struct hid_usage_entry hid_usage_table[] = {
	{0, 0x44, "BarrelSwitch"},		{0, 0x44, "BarrelSwitch"},
	{0, 0x45, "Eraser"},		{0, 0x45, "Eraser"},
	{0, 0x46, "TabletPick"},		{0, 0x46, "TabletPick"},
			{0, 0x47, "Confidence"},
			{0, 0x48, "Width"},
			{0, 0x49, "Height"},
			{0, 0x51, "ContactID"},
			{0, 0x52, "InputMode"},
			{0, 0x53, "DeviceIndex"},
			{0, 0x54, "ContactCount"},
			{0, 0x55, "ContactMaximumNumber"},
	{ 15, 0, "PhysicalInterfaceDevice" },		{ 15, 0, "PhysicalInterfaceDevice" },
	{0, 0x00, "Undefined"},		{0, 0x00, "Undefined"},
	{0, 0x01, "Physical_Interface_Device"},		{0, 0x01, "Physical_Interface_Device"},
	@@ -514,9 +522,11 @@ static const char *events[EV_MAX + 1] = {
	[EV_FF_STATUS] = "ForceFeedbackStatus",		[EV_FF_STATUS] = "ForceFeedbackStatus",
	};		};

	static const char *syncs[2] = {		static const char *syncs[3] = {
	[SYN_REPORT] = "Report", [SYN_CONFIG] = "Config",		[SYN_REPORT] = "Report", [SYN_CONFIG] = "Config",
			[SYN_MT_REPORT] = "MT Report",
	};		};

	static const char *keys[KEY_MAX + 1] = {		static const char *keys[KEY_MAX + 1] = {
	[KEY_RESERVED] = "Reserved", [KEY_ESC] = "Esc",		[KEY_RESERVED] = "Reserved", [KEY_ESC] = "Esc",
	[KEY_1] = "1", [KEY_2] = "2",		[KEY_1] = "1", [KEY_2] = "2",
	@@ -736,6 +746,15 @@ static const char *absolutes[ABS_MAX + 1] = {
	[ABS_DISTANCE] = "Distance", [ABS_TILT_X] = "XTilt",		[ABS_DISTANCE] = "Distance", [ABS_TILT_X] = "XTilt",
	[ABS_TILT_Y] = "YTilt", [ABS_TOOL_WIDTH] = "ToolWidth",		[ABS_TILT_Y] = "YTilt", [ABS_TOOL_WIDTH] = "ToolWidth",
	[ABS_VOLUME] = "Volume", [ABS_MISC] = "Misc",		[ABS_VOLUME] = "Volume", [ABS_MISC] = "Misc",
			[ABS_MT_TOUCH_MAJOR] = "MTMajor",
			[ABS_MT_TOUCH_MINOR] = "MTMinor",
			[ABS_MT_WIDTH_MAJOR] = "MTMajorW",
			[ABS_MT_WIDTH_MINOR] = "MTMinorW",
			[ABS_MT_ORIENTATION] = "MTOrientation",
			[ABS_MT_POSITION_X] = "MTPositionX",
			[ABS_MT_POSITION_Y] = "MTPositionY",
			[ABS_MT_TOOL_TYPE] = "MTToolType",
			[ABS_MT_BLOB_ID] = "MTBlobID",
	};		};

	static const char *misc[MSC_MAX + 1] = {		static const char *misc[MSC_MAX + 1] = {

include/linux/hid.h

+36 −0

Original line number	Original line	Diff line number	Diff line
	@@ -238,6 +238,42 @@ struct hid_item {
	#define HID_GD_RIGHT 0x00010092		#define HID_GD_RIGHT 0x00010092
	#define HID_GD_LEFT 0x00010093		#define HID_GD_LEFT 0x00010093

			#define HID_DG_DIGITIZER 0x000d0001
			#define HID_DG_PEN 0x000d0002
			#define HID_DG_LIGHTPEN 0x000d0003
			#define HID_DG_TOUCHSCREEN 0x000d0004
			#define HID_DG_TOUCHPAD 0x000d0005
			#define HID_DG_STYLUS 0x000d0020
			#define HID_DG_PUCK 0x000d0021
			#define HID_DG_FINGER 0x000d0022
			#define HID_DG_TIPPRESSURE 0x000d0030
			#define HID_DG_BARRELPRESSURE 0x000d0031
			#define HID_DG_INRANGE 0x000d0032
			#define HID_DG_TOUCH 0x000d0033
			#define HID_DG_UNTOUCH 0x000d0034
			#define HID_DG_TAP 0x000d0035
			#define HID_DG_TABLETFUNCTIONKEY 0x000d0039
			#define HID_DG_PROGRAMCHANGEKEY 0x000d003a
			#define HID_DG_INVERT 0x000d003c
			#define HID_DG_TIPSWITCH 0x000d0042
			#define HID_DG_TIPSWITCH2 0x000d0043
			#define HID_DG_BARRELSWITCH 0x000d0044
			#define HID_DG_ERASER 0x000d0045
			#define HID_DG_TABLETPICK 0x000d0046
			/*
			* as of May 20, 2009 the usages below are not yet in the official USB spec
			* but are being pushed by Microsft as described in their paper "Digitizer
			* Drivers for Windows Touch and Pen-Based Computers"
			*/
			#define HID_DG_CONFIDENCE 0x000d0047
			#define HID_DG_WIDTH 0x000d0048
			#define HID_DG_HEIGHT 0x000d0049
			#define HID_DG_CONTACTID 0x000d0051
			#define HID_DG_INPUTMODE 0x000d0052
			#define HID_DG_DEVICEINDEX 0x000d0053
			#define HID_DG_CONTACTCOUNT 0x000d0054
			#define HID_DG_CONTACTMAX 0x000d0055

	/*		/*
	* HID report types --- Ouch! HID spec says 1 2 3!		* HID report types --- Ouch! HID spec says 1 2 3!
	*/		*/

Admin message