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

Commit eddd1104 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "HID: core: add usage_page_preceding flag for hid_concatenate_usage_page()"

parents 2f4a80c7 1eb00321

drivers/hid/hid-core.c

+19 −2
Original line number Diff line number Diff line
@@ -205,6 +205,14 @@ static int hid_add_usage(struct hid_parser *parser, unsigned usage, u8 size) 
		hid_err(parser->device, "usage index exceeded\n");

		return -1;

	}

	if (!parser->local.usage_index && parser->global.usage_page)

		parser->local.usage_page_preceding = 1;

	if (parser->local.usage_page_preceding == 2)

		parser->local.usage_page_preceding = 3;

	if (size <= 2 && parser->global.usage_page)

		parser->local.usage[parser->local.usage_index] =

			(usage & 0xffff) + (parser->global.usage_page << 16);

	else

		parser->local.usage[parser->local.usage_index] = usage;

	parser->local.usage_size[parser->local.usage_index] = size;

	parser->local.collection_index[parser->local.usage_index] =
@@ -345,6 +353,8 @@ static int hid_parser_global(struct hid_parser *parser, struct hid_item *item) 


	case HID_GLOBAL_ITEM_TAG_USAGE_PAGE:

		parser->global.usage_page = item_udata(item);

		if (parser->local.usage_page_preceding == 1)

			parser->local.usage_page_preceding = 2;

		return 0;



	case HID_GLOBAL_ITEM_TAG_LOGICAL_MINIMUM:
@@ -526,9 +536,16 @@ static void hid_concatenate_usage_page(struct hid_parser *parser) 
{

	int i;



	if (parser->local.usage_page_preceding == 3) {

		dbg_hid("Using preceding usage page for final usage\n");

		return;

	}



	for (i = 0; i < parser->local.usage_index; i++)

		if (parser->local.usage_size[i] <= 2)

			parser->local.usage[i] += parser->global.usage_page << 16;

			parser->local.usage[i] =

				(parser->global.usage_page << 16)

				+ (parser->local.usage[i] & 0xffff);

}



/*

include/linux/hid.h

+1 −0
Original line number Diff line number Diff line
@@ -404,6 +404,7 @@ struct hid_local { 
	unsigned usage_minimum;

	unsigned delimiter_depth;

	unsigned delimiter_branch;

	unsigned int usage_page_preceding;

};



/*