From patchwork Wed Dec 11 08:15:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Franzke X-Patchwork-Id: 3322911 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 4E9159F37A for ; Wed, 11 Dec 2013 08:17:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9F67F20729 for ; Wed, 11 Dec 2013 08:17:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6648120720 for ; Wed, 11 Dec 2013 08:17:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750736Ab3LKIQ4 (ORCPT ); Wed, 11 Dec 2013 03:16:56 -0500 Received: from mail-ee0-f48.google.com ([74.125.83.48]:45190 "EHLO mail-ee0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750743Ab3LKIQz (ORCPT ); Wed, 11 Dec 2013 03:16:55 -0500 Received: by mail-ee0-f48.google.com with SMTP id e49so2663899eek.21 for ; Wed, 11 Dec 2013 00:16:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=SEbc7MOf+XuLE4veYFKYuQQ4A7/bc/jbYrgdLzhxBOw=; b=dnO3lJ7CMkZzzEARgYOrJYn6YhnFFkDXaf1KkKDP+Prp9OSfxMckmsfDziAENklByY lHkW/ycu0BwMauDnEp0tRCP625VWPkO812jG+RxXB2NUcDoYjEAP1FQEWHIhhFvrWIva pvF8+DS0pkIevr/znIHqZCBQeRUCdrdL0ZBRlkhgFSgzyQR4HlkG37IN1i2/Gtw8cGhy 7yWfZJDXGvUWk5VFnZ2OqF1NB9M0mTLH5ciKNR9KcqyLkXvaQcoP+FXCCy2OShi+F2sX Y5a8r/uuODtHn2bxRDKFydNMkrlOR/tVXuTWjGW16bY38XOv87xjgqvuOeqMWOZgIuFQ En5g== X-Received: by 10.14.204.70 with SMTP id g46mr265146eeo.84.1386749812630; Wed, 11 Dec 2013 00:16:52 -0800 (PST) Received: from blx.fritz.box (p5DCFD568.dip0.t-ipconnect.de. [93.207.213.104]) by mx.google.com with ESMTPSA id e43sm50605232eep.7.2013.12.11.00.16.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Dec 2013 00:16:51 -0800 (PST) From: Benjamin Franzke To: linux-input@vger.kernel.org Cc: Benjamin Franzke Subject: [PATCH 2/2] joystick/xpad: Advertise the triggers as throttle/break Date: Wed, 11 Dec 2013 09:15:31 +0100 Message-Id: <1386749731-6500-2-git-send-email-benjaminfranzke@googlemail.com> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1386749731-6500-1-git-send-email-benjaminfranzke@googlemail.com> References: <1386749731-6500-1-git-send-email-benjaminfranzke@googlemail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP They are considered positive only axes, so userspace and joydev can handle them correctly. It also fits semantically better, since these triggers are really intended for throttle/break. Signed-off-by: Benjamin Franzke --- drivers/input/joystick/xpad.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 75e3b10..4e9de34 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -226,7 +226,7 @@ static const signed short xpad_abs_pad[] = { /* used when triggers are mapped to axes */ static const signed short xpad_abs_triggers[] = { - ABS_Z, ABS_RZ, /* triggers left/right */ + ABS_BRAKE, ABS_THROTTLE, /* triggers left/right */ -1 }; @@ -327,8 +327,8 @@ static void xpad_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char *d input_report_key(dev, BTN_TL2, data[10]); input_report_key(dev, BTN_TR2, data[11]); } else { - input_report_abs(dev, ABS_Z, data[10]); - input_report_abs(dev, ABS_RZ, data[11]); + input_report_abs(dev, ABS_BRAKE, data[10]); + input_report_abs(dev, ABS_THROTTLE, data[11]); } /* digital pad */ @@ -429,8 +429,8 @@ static void xpad360_process_packet(struct usb_xpad *xpad, input_report_key(dev, BTN_TL2, data[4]); input_report_key(dev, BTN_TR2, data[5]); } else { - input_report_abs(dev, ABS_Z, data[4]); - input_report_abs(dev, ABS_RZ, data[5]); + input_report_abs(dev, ABS_BRAKE, data[4]); + input_report_abs(dev, ABS_THROTTLE, data[5]); } input_sync(dev); @@ -824,8 +824,8 @@ static void xpad_set_up_abs(struct input_dev *input_dev, signed short abs) case ABS_RY: /* the two sticks */ input_set_abs_params(input_dev, abs, -32768, 32767, 16, 128); break; - case ABS_Z: - case ABS_RZ: /* the triggers (if mapped to axes) */ + case ABS_BRAKE: + case ABS_THROTTLE: /* the triggers (if mapped to axes) */ input_set_abs_params(input_dev, abs, 0, 255, 0, 0); break; case ABS_HAT0X: