Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932462AbWHCKHm (ORCPT ); Thu, 3 Aug 2006 06:07:42 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932463AbWHCKHm (ORCPT ); Thu, 3 Aug 2006 06:07:42 -0400 Received: from [210.76.114.181] ([210.76.114.181]:54679 "EHLO ccoss.com.cn") by vger.kernel.org with ESMTP id S932462AbWHCKHm (ORCPT ); Thu, 3 Aug 2006 06:07:42 -0400 Date: Thu, 3 Aug 2006 18:07:37 +0800 From: "liyu" To: "linux-kernel" Subject: [PATCH] usb: Microsoft Natural Ergonomic Keyboard 4000 Driver 0.3.0 Message-ID: <200608031807374336989@ccoss.com.cn> X-mailer: Foxmail 6, 4, 104, 20 [cn] Mime-Version: 1.0 Content-Type: text/plain; charset="gb2312" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 7766 Lines: 241 This Patch require the "[PATCH] usb: The HID Simple Driver Interface 0.3.0". Changelogs: 1. Rewrite under HID simple driver framework version 0.3.0, it is more smaller. Signed-off-by: Liyu diff -Naurp linux-2.6.17.7/drivers/usb/input.orig/usbnek4k.c linux-2.6.17.7/drivers/usb/input/usbnek4k.c --- linux-2.6.17.7/drivers/usb/input.orig/usbnek4k.c 1970-01-01 08:00:00.000000000 +0800 +++ linux-2.6.17.7/drivers/usb/input/usbnek4k.c 2006-08-03 17:34:02.000000000 +0800 @@ -0,0 +1,196 @@ +/* + * + * + * Version: 0.3.0 + * + * Copyright (c) 2006 Liyu + */ + +/* + * 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 "hid.h" +#include "hid-simple.h" + +#define USAGE_ZOOM_IN 0x22d +#define USAGE_ZOOM_OUT 0x22e +#define USAGE_HOME 0x223 +#define USAGE_SEARCH 0x221 +#define USAGE_EMAIL 0x18a +#define USAGE_FAVORITES 0x182 +#define USAGE_MUTE 0xe2 +#define USAGE_VOLUME_DOWN 0xea +#define USAGE_VOLUME_UP 0xe9 +#define USAGE_PLAY_PAUSE 0xcd +#define USAGE_CALCULATOR 0x192 +#define USAGE_BACK 0x224 +#define USAGE_FORWARD 0x225 +#define USAGE_CUSTOM 0xff05 + +#define USAGE_CUSTOM_RELEASE 0x0 +#define USAGE_CUSTOM_1 0x1 +#define USAGE_CUSTOM_2 0x2 +#define USAGE_CUSTOM_3 0x4 +#define USAGE_CUSTOM_4 0x8 +#define USAGE_CUSTOM_5 0x10 + +#define USAGE_HELP 0x95 +#define USAGE_UNDO 0x21a +#define USAGE_REDO 0x279 +#define USAGE_NEW 0x201 +#define USAGE_OPEN 0x202 +#define USAGE_CLOSE 0x203 + +#define USAGE_REPLY 0x289 +#define USAGE_FWD 0x28b +#define USAGE_SEND 0x28c +#define USAGE_SPELL 0x1ab +#define USAGE_SAVE 0x207 +#define USAGE_PRINT 0x208 + +#define USAGE_KEYPAD_EQUAL 0x67 +#define USAGE_KEYPAD_LEFT_PAREN 0xb6 +#define USAGE_KEYPAD_RIGHT_PAREN 0xb7 + +#define MSNEK4K_ID_VENDOR 0x045e +#define MSNEK4K_ID_PRODUCT 0x00db + +static struct usb_device_id nek4k_id_table[] = { + { + USB_DEVICE(MSNEK4K_ID_VENDOR, MSNEK4K_ID_PRODUCT) + }, + {} +}; + + +static struct usb_device_id __id[] = { + { + USB_DEVICE(MSNEK4K_ID_VENDOR, MSNEK4K_ID_PRODUCT) + }, + {} +}; + +MODULE_DEVICE_TABLE(usb, __id); + +static char driver_name[] = "Microsoft Natural Ergonomic Keyboard 4000"; + +struct usage_block consumer_usage_block[] = { + USAGE_BLOCK(USAGE_ZOOM_IN, 0, EV_KEY, KEY_F13, 0), + USAGE_BLOCK(USAGE_ZOOM_OUT, 0, EV_KEY, KEY_F14, 0), + USAGE_BLOCK(USAGE_HOME, 0, EV_KEY, KEY_HOMEPAGE, 0), + USAGE_BLOCK(USAGE_SEARCH, 0, EV_KEY, KEY_SEARCH, 0), + USAGE_BLOCK(USAGE_EMAIL, 0, EV_KEY, KEY_EMAIL, 0), + USAGE_BLOCK(USAGE_FAVORITES, 0, EV_KEY, KEY_FAVORITES, 0), + USAGE_BLOCK(USAGE_MUTE, 0, EV_KEY, KEY_MUTE, 0), + USAGE_BLOCK(USAGE_VOLUME_DOWN, 0, EV_KEY, KEY_VOLUMEDOWN, 0), + USAGE_BLOCK(USAGE_VOLUME_UP, 0, EV_KEY, KEY_VOLUMEUP, 0), + USAGE_BLOCK(USAGE_PLAY_PAUSE, 0, EV_KEY, KEY_PLAYPAUSE, 0), + USAGE_BLOCK(USAGE_CALCULATOR, 0, EV_KEY, KEY_CALC, 0), + USAGE_BLOCK(USAGE_BACK, 0, EV_KEY, KEY_BACK, 0), + USAGE_BLOCK(USAGE_FORWARD, 0, EV_KEY, KEY_FORWARD, 0), + USAGE_BLOCK(USAGE_HELP, 0, EV_KEY, KEY_HELP, 0), + USAGE_BLOCK(USAGE_UNDO, 0, EV_KEY, KEY_UNDO, 0), + USAGE_BLOCK(USAGE_REDO, 0, EV_KEY, KEY_REDO, 0), + USAGE_BLOCK(USAGE_NEW, 0, EV_KEY, KEY_NEW, 0), + USAGE_BLOCK(USAGE_OPEN, 0, EV_KEY, KEY_OPEN, 0), + USAGE_BLOCK(USAGE_CLOSE, 0, EV_KEY, KEY_CLOSE, 0), + USAGE_BLOCK(USAGE_REPLY, 0, EV_KEY, KEY_REPLY, 0), + USAGE_BLOCK(USAGE_FWD, 0, EV_KEY, KEY_FORWARDMAIL, 0), + USAGE_BLOCK(USAGE_SEND, 0, EV_KEY, KEY_SEND, 0), + USAGE_BLOCK(USAGE_SPELL, 0, EV_KEY, KEY_F15, 0), + USAGE_BLOCK(USAGE_SAVE, 0, EV_KEY, KEY_SAVE, 0), + USAGE_BLOCK(USAGE_PRINT, 0, EV_KEY, KEY_PRINT, 0), + USAGE_BLOCK_NULL +}; + +struct usage_block msvendor_usage_block[] = { + USAGE_BLOCK(USAGE_CUSTOM, USAGE_CUSTOM_1, EV_KEY, KEY_FN_F1, 0), + USAGE_BLOCK(USAGE_CUSTOM, USAGE_CUSTOM_2, EV_KEY, KEY_FN_F2, 0), + USAGE_BLOCK(USAGE_CUSTOM, USAGE_CUSTOM_3, EV_KEY, KEY_FN_F3, 0), + USAGE_BLOCK(USAGE_CUSTOM, USAGE_CUSTOM_4, EV_KEY, KEY_FN_F4, 0), + USAGE_BLOCK(USAGE_CUSTOM, USAGE_CUSTOM_5, EV_KEY, KEY_FN_F5, 0), + USAGE_BLOCK_NULL +}; + +struct usage_block keyboard_usage_block[] = { + USAGE_BLOCK(USAGE_KEYPAD_EQUAL, 0, EV_KEY, KEY_KPEQUAL, 0), + USAGE_BLOCK(USAGE_KEYPAD_LEFT_PAREN, 0, EV_KEY, KEY_KPLEFTPAREN, 0), + USAGE_BLOCK(USAGE_KEYPAD_RIGHT_PAREN, 0, EV_KEY, KEY_KPRIGHTPAREN, 0), + USAGE_BLOCK_NULL +}; + +struct usage_page_block nek4k_usage_page_blockes[] = { + USAGE_PAGE_BLOCK(HID_UP_CONSUMER, consumer_usage_block), + USAGE_PAGE_BLOCK(HID_UP_MSVENDOR, msvendor_usage_block), + USAGE_PAGE_BLOCK(HID_UP_KEYBOARD, keyboard_usage_block), + USAGE_PAGE_BLOCK_NULL +}; + +static int +nek4k_hid_event(const struct hid_device *hid, const struct hid_field *field, + const struct hid_usage *usage, const __s32 value, + const struct pt_regs *regs) +{ + struct hid_input *hidinput = field->hidinput; + struct input_dev *input = hidinput->input; + int code=0; + + if ( (usage->hid&HID_USAGE_PAGE) != HID_UP_MSVENDOR || + (usage->hid&HID_USAGE) != USAGE_CUSTOM ) { + return (!0); + } + + switch (value) { + case USAGE_CUSTOM_RELEASE: + code = (int)hidinput->private; + hidinput->private = NULL; + input_event(input, EV_KEY, code, 0); + input_sync(input); + return 0; + case USAGE_CUSTOM_1: + code = KEY_FN_F1; break; + case USAGE_CUSTOM_2: + code = KEY_FN_F2; break; + case USAGE_CUSTOM_3: + code = KEY_FN_F3; break; + case USAGE_CUSTOM_4: + code = KEY_FN_F4; break; + case USAGE_CUSTOM_5: + code = KEY_FN_F5; break; + }; + if (code) { + hidinput->private = (void*)code; + input_event(input, EV_KEY, code, 1); + input_sync(input); + } + return 0; +} + +static struct hidinput_simple_driver nek4k_driver = { + .name = driver_name, + .pre_event = nek4k_hid_event, + .id_table = nek4k_id_table, + .usage_page_table = nek4k_usage_page_blockes, + .private = NULL +}; + +static int __init nek4k_init(void) +{ + return hidinput_register_simple_driver(&nek4k_driver); +} + +static void __exit nek4k_exit(void) +{ + hidinput_unregister_simple_driver(&nek4k_driver); +} + +module_init(nek4k_init); +module_exit(nek4k_exit); + +MODULE_LICENSE("GPL"); diff -Naurp linux-2.6.17.7/drivers/usb/input.orig/Kconfig linux-2.6.17.7/drivers/usb/input/Kconfig --- linux-2.6.17.7/drivers/usb/input.orig/Kconfig 2006-07-25 11:36:01.000000000 +0800 +++ linux-2.6.17.7/drivers/usb/input/Kconfig 2006-07-26 15:46:09.000000000 +0800 @@ -326,3 +326,11 @@ config USB_APPLETOUCH To compile this driver as a module, choose M here: the module will be called appletouch. + +config HID_MSNEK4K + tristate "Microsoft Natural Ergonomic Keyboard 4000 Driver" + depends on USB && USB_HID + ---help--- + Microsoft Natural Ergonomic Keyboard 4000 driver. These extend keys + may not work without change user space configration, e.g, XKB conf- + iguration in X. diff -Naurp linux-2.6.17.7/drivers/usb/input.orig/Makefile linux-2.6.17.7/drivers/usb/input/Makefile --- linux-2.6.17.7/drivers/usb/input.orig/Makefile 2006-07-25 11:36:01.000000000 +0800 +++ linux-2.6.17.7/drivers/usb/input/Makefile 2006-08-03 17:34:21.000000000 +0800 @@ -44,6 +44,7 @@ obj-$(CONFIG_USB_ACECAD) += acecad.o obj-$(CONFIG_USB_YEALINK) += yealink.o obj-$(CONFIG_USB_XPAD) += xpad.o obj-$(CONFIG_USB_APPLETOUCH) += appletouch.o +obj-$(CONFIG_HID_MSNEK4K) += usbnek4k.o ifeq ($(CONFIG_USB_DEBUG),y) EXTRA_CFLAGS += -DDEBUG - 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/