Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28906ad6 authored by Richard Nauber's avatar Richard Nauber Committed by Henrik Rydberg
Browse files

hid: egalax: Add support for Samsung NB30 netbook 



The Samsung NB30 touch has a DWAV dual-touch device. This patch adds
the NB30 to the list of supported devices, and grabs it accordingly in
hid-core.

[rydberg@euromail.se: rename and log message changes]
Signed-off-by: default avatarRichard Nauber <Richard.Nauber@gmail.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarHenrik Rydberg <rydberg@euromail.se>
parent e12b355b

drivers/hid/hid-core.c

+1 −0
Original line number Diff line number Diff line
@@ -1301,6 +1301,7 @@ static const struct hid_device_id hid_blacklist[] = { 
	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV, USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM, USB_DEVICE_ID_ELECOM_BM084) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_GAMERON, USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR) },

drivers/hid/hid-egalax.c

+2 −0
Original line number Diff line number Diff line
@@ -240,6 +240,8 @@ static const struct hid_device_id egalax_devices[] = { 
			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV,

			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_DWAV,

			USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3) },

	{ }

};

MODULE_DEVICE_TABLE(hid, egalax_devices);

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ 
#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH	0x480d

#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1	0x720c

#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2	0x72a1

#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3	0x480e



#define USB_VENDOR_ID_ELECOM		0x056e

#define USB_DEVICE_ID_ELECOM_BM084	0x0061