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

Commit f9ce7c28 authored by Bastien Nocera's avatar Bastien Nocera Committed by Jiri Kosina
Browse files

HID: Enable Sixaxis controller over Bluetooth 



Now that hid_output_raw_report works, port the PS3 Sixaxis
Bluetooth quirk from user-space, into kernel-space.

Signed-off-by: default avatarBastien Nocera <hadess@hadess.net>
Acked-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 46a709b9

drivers/hid/hid-core.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1340,6 +1340,7 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) },

drivers/hid/hid-sony.c

+19 −2
Original line number Original line Diff line number Diff line
@@ -48,7 +48,7 @@ static void sony_report_fixup(struct hid_device *hdev, __u8 *rdesc, 
 * to "operational".  Without this, the ps3 controller will not report any

 * to "operational".  Without this, the ps3 controller will not report any

 * events.

 * events.

 */

 */

static int sony_set_operational(struct hid_device *hdev)

static int sony_set_operational_usb(struct hid_device *hdev)

{

{

	struct usb_interface *intf = to_usb_interface(hdev->dev.parent);

	struct usb_interface *intf = to_usb_interface(hdev->dev.parent);

	struct usb_device *dev = interface_to_usbdev(intf);

	struct usb_device *dev = interface_to_usbdev(intf);
@@ -73,6 +73,12 @@ static int sony_set_operational(struct hid_device *hdev) 
	return ret;

	return ret;

}

}





static int sony_set_operational_bt(struct hid_device *hdev)

{

	unsigned char buf[] = { 0x53, 0xf4,  0x42, 0x03, 0x00, 0x00 };

	return hdev->hid_output_raw_report(hdev, buf, sizeof(buf), HID_FEATURE_REPORT);

}



static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)

static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)

{

{

	int ret;

	int ret;
@@ -101,7 +107,17 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id) 
		goto err_free;

		goto err_free;

	}

	}





	ret = sony_set_operational(hdev);

	switch (hdev->bus) {

	case BUS_USB:

		ret = sony_set_operational_usb(hdev);

		break;

	case BUS_BLUETOOTH:

		ret = sony_set_operational_bt(hdev);

		break;

	default:

		ret = 0;

	}



	if (ret < 0)

	if (ret < 0)

		goto err_stop;

		goto err_stop;
@@ -121,6 +137,7 @@ static void sony_remove(struct hid_device *hdev) 




static const struct hid_device_id sony_devices[] = {

static const struct hid_device_id sony_devices[] = {

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE),

	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE),

		.driver_data = VAIO_RDESC_CONSTANT },

		.driver_data = VAIO_RDESC_CONSTANT },

	{ }

	{ }