From 95b1c9ac5d22d6bcc5d4abe03dd2eea96966824f Mon Sep 17 00:00:00 2001
From: Nick Hibma <n_hibma@FreeBSD.org>
Date: Thu, 8 Apr 1999 23:13:17 +0000
Subject: [PATCH] 1) Add AKS USB-HASP 0.6 2) Rename Lucent -> Epson    (Undoes
 previous commit, Mike agrees)

---
 sys/dev/usb/usbdevs.h      | 17 +++++++++++------
 sys/dev/usb/usbdevs_data.h | 36 +++++++++++++++++++++++++++---------
 2 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 0c3da236bf2..7adf0c9c1fa 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -64,12 +64,13 @@
 #define	USB_VENDOR_CONNECTIX	0x0478		/* Connectix */
 #define	USB_VENDOR_ACER	0x04a5		/* Acer Peripherals */
 #define	USB_VENDOR_CYPRESS	0x04b4		/* Cypress Semiconductor */
-#define USB_VENDOR_LUCENT	0x04b8		/* Lucent Technologies */
+#define	USB_VENDOR_EPSON	0x04b8		/* Epson */
 #define	USB_VENDOR_3COM	0x04c1		/* 3Com */
 #define	USB_VENDOR_KONICA	0x04c8		/* Konica Corporation */
 #define	USB_VENDOR_SHUTTLE	0x04e6		/* Shuttle Technology */
 #define	USB_VENDOR_JAZZ	0x04fa		/* Jazz */
 #define	USB_VENDOR_VISION	0x0553		/* Vision */
+#define	USB_VENDOR_AKS	0x0529		/* Aladdin Knowledge Systems */
 #define	USB_VENDOR_ATEN	0x0557		/* ATen */
 #define	USB_VENDOR_PERACOM	0x0565		/* Peracom */
 #define	USB_VENDOR_EIZO	0x056d		/* EIZO */
@@ -134,8 +135,8 @@
 /* Cypress Semiconduuctor products */
 #define	USB_PRODUCT_CYPRESS_MOUSE	0x0001		/* mouse */
 
-/* Lucent Technologies products */
-#define USB_PRODUCT_LUCENT_1284_BRIDGE	0x0003		/* printer adapter */
+/* Epson products */
+#define	USB_PRODUCT_EPSON_PRINTER3	0x0003		/* printer adapter */
 
 /* 3Com products */
 #define	USB_PRODUCT_3COM_USR56K	0x3021		/* U.S.Robotics 56000 Voice USB Modem */
@@ -152,6 +153,9 @@
 /* Vision products */
 #define	USB_PRODUCT_VISION_CAMERA	0x0002		/* VC6452V002 Camera */
 
+/* AKS products */
+#define	USB_PRODUCT_AKS_USBHASP	0x0001		/* USB-HASP 0.06 */
+
 /* ATen products */
 #define	USB_PRODUCT_ATEN_UC1284	0x2001		/* Parallel printer adapter */
 
@@ -184,12 +188,13 @@
 /* ADS products */
 #define	USB_PRODUCT_ADS_ENET	0x0008		/* Ethernet adapter */
 
-/* PLX products */
-#define	USB_PRODUCT_PLX_TESTBOARD	0x9060		/* test board */
-
+/* Entrega products */
 #define	USB_PRODUCT_ENTREGA_CENTRONICS	0x0006		/* Centronics connector */
 #define	USB_PRODUCT_ENTREGA_SERIAL	0x8001		/* DB25 Serial connector */
 
+/* PLX products */
+#define	USB_PRODUCT_PLX_TESTBOARD	0x9060		/* test board */
+
 /* Inside Out Networks products */
 #define	USB_PRODUCT_INSIDEOUT_EDGEPORT4	0x0001		/* EdgePort/4 serial ports */
 
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 84619efbcdc..761ac7d04f8 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -154,10 +154,10 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "mouse",
 	},
 	{
-	    USB_VENDOR_LUCENT, USB_PRODUCT_LUCENT_1284_BRIDGE,
+	    USB_VENDOR_EPSON, USB_PRODUCT_EPSON_PRINTER3,
 	    0,
-	    "Lucent Technologies",
-	    "USB Smart Cable",
+	    "Epson",
+	    "printer adapter",
 	},
 	{
 	    USB_VENDOR_3COM, USB_PRODUCT_3COM_USR56K,
@@ -189,6 +189,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Vision",
 	    "VC6452V002 Camera",
 	},
+	{
+	    USB_VENDOR_AKS, USB_PRODUCT_AKS_USBHASP,
+	    0,
+	    "Aladdin Knowledge Systems",
+	    "USB-HASP 0.06",
+	},
 	{
 	    USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC1284,
 	    0,
@@ -261,12 +267,6 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "ADS Technologies",
 	    "Ethernet adapter",
 	},
-	{
-	    USB_VENDOR_PLX, USB_PRODUCT_PLX_TESTBOARD,
-	    0,
-	    "PLX",
-	    "test board",
-	},
 	{
 	    USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_CENTRONICS,
 	    0,
@@ -279,6 +279,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Entrega",
 	    "DB25 Serial connector",
 	},
+	{
+	    USB_VENDOR_PLX, USB_PRODUCT_PLX_TESTBOARD,
+	    0,
+	    "PLX",
+	    "test board",
+	},
 	{
 	    USB_VENDOR_INSIDEOUT, USB_PRODUCT_INSIDEOUT_EDGEPORT4,
 	    0,
@@ -375,6 +381,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Cypress Semiconductor",
 	    NULL,
 	},
+	{
+	    USB_VENDOR_EPSON, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Epson",
+	    NULL,
+	},
 	{
 	    USB_VENDOR_3COM, 0,
 	    USB_KNOWNDEV_NOPROD,
@@ -405,6 +417,12 @@ struct usb_knowndev usb_knowndevs[] = {
 	    "Vision",
 	    NULL,
 	},
+	{
+	    USB_VENDOR_AKS, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Aladdin Knowledge Systems",
+	    NULL,
+	},
 	{
 	    USB_VENDOR_ATEN, 0,
 	    USB_KNOWNDEV_NOPROD,