Commit 7336b9f9 authored by David Herrmann's avatar David Herrmann Committed by Jiri Kosina
Browse files

HID: wiimote: Add missing extension DRM handlers 



If an extension is connected the wiimote may report data though DRMs that
contain extension data. This adds handlers for these DRMs but discards extension
data since we do not support it, yet.
It prints a warning to kernel log if an unhandled report is catched. Since we
handle all requests now, this should never happen, though.

Signed-off-by: default avatarDavid Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent eac39e7e

drivers/hid/hid-wiimote.c

+28 −1
Original line number Diff line number Diff line
@@ -75,10 +75,13 @@ enum wiiproto_reqs { 
	WIIPROTO_REQ_RETURN = 0x22,

	WIIPROTO_REQ_DRM_K = 0x30,

	WIIPROTO_REQ_DRM_KA = 0x31,

	WIIPROTO_REQ_DRM_KE = 0x32,

	WIIPROTO_REQ_DRM_KAI = 0x33,

	WIIPROTO_REQ_DRM_KEE = 0x34,

	WIIPROTO_REQ_DRM_KAE = 0x35,

	WIIPROTO_REQ_DRM_KIE = 0x36,

	WIIPROTO_REQ_DRM_KAIE = 0x37,

	WIIPROTO_REQ_DRM_E = 0x3d,

	WIIPROTO_REQ_DRM_SKAI1 = 0x3e,

	WIIPROTO_REQ_DRM_SKAI2 = 0x3f,

};
@@ -550,6 +553,11 @@ static void handler_drm_KA(struct wiimote_data *wdata, const __u8 *payload) 
	handler_accel(wdata, payload);

}



static void handler_drm_KE(struct wiimote_data *wdata, const __u8 *payload)

{

	handler_keys(wdata, payload);

}



static void handler_drm_KAI(struct wiimote_data *wdata, const __u8 *payload)

{

	handler_keys(wdata, payload);
@@ -561,6 +569,11 @@ static void handler_drm_KAI(struct wiimote_data *wdata, const __u8 *payload) 
	input_sync(wdata->ir);

}



static void handler_drm_KEE(struct wiimote_data *wdata, const __u8 *payload)

{

	handler_keys(wdata, payload);

}



static void handler_drm_KIE(struct wiimote_data *wdata, const __u8 *payload)

{

	handler_keys(wdata, payload);
@@ -588,6 +601,10 @@ static void handler_drm_KAIE(struct wiimote_data *wdata, const __u8 *payload) 
	input_sync(wdata->ir);

}



static void handler_drm_E(struct wiimote_data *wdata, const __u8 *payload)

{

}



static void handler_drm_SKAI1(struct wiimote_data *wdata, const __u8 *payload)

{

	handler_keys(wdata, payload);
@@ -633,10 +650,13 @@ static struct wiiproto_handler handlers[] = { 
	{ .id = WIIPROTO_REQ_RETURN, .size = 4, .func = handler_return },

	{ .id = WIIPROTO_REQ_DRM_K, .size = 2, .func = handler_keys },

	{ .id = WIIPROTO_REQ_DRM_KA, .size = 5, .func = handler_drm_KA },

	{ .id = WIIPROTO_REQ_DRM_KE, .size = 10, .func = handler_drm_KE },

	{ .id = WIIPROTO_REQ_DRM_KAI, .size = 17, .func = handler_drm_KAI },

	{ .id = WIIPROTO_REQ_DRM_KEE, .size = 21, .func = handler_drm_KEE },

	{ .id = WIIPROTO_REQ_DRM_KAE, .size = 21, .func = handler_drm_KAE },

	{ .id = WIIPROTO_REQ_DRM_KIE, .size = 21, .func = handler_drm_KIE },

	{ .id = WIIPROTO_REQ_DRM_KAIE, .size = 21, .func = handler_drm_KAIE },

	{ .id = WIIPROTO_REQ_DRM_E, .size = 21, .func = handler_drm_E },

	{ .id = WIIPROTO_REQ_DRM_SKAI1, .size = 21, .func = handler_drm_SKAI1 },

	{ .id = WIIPROTO_REQ_DRM_SKAI2, .size = 21, .func = handler_drm_SKAI2 },

	{ .id = 0 }
@@ -649,6 +669,7 @@ static int wiimote_hid_event(struct hid_device *hdev, struct hid_report *report, 
	struct wiiproto_handler *h;

	int i;

	unsigned long flags;

	bool handled = false;



	if (size < 1)

		return -EINVAL;
@@ -657,10 +678,16 @@ static int wiimote_hid_event(struct hid_device *hdev, struct hid_report *report, 


	for (i = 0; handlers[i].id; ++i) {

		h = &handlers[i];

		if (h->id == raw_data[0] && h->size < size)

		if (h->id == raw_data[0] && h->size < size) {

			h->func(wdata, &raw_data[1]);

			handled = true;

		}

	}



	if (!handled)

		hid_warn(hdev, "Unhandled report %hhu size %d\n", raw_data[0],

									size);



	spin_unlock_irqrestore(&wdata->state.lock, flags);



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE