The main input device registered by the wiimote driver gets classified
as a gamepad because it reports the presence of a BTN_A button. This
results in the detection of a joystick device with 7 buttons and no axes
(thus unusable) when a Wii Remote is connected.

By letting the Accelerometer input device also report buttons, we get it
to be recognized as a 7-buttons, 3-axes gamepad, that can be used on
games with no direct Wii Remote support through the joydev interface.

This approach is currently not perfect: button presses gets reported on
two devices (Remote and Accelerometer), and the main device is still
classified as a gamepad due to the mapping.

Signed-off-by: Giuseppe Bilotta <redacted>
---
 drivers/hid/hid-wiimote-core.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/hid/hid-wiimote-core.c b/drivers/hid/hid-wiimote-core.c
index ece9c28..2177dbe 100644
--- a/drivers/hid/hid-wiimote-core.c
+++ b/drivers/hid/hid-wiimote-core.c

@@ -741,6 +741,7 @@ static void handler_accel(struct wiimote_data *wdata, const __u8 *payload)
 	input_report_abs(wdata->accel, ABS_RX, x - 0x200);
 	input_report_abs(wdata->accel, ABS_RY, y - 0x200);
 	input_report_abs(wdata->accel, ABS_RZ, z - 0x200);
+	report_keys(wdata->accel, wiiproto_keymap, payload);
 	input_sync(wdata->accel);
 }
 

@@ -1096,6 +1097,11 @@ static struct wiimote_data *wiimote_create(struct hid_device *hdev)
 	input_set_abs_params(wdata->accel, ABS_RY, -500, 500, 2, 4);
 	input_set_abs_params(wdata->accel, ABS_RZ, -500, 500, 2, 4);
 
+	set_bit(EV_KEY, wdata->accel->evbit);
+	for (i = 0; i < WIIPROTO_KEY_COUNT; ++i)
+		set_bit(wiiproto_keymap[i], wdata->accel->keybit);
+
+
 	wdata->ir = input_allocate_device();
 	if (!wdata->ir)
 		goto err_ir;

-- 
1.7.10.rc3.204.g95589