From patchwork Wed Jan 26 12:56:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: chris schlund X-Patchwork-Id: 509001 X-Patchwork-Delegate: jikos@jikos.cz 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 p0QCu712018953 for ; Wed, 26 Jan 2011 12:56:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752841Ab1AZM4G (ORCPT ); Wed, 26 Jan 2011 07:56:06 -0500 Received: from mailout-de.gmx.net ([213.165.64.23]:53354 "HELO mailout-de.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752267Ab1AZM4E (ORCPT ); Wed, 26 Jan 2011 07:56:04 -0500 Received: (qmail invoked by alias); 26 Jan 2011 12:56:00 -0000 Received: from 109.125.104.142.dynamic.cablesurf.de (EHLO [192.168.0.194]) [109.125.104.142] by mail.gmx.net (mp031) with SMTP; 26 Jan 2011 13:56:00 +0100 X-Authenticated: #3027100 X-Provags-ID: V01U2FsdGVkX1+23tl2P/O2+rbSUcc5hITQMggwhA3uWifDT6+nGX 6025ne+o/n4lyD Message-ID: <4D4019EC.8060301@gmx.de> Date: Wed, 26 Jan 2011 13:56:12 +0100 From: Chris Schlund User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; de; rv:1.9.2.13) Gecko/20101207 Lightning/1.0b2 Thunderbird/3.1.7 MIME-Version: 1.0 To: Jiri Kosina CC: linux-input@vger.kernel.org Subject: Re: Re: [PATCH] hid kernel module for wireless remote LC Power model RC1000MCE X-Y-GMX-Trusted: 0 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, 26 Jan 2011 12:56:07 +0000 (UTC) diff -uprN linux-2.6.37/drivers/hid/hid-core.c linux/drivers/hid/hid-core.c --- linux-2.6.37/drivers/hid/hid-core.c 2011-01-05 01:50:19.000000000 +0100 +++ linux/drivers/hid/hid-core.c 2011-01-24 17:01:00.000000000 +0100 @@ -1312,6 +1312,7 @@ static const struct hid_device_id hid_bl { HID_USB_DEVICE(USB_VENDOR_ID_KENSINGTON, USB_DEVICE_ID_KS_SLIMBLADE) }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_ERGO_525V) }, { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) }, + { HID_USB_DEVICE(USB_VENDOR_ID_LCPOWER, USB_DEVICE_ID_LCPOWER_LC1000 ) }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER) }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER) }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_S510_RECEIVER_2) }, diff -uprN linux-2.6.37/drivers/hid/hid-ids.h linux/drivers/hid/hid-ids.h --- linux-2.6.37/drivers/hid/hid-ids.h 2011-01-05 01:50:19.000000000 +0100 +++ linux/drivers/hid/hid-ids.h 2011-01-24 17:01:00.000000000 +0100 @@ -330,6 +330,9 @@ #define USB_VENDOR_ID_LABTEC 0x1020 #define USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD 0x0006 +#define USB_VENDOR_ID_LCPOWER 0x1241 +#define USB_DEVICE_ID_LCPOWER_LC1000 0xf767 + #define USB_VENDOR_ID_LD 0x0f11 #define USB_DEVICE_ID_LD_CASSY 0x1000 #define USB_DEVICE_ID_LD_POCKETCASSY 0x1010 diff -uprN linux-2.6.37/drivers/hid/hid-lcpower.c linux/drivers/hid/hid-lcpower.c --- linux-2.6.37/drivers/hid/hid-lcpower.c 1970-01-01 01:00:00.000000000 +0100 +++ linux/drivers/hid/hid-lcpower.c 2011-01-24 17:01:00.000000000 +0100 @@ -0,0 +1,70 @@ +/* + * HID driver for LC Power Model RC1000MCE + * + * Copyright (c) 2011 Chris Schlund + * based on hid-topseed module + */ + +/* + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) + * any later version. + */ + +#include +#include +#include + +#include "hid-ids.h" + +#define ts_map_key_clear(c) hid_map_usage_clear(hi, usage, bit, max, \ + EV_KEY, (c)) +static int ts_input_mapping(struct hid_device *hdev, struct hid_input *hi, + struct hid_field *field, struct hid_usage *usage, + unsigned long **bit, int *max) +{ + if ((usage->hid & HID_USAGE_PAGE) != 0x0ffbc0000) + return 0; + + switch (usage->hid & HID_USAGE) { + case 0x046: ts_map_key_clear(KEY_YELLOW); break; + case 0x047: ts_map_key_clear(KEY_GREEN); break; + case 0x049: ts_map_key_clear(KEY_RED); break; + case 0x04a: ts_map_key_clear(KEY_BLUE); break; + case 0x00d: ts_map_key_clear(KEY_HOME); break; + case 0x025: ts_map_key_clear(KEY_TV); break; + case 0x048: ts_map_key_clear(KEY_VCR); break; + case 0x024: ts_map_key_clear(KEY_MENU); break; + default: + return 0; + } + + return 1; +} + +static const struct hid_device_id ts_devices[] = { + { HID_USB_DEVICE( USB_VENDOR_ID_LCPOWER, USB_DEVICE_ID_LCPOWER_LC1000) }, + { } +}; +MODULE_DEVICE_TABLE(hid, ts_devices); + +static struct hid_driver ts_driver = { + .name = "LC RC1000MCE", + .id_table = ts_devices, + .input_mapping = ts_input_mapping, +}; + +static int __init ts_init(void) +{ + return hid_register_driver(&ts_driver); +} + +static void __exit ts_exit(void) +{ + hid_unregister_driver(&ts_driver); +} + +module_init(ts_init); +module_exit(ts_exit); +MODULE_LICENSE("GPL"); diff -uprN linux-2.6.37/drivers/hid/Kconfig linux/drivers/hid/Kconfig --- linux-2.6.37/drivers/hid/Kconfig 2011-01-05 01:50:19.000000000 +0100 +++ linux/drivers/hid/Kconfig 2011-01-26 13:04:15.000000000 +0100 @@ -207,6 +207,12 @@ config HID_KENSINGTON ---help--- Support for Kensington Slimblade Trackball. +config HID_LCPOWER + tristate "LC-Power" + depends on USB_HID + ---help--- + Support for LC-Power RC1000MCE RF remote control. + config HID_LOGITECH tristate "Logitech devices" if EMBEDDED depends on USB_HID diff -uprN linux-2.6.37/drivers/hid/Makefile linux/drivers/hid/Makefile --- linux-2.6.37/drivers/hid/Makefile 2011-01-05 01:50:19.000000000 +0100 +++ linux/drivers/hid/Makefile 2011-01-24 17:01:00.000000000 +0100 @@ -41,6 +41,7 @@ obj-$(CONFIG_HID_EZKEY) += hid-ezkey.o obj-$(CONFIG_HID_GYRATION) += hid-gyration.o obj-$(CONFIG_HID_KENSINGTON) += hid-kensington.o obj-$(CONFIG_HID_KYE) += hid-kye.o +obj-$(CONFIG_HID_LCPOWER) += hid-lcpower.o obj-$(CONFIG_HID_LOGITECH) += hid-logitech.o obj-$(CONFIG_HID_MAGICMOUSE) += hid-magicmouse.o obj-$(CONFIG_HID_MICROSOFT) += hid-microsoft.o