From patchwork Mon May 23 10:23:26 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: simon@mungewell.org X-Patchwork-Id: 841592 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p51Jk5NO007826 for ; Wed, 1 Jun 2011 19:46:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758970Ab1FATpy (ORCPT ); Wed, 1 Jun 2011 15:45:54 -0400 Received: from idcmail-mo2no.shaw.ca ([64.59.134.9]:57115 "EHLO idcmail-mo2no.shaw.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759561Ab1FATpq (ORCPT ); Wed, 1 Jun 2011 15:45:46 -0400 Received: from pd6ml3no-ssvc.prod.shaw.ca ([10.0.153.149]) by pd7mo1no-svcs.prod.shaw.ca with ESMTP; 01 Jun 2011 13:45:46 -0600 X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=cUTwMia+6fMZF7bjUHU44PO5dfBASsAn9IQPzcMrg/g= c=1 sm=1 a=D9lEqAhTD9gA:10 a=3762yOXauukA:10 a=BLceEmwcHowA:10 a=n3DLBDIp2lSvWb96zoUu4Q==:17 a=47LbCVvxAAAA:8 a=bl19pPN5vlf71qj6r6YA:9 a=z0qf689oU-qDLqu6IFwA:7 a=QhNQsjeWOoAA:10 a=HpAAvcLHHh0Zw7uRqdWCyQ==:117 Received: from unknown (HELO localhost.localdomain) ([184.71.62.106]) by pd6ml3no-dmz.prod.shaw.ca with ESMTP; 01 Jun 2011 13:45:46 -0600 From: Simon Wood To: linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Antonio Ospite , Marcin Tolysz , Jiri Kosina , Simon Wood Subject: [PATCH 2/2] sony_ff_byteswap_accelerometer Date: Mon, 23 May 2011 03:23:26 -0700 Message-Id: <1306146206-15794-2-git-send-email-simon@mungewell.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1306146206-15794-1-git-send-email-simon@mungewell.org> References: <80b32cfd7dc9e8afee2c4d9e21d1a7e3.squirrel@host171.canaca.com> <1306146206-15794-1-git-send-email-simon@mungewell.org> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 01 Jun 2011 19:46:06 +0000 (UTC) The accelerometers/gyro on the sixaxis are reported in the wrong endianness (ie. not compatible with HID), so this patch intercepts the report and swaps the appropriate bytes over. Accelerometers are scaled with a nominal value of +/-4000 = 1G, maximum value would be around +/-32768 = 8G. Gyro on my device always reports -32768, might need some calibration set within the controller. Signed-off-by: Simon Wood --- drivers/hid/hid-sony.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c index 5c930dc..f219746 100644 --- a/drivers/hid/hid-sony.c +++ b/drivers/hid/hid-sony.c @@ -57,6 +57,24 @@ static __u8 *sony_report_fixup(struct hid_device *hdev, __u8 *rdesc, return rdesc; } +/* Sixaxis HID report has acclerometers/gyro with MSByte first, this has + * to be BYTE_SWAPPED before passing up to joystick interface + */ +static int sony_raw_event(struct hid_device *hdev, struct hid_report *report, __u8 *rd, int size) +{ + struct sony_sc *sc = hid_get_drvdata(hdev); + + if ((sc->quirks & SIXAXIS_CONTROLLER_USB) && + rd[0] == 0x01 && size == 49) { + swap(rd[41], rd[42]); + swap(rd[43], rd[44]); + swap(rd[45], rd[46]); + swap(rd[47], rd[48]); + } + + return 0; +} + /* * The Sony Sixaxis does not handle HID Output Reports on the Interrupt EP * like it should according to usbhid/hid-core.c::usbhid_output_raw_report() @@ -205,6 +223,7 @@ static struct hid_driver sony_driver = { .probe = sony_probe, .remove = sony_remove, .report_fixup = sony_report_fixup, + .raw_event = sony_raw_event }; static int __init sony_init(void)