forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

HID: sony: Correct Sixaxis battery reporting

Browse source 
The battery_charging and cable_state flags were backwards on the Sixaxis.
The low bit of report byte 30 is 0 when charging and 1 when not.
Bit 5 of byte 31 is 0 when a USB cable is connected and 1 when not.

Signed-off-by: Frank Praznik <frank.praznik@oh.rr.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Frank Praznik 2014-02-15 13:35:42 -05:00 • committed by Jiri Kosina
commit a43e94a38b
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/hid/hid-sony.c
View file

@ -845,12 +845,12 @@ static void sixaxis_parse_report(struct sony_sc *sc, __u8 *rd, int size)
*/ */
if (rd[30] >= 0xee) { if (rd[30] >= 0xee) {
battery_capacity = 100; battery_capacity = 100;
battery_charging = rd[30] & 0x01; battery_charging = !(rd[30] & 0x01);
} else { } else {
battery_capacity = sixaxis_battery_capacity[rd[30]]; battery_capacity = sixaxis_battery_capacity[rd[30]];
battery_charging = 0; battery_charging = 0;
} }
cable_state = (rd[31] >> 4) & 0x01; cable_state = !((rd[31] >> 4) & 0x01);
spin_lock_irqsave(&sc->lock, flags); spin_lock_irqsave(&sc->lock, flags);
sc->cable_state = cable_state; sc->cable_state = cable_state;