EETI_eGTouch cubieTruck 配置实用 linux-3.4.61

来源：互联网发布：曹雪阳捏脸数据编辑：程序博客网时间：2024/06/06 02:43

diff --git a/drivers/input/touchscreen/usbtouchscreen.c b/drivers/input/touchscreen/usbtouchscreen.c
index e32709e..721fdb3 100644
--- a/drivers/input/touchscreen/usbtouchscreen.c
+++ b/drivers/input/touchscreen/usbtouchscreen.c

@@ -304,6 +304,45 @@ static int e2i_read_data(struct usbtouch_usb *dev, unsigned char *pkt)

#define EGALAX_PKT_TYPE_REPT 0x80

#define EGALAX_PKT_TYPE_DIAG 0x0A

+static int egalax_init(struct usbtouch_usb *usbtouch)

+{

+ int ret, i;

+ unsigned char *buf;

+ struct usb_device *udev = interface_to_usbdev(usbtouch->interface);

+

+ /*

+ * An eGalax diagnostic packet kicks the device into using the right

+ * protocol. We send a "check active" packet. The response will be

+ * read later and ignored.

+ */

+

+ buf = kmalloc(3, GFP_KERNEL);

+ if (!buf)

+ return -ENOMEM;

+

+ buf[0] = EGALAX_PKT_TYPE_DIAG;

+ buf[1] = 1; /* length */

+ buf[2] = 'A'; /* command - check active */

+

+ for (i = 0; i < 3; i++) {

+ ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),

+ 0,

+ USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE,

+ 0, 0, buf, 3,

+ USB_CTRL_SET_TIMEOUT);

+ if (ret >= 0) {

+ ret = 0;

+ break;

+ }

+ if (ret != -EPIPE)

+ break;

+ }

+

+ kfree(buf);

+

+ return ret;

+}

+

static int egalax_read_data(struct usbtouch_usb *dev, unsigned char *pkt)

{

if ((pkt[0] & EGALAX_PKT_TYPE_MASK) != EGALAX_PKT_TYPE_REPT)

@@ -1056,6 +1095,7 @@ static struct usbtouch_device_info usbtouch_dev_info[] = {

.process_pkt = usbtouch_process_multi,

.get_pkt_len = egalax_get_pkt_len,

.read_data = egalax_read_data,

+ .init = egalax_init,

},

#endif

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 0a6b36f..a7550bb 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -2183,7 +2183,16 @@ static bool hid_ignore(struct hid_device *hdev)
if (hdev->product == USB_DEVICE_ID_JESS_YUREX &&
hdev->type == HID_TYPE_USBNONE)
return true;
- break;
+ break;
+ case USB_VENDOR_ID_DWAV:
+ /* These are handled by usbtouchscreen. hdev->type is probably
+ * HID_TYPE_USBNONE, but we say !HID_TYPE_USBMOUSE to match
+ * usbtouchscreen. */
+ if ((hdev->product == USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER ||
+ hdev->product == USB_DEVICE_ID_DWAV_TOUCHCONTROLLER) &&
+ hdev->type != HID_TYPE_USBMOUSE)
+ return true;
+ break;
}
if (hdev->type == HID_TYPE_USBMOUSE &&
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
index 9bc8d57..6a97147 100644
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@ -254,6 +254,7 @@
#define USB_VENDOR_ID_DWAV 0x0eef
#define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER 0x0001
+#define USB_DEVICE_ID_DWAV_TOUCHCONTROLLER 0x0002
#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480D 0x480d
#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_480E 0x480e
#define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_7207 0x7207

0 0