Skip to contentSkip to conversation

Input: xpad - fix rumble on Xbox One controllers with 2015 firmware

PATCH In review Cameron Gutman 2 participants 5 messages May 31, 2016 – Jun 1, 2016

Subsystems (2)
HID Input drivers
lore
Share & tools
lore

Cameron Gutman

author
#0 lore raw

PATCH 1/1 Input: xpad - fix rumble on Xbox One controllers with 2015 firmware

Xbox One controllers that shipped with or were upgraded to the 2015 firmware discard the current rumble packets we send. This patch changes the Xbox One rumble packet to a form that the newer firmware will accept.

It is based on changes made to support newer Xbox One controllers in the SteamOS brewmaster-4.1 kernel branch.

Signed-off-by Cameron Gutman <[email protected]>
---
 drivers/input/joystick/xpad.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/input/joystick/xpad.c +8 -8
index 804dbcc..923c572 100644
@@ -1031,17 +1031,17 @@ static int xpad_play_effect(struct input_dev *dev, void *data, struct ff_effect
 
 	case XTYPE_XBOXONE:
 		packet->data[0] = 0x09; /* activate rumble */
-		packet->data[1] = 0x08;
+		packet->data[1] = 0x00;
 		packet->data[2] = xpad->odata_serial++;
-		packet->data[3] = 0x08; /* continuous effect */
-		packet->data[4] = 0x00; /* simple rumble mode */
-		packet->data[5] = 0x03; /* L and R actuator only */
-		packet->data[6] = 0x00; /* TODO: LT actuator */
-		packet->data[7] = 0x00; /* TODO: RT actuator */
+		packet->data[3] = 0x09;
+		packet->data[4] = 0x00;
+		packet->data[5] = 0x0F;
+		packet->data[6] = 0x00;
+		packet->data[7] = 0x00;
 		packet->data[8] = strong / 512;	/* left actuator */
 		packet->data[9] = weak / 512;	/* right actuator */
-		packet->data[10] = 0x80;	/* length of pulse */
-		packet->data[11] = 0x00;	/* stop period of pulse */
+		packet->data[10] = 0xFF;
+		packet->data[11] = 0x00;
 		packet->data[12] = 0x00;
 		packet->len = 13;
 		packet->pending = true;
Signature · 1 line
2.7.4
maintainer
#1 lore raw

Hi Cameron,

Quoted 3 lines · Cameron Gutman

Xbox One controllers that shipped with or were upgraded to the 2015 firmware discard the current rumble packets we send. This patch changes the Xbox One rumble packet to a form that the newer firmware will accept.

But what do we do with the older devices?

Thanks.

Quoted 41 lines

It is based on changes made to support newer Xbox One controllers in the SteamOS brewmaster-4.1 kernel branch.

Signed-off-by Cameron Gutman <[email protected]>
---
 drivers/input/joystick/xpad.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/input/joystick/xpad.c +8 -8
index 804dbcc..923c572 100644
@@ -1031,17 +1031,17 @@ static int xpad_play_effect(struct input_dev *dev, void *data, struct ff_effect
 
 	case XTYPE_XBOXONE:
 		packet->data[0] = 0x09; /* activate rumble */
-		packet->data[1] = 0x08;
+		packet->data[1] = 0x00;
 		packet->data[2] = xpad->odata_serial++;
-		packet->data[3] = 0x08; /* continuous effect */
-		packet->data[4] = 0x00; /* simple rumble mode */
-		packet->data[5] = 0x03; /* L and R actuator only */
-		packet->data[6] = 0x00; /* TODO: LT actuator */
-		packet->data[7] = 0x00; /* TODO: RT actuator */
+		packet->data[3] = 0x09;
+		packet->data[4] = 0x00;
+		packet->data[5] = 0x0F;
+		packet->data[6] = 0x00;
+		packet->data[7] = 0x00;
 		packet->data[8] = strong / 512;	/* left actuator */
 		packet->data[9] = weak / 512;	/* right actuator */
-		packet->data[10] = 0x80;	/* length of pulse */
-		packet->data[11] = 0x00;	/* stop period of pulse */
+		packet->data[10] = 0xFF;
+		packet->data[11] = 0x00;
 		packet->data[12] = 0x00;
 		packet->len = 13;
 		packet->pending = true;
Signature · 1 line
2.7.4
Signature · 1 line
Dmitry
author
#2 lore raw

It looks like SteamOS has always used this rumble packet for Xbox One per [0]. Commit 0604949ce3b9a59c ("Input: xpad - add rumble support for Xbox One controller") implemented a different rumble packet than Valve did in their fork. Pierre-Loup A. Griffais pushed some of their changes upstream in commit 2a6d7527b35cf987 ("Input: xpad - update Xbox One Force Feedback Support") but seemed to have missed these differences in the packet format.

[0]: https://github.com/ValveSoftware/steamos_kernel/commit/f5f73eb889cac32cbabfc40362fe5635a2255836

Quoted 53 lines · Dmitry Torokhov

Hi Cameron,

Quoted 3 lines · Cameron Gutman

Xbox One controllers that shipped with or were upgraded to the 2015 firmware discard the current rumble packets we send. This patch changes the Xbox One rumble packet to a form that the newer firmware will accept.

But what do we do with the older devices?

Thanks.

Quoted 41 lines

It is based on changes made to support newer Xbox One controllers in the SteamOS brewmaster-4.1 kernel branch.

Signed-off-by Cameron Gutman <[email protected]>
---
 drivers/input/joystick/xpad.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/input/joystick/xpad.c +8 -8
index 804dbcc..923c572 100644
@@ -1031,17 +1031,17 @@ static int xpad_play_effect(struct input_dev *dev, void *data, struct ff_effect
 
 	case XTYPE_XBOXONE:
 		packet->data[0] = 0x09; /* activate rumble */
-		packet->data[1] = 0x08;
+		packet->data[1] = 0x00;
 		packet->data[2] = xpad->odata_serial++;
-		packet->data[3] = 0x08; /* continuous effect */
-		packet->data[4] = 0x00; /* simple rumble mode */
-		packet->data[5] = 0x03; /* L and R actuator only */
-		packet->data[6] = 0x00; /* TODO: LT actuator */
-		packet->data[7] = 0x00; /* TODO: RT actuator */
+		packet->data[3] = 0x09;
+		packet->data[4] = 0x00;
+		packet->data[5] = 0x0F;
+		packet->data[6] = 0x00;
+		packet->data[7] = 0x00;
 		packet->data[8] = strong / 512;	/* left actuator */
 		packet->data[9] = weak / 512;	/* right actuator */
-		packet->data[10] = 0x80;	/* length of pulse */
-		packet->data[11] = 0x00;	/* stop period of pulse */
+		packet->data[10] = 0xFF;
+		packet->data[11] = 0x00;
 		packet->data[12] = 0x00;
 		packet->len = 13;
 		packet->pending = true;
Signature · 1 line
2.7.4
author
#3 lore raw

Sorry, I realized I didn't directly answer the question you were asking.

To clarify my point,
Valve's rumble code was committed in 2014 for the original Xbox One controller (before the 2015 firmware existed). It continues to work with the latest firmware versions. It's our different implementation that isn't working with the newer firmware.

Thanks,
Cameron

Quoted 64 lines · Cameron Gutman

It looks like SteamOS has always used this rumble packet for Xbox One per [0]. Commit 0604949ce3b9a59c ("Input: xpad - add rumble support for Xbox One controller") implemented a different rumble packet than Valve did in their fork. Pierre-Loup A. Griffais pushed some of their changes upstream in commit 2a6d7527b35cf987 ("Input: xpad - update Xbox One Force Feedback Support") but seemed to have missed these differences in the packet format.

[0]: https://github.com/ValveSoftware/steamos_kernel/commit/f5f73eb889cac32cbabfc40362fe5635a2255836

Quoted 53 lines · Dmitry Torokhov

Hi Cameron,

Quoted 3 lines · Cameron Gutman

Xbox One controllers that shipped with or were upgraded to the 2015 firmware discard the current rumble packets we send. This patch changes the Xbox One rumble packet to a form that the newer firmware will accept.

But what do we do with the older devices?

Thanks.

Quoted 41 lines

It is based on changes made to support newer Xbox One controllers in the SteamOS brewmaster-4.1 kernel branch.

Signed-off-by Cameron Gutman <[email protected]>
---
 drivers/input/joystick/xpad.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/input/joystick/xpad.c +8 -8
index 804dbcc..923c572 100644
@@ -1031,17 +1031,17 @@ static int xpad_play_effect(struct input_dev *dev, void *data, struct ff_effect
 
 	case XTYPE_XBOXONE:
 		packet->data[0] = 0x09; /* activate rumble */
-		packet->data[1] = 0x08;
+		packet->data[1] = 0x00;
 		packet->data[2] = xpad->odata_serial++;
-		packet->data[3] = 0x08; /* continuous effect */
-		packet->data[4] = 0x00; /* simple rumble mode */
-		packet->data[5] = 0x03; /* L and R actuator only */
-		packet->data[6] = 0x00; /* TODO: LT actuator */
-		packet->data[7] = 0x00; /* TODO: RT actuator */
+		packet->data[3] = 0x09;
+		packet->data[4] = 0x00;
+		packet->data[5] = 0x0F;
+		packet->data[6] = 0x00;
+		packet->data[7] = 0x00;
 		packet->data[8] = strong / 512;	/* left actuator */
 		packet->data[9] = weak / 512;	/* right actuator */
-		packet->data[10] = 0x80;	/* length of pulse */
-		packet->data[11] = 0x00;	/* stop period of pulse */
+		packet->data[10] = 0xFF;
+		packet->data[11] = 0x00;
 		packet->data[12] = 0x00;
 		packet->len = 13;
 		packet->pending = true;
Signature · 1 line
2.7.4
maintainer
#4 lore raw
Quoted 7 lines · Cameron Gutman

Sorry, I realized I didn't directly answer the question you were asking.

To clarify my point,
Valve's rumble code was committed in 2014 for the original Xbox One controller (before the 2015 firmware existed). It continues to work with the latest firmware versions. It's our different implementation that isn't working with the newer firmware.

I see. I will tweak the commit message then.

Thanks!

Quoted 70 lines

Thanks,
Cameron

Quoted 64 lines · Cameron Gutman

It looks like SteamOS has always used this rumble packet for Xbox One per [0]. Commit 0604949ce3b9a59c ("Input: xpad - add rumble support for Xbox One controller") implemented a different rumble packet than Valve did in their fork. Pierre-Loup A. Griffais pushed some of their changes upstream in commit 2a6d7527b35cf987 ("Input: xpad - update Xbox One Force Feedback Support") but seemed to have missed these differences in the packet format.

[0]: https://github.com/ValveSoftware/steamos_kernel/commit/f5f73eb889cac32cbabfc40362fe5635a2255836

Quoted 53 lines · Dmitry Torokhov

Hi Cameron,

Quoted 3 lines · Cameron Gutman

Xbox One controllers that shipped with or were upgraded to the 2015 firmware discard the current rumble packets we send. This patch changes the Xbox One rumble packet to a form that the newer firmware will accept.

But what do we do with the older devices?

Thanks.

Quoted 41 lines

It is based on changes made to support newer Xbox One controllers in the SteamOS brewmaster-4.1 kernel branch.

Signed-off-by Cameron Gutman <[email protected]>
---
 drivers/input/joystick/xpad.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/input/joystick/xpad.c +8 -8
index 804dbcc..923c572 100644
@@ -1031,17 +1031,17 @@ static int xpad_play_effect(struct input_dev *dev, void *data, struct ff_effect
 
 	case XTYPE_XBOXONE:
 		packet->data[0] = 0x09; /* activate rumble */
-		packet->data[1] = 0x08;
+		packet->data[1] = 0x00;
 		packet->data[2] = xpad->odata_serial++;
-		packet->data[3] = 0x08; /* continuous effect */
-		packet->data[4] = 0x00; /* simple rumble mode */
-		packet->data[5] = 0x03; /* L and R actuator only */
-		packet->data[6] = 0x00; /* TODO: LT actuator */
-		packet->data[7] = 0x00; /* TODO: RT actuator */
+		packet->data[3] = 0x09;
+		packet->data[4] = 0x00;
+		packet->data[5] = 0x0F;
+		packet->data[6] = 0x00;
+		packet->data[7] = 0x00;
 		packet->data[8] = strong / 512;	/* left actuator */
 		packet->data[9] = weak / 512;	/* right actuator */
-		packet->data[10] = 0x80;	/* length of pulse */
-		packet->data[11] = 0x00;	/* stop period of pulse */
+		packet->data[10] = 0xFF;
+		packet->data[11] = 0x00;
 		packet->data[12] = 0x00;
 		packet->len = 13;
 		packet->pending = true;
Signature · 1 line
2.7.4
Signature · 1 line
Dmitry