Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753496Ab0HZFFk (ORCPT ); Thu, 26 Aug 2010 01:05:40 -0400 Received: from fox.seas.upenn.edu ([158.130.68.12]:54144 "EHLO fox.seas.upenn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753451Ab0HZFFh (ORCPT ); Thu, 26 Aug 2010 01:05:37 -0400 X-Greylist: delayed 611 seconds by postgrey-1.27 at vger.kernel.org; Thu, 26 Aug 2010 01:05:35 EDT From: Rafi Rubin To: jkosina@suse.cz, linux-input@vger.kernel.org Cc: linux-kernel@vger.kernel.org, dmitry.torokhov@gmail.com, chatty@enac.fr, micki@n-trig.com, Rafi Rubin Subject: [PATCH 3/4] identify firmware version Date: Thu, 26 Aug 2010 00:54:56 -0400 Message-Id: <1282798497-19791-4-git-send-email-rafi@seas.upenn.edu> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1282798497-19791-1-git-send-email-rafi@seas.upenn.edu> References: <1282798497-19791-1-git-send-email-rafi@seas.upenn.edu> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.0.10011,1.0.148,0.0.0000 definitions=2010-08-26_03:2010-08-26,2010-08-26,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-1008250268 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3129 Lines: 113 This adds firmware version polling to the end of probe and reports the version both in the raw form and proccessed to match the formatting used by ntrig in windows. Signed-off-by: Rafi Rubin --- drivers/hid/hid-ntrig.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/drivers/hid/hid-ntrig.c b/drivers/hid/hid-ntrig.c index 43e95de..ab0ca7f 100644 --- a/drivers/hid/hid-ntrig.c +++ b/drivers/hid/hid-ntrig.c @@ -63,6 +63,9 @@ struct ntrig_data { bool reading_mt; + /* The raw firmware version code */ + __u8 firmware_version[4]; + __u8 mt_footer[4]; __u8 mt_foot_count; @@ -90,6 +93,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] & 0b00001110) >> 1; + __u8 b = (raw[0] & 0b00111100) >> 2; + __u8 c = ((raw[0] & 0b00000011) << 3) | ((raw[3] & 0b11100000) >> 5); + __u8 d = ((raw[3] & 0b00000111) << 3) | ((raw[2] & 0b11100000) >> 5); + __u8 e = raw[2] & 0b00000111; + + /* + * 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 +799,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 +874,44 @@ 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]); + + nd->firmware_version[0] = data[2]; + nd->firmware_version[1] = data[3]; + nd->firmware_version[2] = data[4]; + nd->firmware_version[3] = data[5]; + } + ret = sysfs_create_group(&hdev->dev.kobj, &ntrig_attribute_group); return 0; +err_free_data: + kfree(data); err_free: kfree(nd); return ret; -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/