From patchwork Sat Oct 1 00:50:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roderick Colenbrander X-Patchwork-Id: 9359037 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7149C6075E for ; Sat, 1 Oct 2016 00:51:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 611362A124 for ; Sat, 1 Oct 2016 00:51:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 55DD32A12D; Sat, 1 Oct 2016 00:51:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 25BB62A12A for ; Sat, 1 Oct 2016 00:51:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752371AbcJAAvD (ORCPT ); Fri, 30 Sep 2016 20:51:03 -0400 Received: from mail-it0-f47.google.com ([209.85.214.47]:35657 "EHLO mail-it0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752255AbcJAAvC (ORCPT ); Fri, 30 Sep 2016 20:51:02 -0400 Received: by mail-it0-f47.google.com with SMTP id r192so70658794ita.0 for ; Fri, 30 Sep 2016 17:51:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gaikai-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7dAXDz5Cn22UQZl2apzqZWA4NuEapmbeApo4TzOYvWI=; b=UX8DSbs+lp4+he220THdiDv4advYOY4Hiw2RtjXyjLa/U1ZqYYX2aM/BIYSzW/m+os rDTKvCAi4FxoeS/rfashMfRfz1inBprLXgpvEH1ypo0UbLJ4XABnNAOcKXqnotZvqWp9 xAvSBXnthiheE53r5U6PkuUP84BwdqdVrIRfAdMtd+l23DKpBJ6qshbct6kIJr4g0AxJ 4hD8773sy7M8Fuy0KVElOzpVhs5wG/ZdFHGsIifcItyEApd/ItMN2NLH2N3j6q0ho3Zn iQE9B5mKgO2fRy8GyjNX7qcLY/MAw7B73v/kHTaMp+gz4ukR0OiUEBvzxMdsoZfZYRBb VpMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7dAXDz5Cn22UQZl2apzqZWA4NuEapmbeApo4TzOYvWI=; b=gNPqSoRytRuVVOIzKToRJmuFInRSX3e5x12BXeH7tmkNR9T+JmQRJEEKdETZ7rFtfJ icqmmcvzMdulABDMFRjqTlmAa/7jP30NlmVgt7PytuzYxKmjzgj/6zoNMQ2dr0G+M7cb QvFdPm79DAAYfS+VJuZbyLIgB/l7JP18hceP+CcS/jh1VFlPZb3zD9PgONTShBusEZfV C7Ik8qC0Misbn8ujB4prf8SnfLLqAbzbo3qu/SrPAEnVDbue/3aQFvBGQVdHC78XEESz NAXwNDAgxuSP1Oe81VphWllSGU7Mid5U9gxVcMmK1bQDuqn+Hq6Q0kIB/v+uO6eZis3X DmRg== X-Gm-Message-State: AA6/9RkO+hZyC6rUbaHJvPu/lFCCdXoThCWSQjL71qy8r1Qo4WTBDWAJLJm1XT+hDXEVQSCn X-Received: by 10.36.23.142 with SMTP id 136mr7235827ith.73.1475283061967; Fri, 30 Sep 2016 17:51:01 -0700 (PDT) Received: from konan1.dev.biz ([100.42.98.197]) by smtp.gmail.com with ESMTPSA id r124sm3079746itc.19.2016.09.30.17.51.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Sep 2016 17:51:01 -0700 (PDT) From: roderick@gaikai.com To: linux-input@vger.kernel.org Cc: Benjamin Tissoires , Jiri Kosina , Roderick Colenbrander Subject: [PATCH 2/2] HID: sony: Adjust HID report size name definitions Date: Fri, 30 Sep 2016 17:50:26 -0700 Message-Id: <1475283026-2256-2-git-send-email-roderick@gaikai.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1475283026-2256-1-git-send-email-roderick@gaikai.com> References: <1475283026-2256-1-git-send-email-roderick@gaikai.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Roderick Colenbrander Put the report type (feature / output) in the report size definitions. This prevents name collisions later on for other reports, which use the same report id. Signed-off-by: Roderick Colenbrander --- drivers/hid/hid-sony.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c index 189c100..627a785 100644 --- a/drivers/hid/hid-sony.c +++ b/drivers/hid/hid-sony.c @@ -1018,10 +1018,10 @@ struct motion_output_report_02 { u8 rumble; }; -#define DS4_REPORT_0x02_SIZE 37 -#define DS4_REPORT_0x05_SIZE 32 -#define DS4_REPORT_0x11_SIZE 78 -#define DS4_REPORT_0x81_SIZE 7 +#define DS4_FEATURE_REPORT_0x02_SIZE 37 +#define DS4_FEATURE_REPORT_0x81_SIZE 7 +#define DS4_OUTPUT_REPORT_0x05_SIZE 32 +#define DS4_OUTPUT_REPORT_0x11_SIZE 78 #define SIXAXIS_REPORT_0xF2_SIZE 17 #define SIXAXIS_REPORT_0xF5_SIZE 8 #define MOTION_REPORT_0x02_SIZE 49 @@ -1460,11 +1460,11 @@ static int dualshock4_set_operational_bt(struct hid_device *hdev) u8 *buf; int ret; - buf = kmalloc(DS4_REPORT_0x02_SIZE, GFP_KERNEL); + buf = kmalloc(DS4_FEATURE_REPORT_0x02_SIZE, GFP_KERNEL); if (!buf) return -ENOMEM; - ret = hid_hw_raw_request(hdev, 0x02, buf, DS4_REPORT_0x02_SIZE, + ret = hid_hw_raw_request(hdev, 0x02, buf, DS4_FEATURE_REPORT_0x02_SIZE, HID_FEATURE_REPORT, HID_REQ_GET_REPORT); kfree(buf); @@ -1869,12 +1869,12 @@ static void dualshock4_send_output_report(struct sony_sc *sc) * 0xD0 - 66hz */ if (sc->quirks & DUALSHOCK4_CONTROLLER_USB) { - memset(buf, 0, DS4_REPORT_0x05_SIZE); + memset(buf, 0, DS4_OUTPUT_REPORT_0x05_SIZE); buf[0] = 0x05; buf[1] = 0xFF; offset = 4; } else { - memset(buf, 0, DS4_REPORT_0x11_SIZE); + memset(buf, 0, DS4_OUTPUT_REPORT_0x11_SIZE); buf[0] = 0x11; buf[1] = 0x80; buf[3] = 0x0F; @@ -1902,9 +1902,9 @@ static void dualshock4_send_output_report(struct sony_sc *sc) buf[offset++] = sc->led_delay_off[3]; if (sc->quirks & DUALSHOCK4_CONTROLLER_USB) - hid_hw_output_report(hdev, buf, DS4_REPORT_0x05_SIZE); + hid_hw_output_report(hdev, buf, DS4_OUTPUT_REPORT_0x05_SIZE); else - hid_hw_raw_request(hdev, 0x11, buf, DS4_REPORT_0x11_SIZE, + hid_hw_raw_request(hdev, 0x11, buf, DS4_OUTPUT_REPORT_0x11_SIZE, HID_OUTPUT_REPORT, HID_REQ_SET_REPORT); } @@ -1949,10 +1949,10 @@ static int sony_allocate_output_report(struct sony_sc *sc) kmalloc(sizeof(union sixaxis_output_report_01), GFP_KERNEL); else if (sc->quirks & DUALSHOCK4_CONTROLLER_BT) - sc->output_report_dmabuf = kmalloc(DS4_REPORT_0x11_SIZE, + sc->output_report_dmabuf = kmalloc(DS4_OUTPUT_REPORT_0x11_SIZE, GFP_KERNEL); else if (sc->quirks & DUALSHOCK4_CONTROLLER_USB) - sc->output_report_dmabuf = kmalloc(DS4_REPORT_0x05_SIZE, + sc->output_report_dmabuf = kmalloc(DS4_OUTPUT_REPORT_0x05_SIZE, GFP_KERNEL); else if (sc->quirks & MOTION_CONTROLLER) sc->output_report_dmabuf = kmalloc(MOTION_REPORT_0x02_SIZE, @@ -2197,7 +2197,7 @@ static int sony_check_add(struct sony_sc *sc) return 0; } } else if (sc->quirks & DUALSHOCK4_CONTROLLER_USB) { - buf = kmalloc(DS4_REPORT_0x81_SIZE, GFP_KERNEL); + buf = kmalloc(DS4_FEATURE_REPORT_0x81_SIZE, GFP_KERNEL); if (!buf) return -ENOMEM; @@ -2207,10 +2207,10 @@ static int sony_check_add(struct sony_sc *sc) * offset 1. */ ret = hid_hw_raw_request(sc->hdev, 0x81, buf, - DS4_REPORT_0x81_SIZE, HID_FEATURE_REPORT, + DS4_FEATURE_REPORT_0x81_SIZE, HID_FEATURE_REPORT, HID_REQ_GET_REPORT); - if (ret != DS4_REPORT_0x81_SIZE) { + if (ret != DS4_FEATURE_REPORT_0x81_SIZE) { hid_err(sc->hdev, "failed to retrieve feature report 0x81 with the DualShock 4 MAC address\n"); ret = ret < 0 ? ret : -EINVAL; goto out_free;