Commit c600a559 authored by Tatsuya S's avatar Tatsuya S Committed by Jiri Kosina
Browse files

HID: core: Add reserved item tag for main items 



For main items, separate warning of reserved item tag from
warning of unknown item tag.
This comes from 6.2.2.4 Main Items of Device Class Definition
for HID 1.11 specification.

Signed-off-by: default avatarTatsuya S <tatsuya.s2862@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.com>
parent 27c02784

drivers/hid/hid-core.c

+5 −1
Original line number Diff line number Diff line
@@ -657,6 +657,10 @@ static int hid_parser_main(struct hid_parser *parser, struct hid_item *item) 
		ret = hid_add_field(parser, HID_FEATURE_REPORT, data);

		break;

	default:

		if (item->tag >= HID_MAIN_ITEM_TAG_RESERVED_MIN &&

			item->tag <= HID_MAIN_ITEM_TAG_RESERVED_MAX)

			hid_warn(parser->device, "reserved main item tag 0x%x\n", item->tag);

		else

			hid_warn(parser->device, "unknown main item tag 0x%x\n", item->tag);

		ret = 0;

	}

include/linux/hid.h

+2 −0
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ struct hid_item { 
#define HID_MAIN_ITEM_TAG_FEATURE		11

#define HID_MAIN_ITEM_TAG_BEGIN_COLLECTION	10

#define HID_MAIN_ITEM_TAG_END_COLLECTION	12

#define HID_MAIN_ITEM_TAG_RESERVED_MIN		13

#define HID_MAIN_ITEM_TAG_RESERVED_MAX		15



/*

 * HID report descriptor main item contents