sync

3 files changed, 36 insertions, 5 deletions

diff --git a/sys/dev/usb/files.usb b/sys/dev/usb/files.usb
index dea7adc80fc..28d87f4257e 100644
--- a/sys/dev/usb/files.usb
+++ b/sys/dev/usb/files.usb
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.usb,v 1.54 2006/04/20 10:12:00 mbalmer Exp $
+#	$OpenBSD: files.usb,v 1.55 2006/04/24 02:27:10 deraadt Exp $
 #	$NetBSD: files.usb,v 1.16 2000/02/14 20:29:54 augustss Exp $
 #
 # Config file and device description for machine-independent USB code.
@@ -81,6 +81,10 @@ device	ums: hid, wsmousedev
 attach	ums at uhidbus
 file	dev/usb/ums.c			ums
 
+device	uep: wsmousedev
+attach	uep at uhub
+file	dev/usb/uep.c			uep			needs-flag
+
 # Printers
 device	ulpt
 attach	ulpt at uhub
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 38d8c395683..32c9a272c65 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.197 2006/04/23 19:17:00 brad Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.198 2006/04/24 02:27:10 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.193 2006/04/23 19:16:14 brad Exp 
+ *	OpenBSD: usbdevs,v 1.194 2006/04/24 02:27:03 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -64,6 +64,7 @@
  * make the device recognised by the appropriate device driver.
  */
 
+#define	USB_VENDOR_EGALAX2	0x0123		/* eGalax */
 #define	USB_VENDOR_AOX	0x03e8		/* AOX */
 #define	USB_VENDOR_ATMEL	0x03eb		/* Atmel */
 #define	USB_VENDOR_MITSUMI	0x03ee		/* Mitsumi */
@@ -400,6 +401,7 @@
 #define	USB_VENDOR_GMATE	0x0e73		/* G.Mate */
 #define	USB_VENDOR_OTI	0x0ea0		/* Ours Technology */
 #define	USB_VENDOR_PILOTECH	0x0eaf		/* Pilotech */
+#define	USB_VENDOR_EGALAX	0x0eef		/* eGalax */
 #define	USB_VENDOR_ITEGNO	0x0eba		/* iTegno */
 #define	USB_VENDOR_AIRPRIME	0x0f3d		/* Airprime */
 #define	USB_VENDOR_VTECH	0x0f88		/* VTech */
@@ -892,6 +894,11 @@
 /* EasyDisk products */
 #define	USB_PRODUCT_EASYDISK_EASYDISK	0x0005		/* Flash Disk */
 
+/* eGalax Products */
+#define	USB_PRODUCT_EGALAX_TPANEL	0x0001		/* Touch Panel */
+#define	USB_PRODUCT_EGALAX_TPANEL2	0x0002		/* Touch Panel */
+#define	USB_PRODUCT_EGALAX2_TPANEL	0x0001		/* Touch Panel */
+
 /* Eicon Networks products */
 #define	USB_PRODUCT_EICON_DIVA852	0x4905		/* Diva 852 ISDN TA */
 
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 3cd7a2245f6..8071b19d3f6 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs_data.h,v 1.197 2006/04/23 19:17:00 brad Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.198 2006/04/24 02:27:10 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.193 2006/04/23 19:16:14 brad Exp 
+ *	OpenBSD: usbdevs,v 1.194 2006/04/24 02:27:03 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -1039,6 +1039,18 @@ const struct usb_known_product usb_known_products[] = {
 	    "Flash Disk",
 	},
 	{
+	    USB_VENDOR_EGALAX, USB_PRODUCT_EGALAX_TPANEL,
+	    "Touch Panel",
+	},
+	{
+	    USB_VENDOR_EGALAX, USB_PRODUCT_EGALAX_TPANEL2,
+	    "Touch Panel",
+	},
+	{
+	    USB_VENDOR_EGALAX2, USB_PRODUCT_EGALAX2_TPANEL,
+	    "Touch Panel",
+	},
+	{
 	    USB_VENDOR_EICON, USB_PRODUCT_EICON_DIVA852,
 	    "Diva 852 ISDN TA",
 	},
@@ -3907,6 +3919,10 @@ const struct usb_known_product usb_known_products[] = {
 
 const struct usb_known_vendor usb_known_vendors[] = {
 	{
+	    USB_VENDOR_EGALAX2,
+	    "eGalax",
+	},
+	{
 	    USB_VENDOR_AOX,
 	    "AOX",
 	},
@@ -5251,6 +5267,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Pilotech",
 	},
 	{
+	    USB_VENDOR_EGALAX,
+	    "eGalax",
+	},
+	{
 	    USB_VENDOR_ITEGNO,
 	    "iTegno",
 	},