diff options
author | Kenneth Kwak <kkwak@nvidia.com> | 2014-06-24 21:37:31 -0700 |
---|---|---|
committer | Peter Kim <pekim@nvidia.com> | 2014-06-25 19:15:16 -0700 |
commit | 173c8880941f0d8ac6e57d7d7c4e5f0ce1c9ac97 (patch) | |
tree | af76e74d3039c8722ce2237ca7c5d0e2058d917b /drivers | |
parent | d8a272653ca5c40f5a56502ede58df6f53c5e3fb (diff) |
Revert "hid: Driver for Nvidia Shield joystick"
DO NOT INTEGRATE
Bug 1466757
This reverts commit 97fb92fdabfdf799a1da4838cbc52bdbbb840e45.
Change-Id: Ia553b7bc713efc8acd08a85f74cfb7ddc7a64c15
Signed-off-by: Kenneth Kwak <kkwak@nvidia.com>
Reviewed-on: http://git-master/r/428077
Reviewed-by: Peter Kim <pekim@nvidia.com>
Tested-by: Peter Kim <pekim@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/hid/Kconfig | 10 | ||||
-rw-r--r-- | drivers/hid/Makefile | 1 | ||||
-rw-r--r-- | drivers/hid/hid-core.c | 1 | ||||
-rw-r--r-- | drivers/hid/hid-ids.h | 3 | ||||
-rw-r--r-- | drivers/hid/hid-nvidia.c | 83 |
5 files changed, 0 insertions, 98 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 3c5c434d94c9..1283fa3b20a3 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -404,16 +404,6 @@ config HID_NTRIG ---help--- Support for N-Trig touch screen. -config HID_NVIDIA - tristate "NVIDIA game controller" - depends on USB_HID - ---help--- - Support for NVIDIA game controllers. To improve gaming experience, NVIDIA controller - has customized axis flat and fuzz values. - Supported devices: - - - NVIDIA Shield Handheld game console. - config HID_ORTEK tristate "Ortek PKB-1700/WKB-2000/Skycable wireless keyboard and mouse trackpad" depends on USB_HID diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile index 8d583e8f1c7b..9dca84592cc4 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile @@ -85,7 +85,6 @@ obj-$(CONFIG_HID_ZYDACRON) += hid-zydacron.o obj-$(CONFIG_HID_WACOM) += hid-wacom.o obj-$(CONFIG_HID_WALTOP) += hid-waltop.o obj-$(CONFIG_HID_WIIMOTE) += hid-wiimote.o -obj-$(CONFIG_HID_NVIDIA) += hid-nvidia.o obj-$(CONFIG_USB_HID) += usbhid/ obj-$(CONFIG_USB_MOUSE) += usbhid/ diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index f2c78b337f31..ff73d60cfc7f 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1518,7 +1518,6 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_16) }, { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17) }, { HID_USB_DEVICE(USB_VENDOR_ID_NTRIG, USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18) }, - { HID_USB_DEVICE(USB_VENDOR_ID_NVIDIA, USB_DEVICE_ID_NVIDIA_LOKI) }, { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_PKB1700) }, { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) }, { HID_USB_DEVICE(USB_VENDOR_ID_PANASONIC, USB_DEVICE_ID_PANABOARD_UBT780) }, diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index e552f6c3e191..14d2239954c1 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -596,9 +596,6 @@ #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_17 0x0013 #define USB_DEVICE_ID_NTRIG_TOUCH_SCREEN_18 0x0014 -#define USB_VENDOR_ID_NVIDIA 0x0955 -#define USB_DEVICE_ID_NVIDIA_LOKI 0x7205 - #define USB_VENDOR_ID_ONTRAK 0x0a07 #define USB_DEVICE_ID_ONTRAK_ADU100 0x0064 diff --git a/drivers/hid/hid-nvidia.c b/drivers/hid/hid-nvidia.c deleted file mode 100644 index 29a4ae2a4a16..000000000000 --- a/drivers/hid/hid-nvidia.c +++ /dev/null @@ -1,83 +0,0 @@ -/* - * HID driver for NVIDIA Shield Joystick - * - * Copyright (c) 2013, NVIDIA Corporation. All Rights Reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include <linux/device.h> -#include <linux/input.h> -#include <linux/hid.h> -#include <linux/module.h> -#include <linux/kernel.h> - -#include "hid-ids.h" - -#define JOYSTICK_FUZZ 64 -#define TRIGGER_FUZZ 64 -#define JOYSTICK_FLAT 64 -#define TRIGGER_FLAT 0 - -static int nvidia_input_mapped(struct hid_device *hdev, struct hid_input *hi, - struct hid_field *field, struct hid_usage *usage, - unsigned long **bit, int *max) -{ - int a = field->logical_minimum; - int b = field->logical_maximum; - int fuzz; - int flat; - - if ((usage->type == EV_ABS) && (field->application == HID_GD_GAMEPAD - || field->application == HID_GD_JOYSTICK)) { - switch (usage->hid) { - case HID_GD_X: - case HID_GD_Y: - case HID_GD_RX: - case HID_GD_RY: - fuzz = JOYSTICK_FUZZ; - flat = JOYSTICK_FLAT; - break; - case HID_GD_Z: - case HID_GD_RZ: - fuzz = TRIGGER_FUZZ; - flat = TRIGGER_FLAT; - break; - default: return 0;/*Use generic mapping for HatX, HatY*/ - } - set_bit(usage->type, hi->input->evbit); - set_bit(usage->code, *bit); - input_set_abs_params(hi->input, usage->code, a, b, fuzz, flat); - input_abs_set_res(hi->input, usage->code, - hidinput_calc_abs_res(field, usage->code)); - return -1; - } - - return 0; -} - -static const struct hid_device_id nvidia_devices[] = { - { HID_USB_DEVICE(USB_VENDOR_ID_NVIDIA, USB_DEVICE_ID_NVIDIA_LOKI) }, - { } -}; -MODULE_DEVICE_TABLE(hid, loki_devices); - -static struct hid_driver nvidia_driver = { - .name = "hid-nvidia", - .id_table = nvidia_devices, - .input_mapped = nvidia_input_mapped, -}; -module_hid_driver(nvidia_driver); - -MODULE_AUTHOR("Jun Yan <juyan@nvidia.com>"); -MODULE_LICENSE("GPL"); |