From patchwork Mon Sep 6 16:42:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafi Rubin X-Patchwork-Id: 159211 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 o86GhTlg029216 for ; Mon, 6 Sep 2010 16:43:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754732Ab0IFQn2 (ORCPT ); Mon, 6 Sep 2010 12:43:28 -0400 Received: from talbot.seas.upenn.edu ([158.130.67.217]:53759 "EHLO talbot.seas.upenn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752223Ab0IFQn1 (ORCPT ); Mon, 6 Sep 2010 12:43:27 -0400 Received: from bb.home (pool-108-16-8-160.phlapa.fios.verizon.net [108.16.8.160]) (authenticated bits=0) by talbot.seas.upenn.edu (8.14.3/8.14.3) with ESMTP id o86GgqSo016542 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Mon, 6 Sep 2010 12:42:55 -0400 From: Rafi Rubin To: dmitry.torokhov@gmail.com, jkosina@suse.cz, linux-input@vger.kernel.org, jirislaby@gmail.com Cc: linux-kernel@vger.kernel.org, micki@n-trig.com, rydberg@euromail.se, chatty@enac.fr, Rafi Rubin Subject: [PATCH] identify firmware version Date: Mon, 6 Sep 2010 12:42:42 -0400 Message-Id: <1283791362-27780-1-git-send-email-rafi@seas.upenn.edu> X-Mailer: git-send-email 1.7.1 In-Reply-To: <4C7EB3A3.7050402@gmail.com> References: <4C7EB3A3.7050402@gmail.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.0.10011, 1.0.148, 0.0.0000 definitions=2010-09-06_10:2010-09-06, 2010-09-06, 1970-01-01 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 ipscore=0 phishscore=0 bulkscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx engine=5.0.0-1005130000 definitions=main-1009060114 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.3 (demeter1.kernel.org [140.211.167.41]); Mon, 06 Sep 2010 16:43:29 +0000 (UTC) diff --git a/drivers/hid/hid-ntrig.c b/drivers/hid/hid-ntrig.c index 43e95de..3472b3b 100644 --- a/drivers/hid/hid-ntrig.c +++ b/drivers/hid/hid-ntrig.c @@ -90,6 +90,26 @@ struct ntrig_data { }; +/* + * This function converts the 4 byte raw firmware code into + * a string containing 5 comma separated numbers. + */ +static int ntrig_version_string(unsigned char *raw, char *buf) +{ + __u8 a = (raw[1] & 0x0e) >> 1; + __u8 b = (raw[0] & 0x3c) >> 2; + __u8 c = ((raw[0] & 0x03) << 3) | ((raw[3] & 0xe0) >> 5); + __u8 d = ((raw[3] & 0x07) << 3) | ((raw[2] & 0xe0) >> 5); + __u8 e = raw[2] & 0x07; + + /* + * As yet unmapped bits: + * 0b11000000 0b11110001 0b00011000 0b00011000 + */ + + return sprintf(buf, "%u.%u.%u.%u.%u", a, b, c, d, e); +} + static ssize_t show_phys_width(struct device *dev, struct device_attribute *attr, char *buf) @@ -776,6 +796,9 @@ static int ntrig_probe(struct hid_device *hdev, const struct hid_device_id *id) struct hid_input *hidinput; struct input_dev *input; struct hid_report *report; + unsigned char *data; + struct usb_device *usb_dev = hid_to_usb_dev(hdev); + char *buf; if (id->driver_data) hdev->quirks |= HID_QUIRK_MULTI_INPUT; @@ -848,10 +871,43 @@ static int ntrig_probe(struct hid_device *hdev, const struct hid_device_id *id) if (report) usbhid_submit_report(hdev, report, USB_DIR_OUT); + data = kmalloc(8, GFP_KERNEL); + if (!data) { + ret = -ENOMEM; + goto err_free; + } + + ret = usb_control_msg(usb_dev, usb_rcvctrlpipe(usb_dev, 0), + USB_REQ_CLEAR_FEATURE, + USB_TYPE_CLASS | USB_RECIP_INTERFACE | + USB_DIR_IN, + 0x30c, 1, data, 8, + USB_CTRL_SET_TIMEOUT); + + if (ret == 8) { + buf = kmalloc(20, GFP_KERNEL); + if (!buf) { + ret = -ENOMEM; + goto err_free_data; + } + + ret = ntrig_version_string(&data[2], buf); + + dev_info(&hdev->dev, + "Firmware version: %s (%02x%02x %02x%02x)\n", + buf, data[2], data[3], data[4], data[5]); + + kfree(buff); + } + ret = sysfs_create_group(&hdev->dev.kobj, &ntrig_attribute_group); + kfree(data); + return 0; +err_free_data: + kfree(data); err_free: kfree(nd); return ret;