From 361e87effa223d77ab3da027169b35fad3254f1b Mon Sep 17 00:00:00 2001 From: Nick Hibma Date: Tue, 5 Sep 2000 12:28:33 +0000 Subject: [PATCH] Regen. --- sys/dev/usb/usbdevs.h | 48 +++++++- sys/dev/usb/usbdevs_data.h | 220 ++++++++++++++++++++++++++++++++++++- 2 files changed, 264 insertions(+), 4 deletions(-) diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h index 5371a2716de1..6133431af14f 100644 --- a/sys/dev/usb/usbdevs.h +++ b/sys/dev/usb/usbdevs.h @@ -4,7 +4,7 @@ * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.32 2000/09/04 15:29:42 n_hibma Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.34 2000/09/05 12:26:37 n_hibma Exp */ /* @@ -85,6 +85,7 @@ #define USB_VENDOR_COMPAQ 0x049f /* Compaq Computers */ #define USB_VENDOR_ACERP 0x04a5 /* Acer Peripherals, Inc. */ #define USB_VENDOR_CANON 0x04a9 /* Canon, Inc. */ +#define USB_VENDOR_VISIONEER 0x04a7 /* Visioneer */ #define USB_VENDOR_IBM 0x04b3 /* IBM Corporation */ #define USB_VENDOR_CYPRESS 0x04b4 /* Cypress Semiconductor */ #define USB_VENDOR_EPSON 0x04b8 /* Seiko Epson Corp. */ @@ -139,6 +140,7 @@ #define USB_VENDOR_ELSA 0x05cc /* ELSA Gmbh */ #define USB_VENDOR_BRAINBOXES 0x05d1 /* Brainboxes Limited */ #define USB_VENDOR_AXIOHM 0x05d9 /* Axiohm Transaction Solutions */ +#define USB_VENDOR_MICROTEK 0x05da /* Microtek */ #define USB_VENDOR_EIZONANAO 0x05e7 /* EIZO Nanao */ #define USB_VENDOR_KLSI 0x05e9 /* Kawasaki LSI */ #define USB_VENDOR_ANKO 0x05ef /* Anko Electronic Co., Ltd. */ @@ -266,6 +268,8 @@ /* Acer Peripherals, Inc. products */ #define USB_PRODUCT_ACERP_ACERSCAN_C310U 0x12a6 /* Acerscan C310U */ +#define USB_PRODUCT_ACERP_ACERSCAN_640U 0x2040 /* Acerscan 640U */ +#define USB_PRODUCT_ACERP_ACERSCAN_620U 0x2060 /* Acerscan 620U */ /* ActiveWire, Inc. products */ #define USB_PRODUCT_ACTIVEWIRE_IOBOARD 0x0100 /* I/O Board */ @@ -280,6 +284,11 @@ /* Agiler products */ #define USB_PRODUCT_ELECOM_MOUSE29UO 0x0002 /* mouse 29UO */ +/* AGFA products */ +#define USB_PRODUCT_AGFA_SNAPSCAN1212U 0x0001 /* SnapScan 1212U */ +#define USB_PRODUCT_AGFA_SNAPSCAN1212U2 0x2061 /* SnapScan 1212U */ +#define USB_PRODUCT_AGFA_SNAPSCANTOUCH 0x0100 /* SnapScan Touch */ + /* AKS products */ #define USB_PRODUCT_AKS_USBHASP 0x0001 /* USB-HASP 0.06 */ @@ -310,6 +319,9 @@ #define USB_PRODUCT_ATEN_UC10T 0x2002 /* 10Mbps ethernet adapter */ #define USB_PRODUCT_ATEN_UC232A 0x2008 /* Serial adapter */ +/* Avision products */ +#define USB_PRODUCT_AVISION_1200U 0x0268 /* 1200U scanner */ + /* Belkin products */ /*product BELKIN F5U111 0x???? F5U111 Ethernet adapter*/ #define USB_PRODUCT_BELKIN2_F5U002 0x0002 /* F5U002 Parallel printer adapter */ @@ -403,6 +415,9 @@ /* Epson products */ #define USB_PRODUCT_EPSON_PRINTER2 0x0002 /* ISD USB Smart Cable for Mac */ #define USB_PRODUCT_EPSON_PRINTER3 0x0003 /* ISD USB Smart Cable */ +#define USB_PRODUCT_EPSON_636 0x0101 /* Perfection 636U / 636Photo scanner */ +#define USB_PRODUCT_EPSON_610 0x0103 /* Perfection 610 scanner */ +#define USB_PRODUCT_EPSON_1200 0x0104 /* Perfection 1200U / 1200Photo scanner */ /* e-TEK Labs products */ #define USB_PRODUCT_ETEK_1COM 0x8007 /* Serial port */ @@ -487,6 +502,7 @@ #define USB_PRODUCT_KYE_NICHE 0x0001 /* Niche mouse */ #define USB_PRODUCT_KYE_NETSCROLL 0x0003 /* Genius NetScroll mouse */ #define USB_PRODUCT_KYE_FLIGHT2000 0x1004 /* Flight 2000 joystick */ +#define USB_PRODUCT_KYE_VIVIDPRO 0x2001 /* ColorPage Vivid-Pro scanner */ /* Lexmark products */ #define USB_PRODUCT_LEXMARK_S2450 0x0009 /* Optra S 2450 */ @@ -535,6 +551,15 @@ #define USB_PRODUCT_MICROSOFT_INTELLIEYE 0x0025 /* IntelliEye mouse */ #define USB_PRODUCT_MICROSOFT_INETPRO 0x002b /* Internet Keyboard Pro */ +/* Microtek products */ +#define USB_PRODUCT_MICROTEK_X6U 0x0099 /* ScanMaker X6 - X6U */ +#define USB_PRODUCT_MICROTEK_336CX 0x0094 /* Phantom 336CX - C3 scanner */ +#define USB_PRODUCT_MICROTEK_336CX2 0x00a0 /* Phantom 336CX - C3 scanner */ +#define USB_PRODUCT_MICROTEK_C6 0x009a /* Phantom C6 scanner */ +#define USB_PRODUCT_MICROTEK_V6USL 0x00a3 /* ScanMaker V6USL */ +#define USB_PRODUCT_MICROTEK_V6USL2 0x80a3 /* ScanMaker V6USL */ +#define USB_PRODUCT_MICROTEK_V6UL 0x80ac /* ScanMaker V6UL */ + /* Midiman products */ #define USB_PRODUCT_MIDIMAN_MIDISPORT2X2 0x1001 /* Midisport 2x2 */ @@ -546,6 +571,7 @@ /* Mustek products */ #define USB_PRODUCT_MUSTEK_MDC800 0xa800 /* MDC-800 digital camera */ +#define USB_PRODUCT_MUSTEK_1200CU 0x0001 /* 1200 CU scanner */ /* NEC products */ #define USB_PRODUCT_NEC_HUB 0x55aa /* hub */ @@ -587,6 +613,16 @@ #define USB_PRODUCT_PRIMAX_COMFORT 0x4d01 /* Comfort */ #define USB_PRODUCT_PRIMAX_MOUSEINABOX 0x4d02 /* Mouse-in-a-Box */ #define USB_PRODUCT_PRIMAX_PCGAUMS1 0x4d04 /* Sony PCGA-UMS1 */ +#define USB_PRODUCT_PRIMAX_G2E300 0x0301 /* G2E-300 scanner */ +#define USB_PRODUCT_PRIMAX_636I 0x0381 /* ReadyScan 636i */ +#define USB_PRODUCT_PRIMAX_G2300 0x0302 /* G2-300 scanner */ +#define USB_PRODUCT_PRIMAX_G2600 0x0382 /* G2-600 scanner */ +#define USB_PRODUCT_PRIMAX_G2E3002 0x0303 /* G2E-300 scanner */ +#define USB_PRODUCT_PRIMAX_G2E600 0x0383 /* G2E-600 scanner */ +#define USB_PRODUCT_PRIMAX_9600 0x0340 /* Colorado USB 9600 scanner */ +#define USB_PRODUCT_PRIMAX_19200 0x0360 /* Colorado USB 19200 scanner */ +#define USB_PRODUCT_PRIMAX_600U 0x0341 /* Colorado 600u scanner */ +#define USB_PRODUCT_PRIMAX_1200U 0x0361 /* Colorado 1200u scanner */ /* Prolific products */ #define USB_PRODUCT_PROLIFIC_PL2301 0x0000 /* PL2301 Host-Host interface */ @@ -649,7 +685,11 @@ #define USB_PRODUCT_THRUST_FUSION_PAD 0xa0a3 /* Fusion Digital Gamepad */ /* UMAX products */ -#define USB_PRODUCT_UMAX_ASTRA_2100U 0x0130 /* Astra 2100U Scanner */ +#define USB_PRODUCT_UMAX_ASTRA1236U 0x0002 /* Astra 1236U Scanner */ +#define USB_PRODUCT_UMAX_ASTRA1220U 0x0010 /* Astra 1220U Scanner */ +#define USB_PRODUCT_UMAX_ASTRA2000U 0x0030 /* Astra 2000U Scanner */ +#define USB_PRODUCT_UMAX_ASTRA2100U 0x0130 /* Astra 2100U Scanner */ +#define USB_PRODUCT_UMAX_ASTRA2200U 0x0230 /* Astra 2200U Scanner */ /* Universal Access products */ #define USB_PRODUCT_UNIACCESS_PANACHE 0x0101 /* Panache Surf USB ISDN Adapter */ @@ -657,6 +697,10 @@ /* Vision products */ #define USB_PRODUCT_VISION_VC6452V002 0x0002 /* CPiA Camera */ +/* Visioneer products */ +#define USB_PRODUCT_VISIONEER_5300 0x0221 /* OneTouch 5300 / 7600 */ +#define USB_PRODUCT_VISIONEER_6100 0x0231 /* OneTouch 6100 */ + /* Wacom products */ #define USB_PRODUCT_WACOM_CT0405U 0x0000 /* CT-0405-U Tablet */ #define USB_PRODUCT_WACOM_GRAPHIRE 0x0010 /* Graphire */ diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h index 6dc3b90758a6..b846451dd0e9 100644 --- a/sys/dev/usb/usbdevs_data.h +++ b/sys/dev/usb/usbdevs_data.h @@ -4,7 +4,7 @@ * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * FreeBSD: src/sys/dev/usb/usbdevs,v 1.32 2000/09/04 15:29:42 n_hibma Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.34 2000/09/05 12:26:37 n_hibma Exp */ /* @@ -99,6 +99,18 @@ struct usb_knowndev usb_knowndevs[] = { "Acer Peripherals, Inc.", "Acerscan C310U", }, + { + USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_640U, + 0, + "Acer Peripherals, Inc.", + "Acerscan 640U", + }, + { + USB_VENDOR_ACERP, USB_PRODUCT_ACERP_ACERSCAN_620U, + 0, + "Acer Peripherals, Inc.", + "Acerscan 620U", + }, { USB_VENDOR_ACTIVEWIRE, USB_PRODUCT_ACTIVEWIRE_IOBOARD, 0, @@ -129,6 +141,24 @@ struct usb_knowndev usb_knowndevs[] = { "Elecom Corp. Ltd.", "mouse 29UO", }, + { + USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCAN1212U, + 0, + "AGFA-Gevaert NV", + "SnapScan 1212U", + }, + { + USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCAN1212U2, + 0, + "AGFA-Gevaert NV", + "SnapScan 1212U", + }, + { + USB_VENDOR_AGFA, USB_PRODUCT_AGFA_SNAPSCANTOUCH, + 0, + "AGFA-Gevaert NV", + "SnapScan Touch", + }, { USB_VENDOR_AKS, USB_PRODUCT_AKS_USBHASP, 0, @@ -219,6 +249,12 @@ struct usb_knowndev usb_knowndevs[] = { "ATEN International Co. Ltd.", "Serial adapter", }, + { + USB_VENDOR_AVISION, USB_PRODUCT_AVISION_1200U, + 0, + "Avision, Inc.", + "1200U scanner", + }, { USB_VENDOR_BELKIN2, USB_PRODUCT_BELKIN2_F5U002, 0, @@ -483,6 +519,24 @@ struct usb_knowndev usb_knowndevs[] = { "Seiko Epson Corp.", "ISD USB Smart Cable", }, + { + USB_VENDOR_EPSON, USB_PRODUCT_EPSON_636, + 0, + "Seiko Epson Corp.", + "Perfection 636U / 636Photo scanner", + }, + { + USB_VENDOR_EPSON, USB_PRODUCT_EPSON_610, + 0, + "Seiko Epson Corp.", + "Perfection 610 scanner", + }, + { + USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1200, + 0, + "Seiko Epson Corp.", + "Perfection 1200U / 1200Photo scanner", + }, { USB_VENDOR_ETEK, USB_PRODUCT_ETEK_1COM, 0, @@ -735,6 +789,12 @@ struct usb_knowndev usb_knowndevs[] = { "KYE Systems Corp.", "Flight 2000 joystick", }, + { + USB_VENDOR_KYE, USB_PRODUCT_KYE_VIVIDPRO, + 0, + "KYE Systems Corp.", + "ColorPage Vivid-Pro scanner", + }, { USB_VENDOR_LEXMARK, USB_PRODUCT_LEXMARK_S2450, 0, @@ -921,6 +981,48 @@ struct usb_knowndev usb_knowndevs[] = { "Microsoft", "Internet Keyboard Pro", }, + { + USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_X6U, + 0, + "Microtek", + "ScanMaker X6 - X6U", + }, + { + USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_336CX, + 0, + "Microtek", + "Phantom 336CX - C3 scanner", + }, + { + USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_336CX2, + 0, + "Microtek", + "Phantom 336CX - C3 scanner", + }, + { + USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_C6, + 0, + "Microtek", + "Phantom C6 scanner", + }, + { + USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_V6USL, + 0, + "Microtek", + "ScanMaker V6USL", + }, + { + USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_V6USL2, + 0, + "Microtek", + "ScanMaker V6USL", + }, + { + USB_VENDOR_MICROTEK, USB_PRODUCT_MICROTEK_V6UL, + 0, + "Microtek", + "ScanMaker V6UL", + }, { USB_VENDOR_MIDIMAN, USB_PRODUCT_MIDIMAN_MIDISPORT2X2, 0, @@ -945,6 +1047,12 @@ struct usb_knowndev usb_knowndevs[] = { "Mustek Systems, Inc.", "MDC-800 digital camera", }, + { + USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200CU, + 0, + "Mustek Systems, Inc.", + "1200 CU scanner", + }, { USB_VENDOR_NEC, USB_PRODUCT_NEC_HUB, 0, @@ -1071,6 +1179,66 @@ struct usb_knowndev usb_knowndevs[] = { "Primax Electronics", "Sony PCGA-UMS1", }, + { + USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E300, + 0, + "Primax Electronics", + "G2E-300 scanner", + }, + { + USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_636I, + 0, + "Primax Electronics", + "ReadyScan 636i", + }, + { + USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2300, + 0, + "Primax Electronics", + "G2-300 scanner", + }, + { + USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2600, + 0, + "Primax Electronics", + "G2-600 scanner", + }, + { + USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E3002, + 0, + "Primax Electronics", + "G2E-300 scanner", + }, + { + USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E600, + 0, + "Primax Electronics", + "G2E-600 scanner", + }, + { + USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_9600, + 0, + "Primax Electronics", + "Colorado USB 9600 scanner", + }, + { + USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_19200, + 0, + "Primax Electronics", + "Colorado USB 19200 scanner", + }, + { + USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_600U, + 0, + "Primax Electronics", + "Colorado 600u scanner", + }, + { + USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_1200U, + 0, + "Primax Electronics", + "Colorado 1200u scanner", + }, { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2301, 0, @@ -1198,11 +1366,35 @@ struct usb_knowndev usb_knowndevs[] = { "Fusion Digital Gamepad", }, { - USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA_2100U, + USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1236U, + 0, + "UMAX Data Systems, Inc.", + "Astra 1236U Scanner", + }, + { + USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1220U, + 0, + "UMAX Data Systems, Inc.", + "Astra 1220U Scanner", + }, + { + USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2000U, + 0, + "UMAX Data Systems, Inc.", + "Astra 2000U Scanner", + }, + { + USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2100U, 0, "UMAX Data Systems, Inc.", "Astra 2100U Scanner", }, + { + USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA2200U, + 0, + "UMAX Data Systems, Inc.", + "Astra 2200U Scanner", + }, { USB_VENDOR_UNIACCESS, USB_PRODUCT_UNIACCESS_PANACHE, 0, @@ -1215,6 +1407,18 @@ struct usb_knowndev usb_knowndevs[] = { "VLSI Vision Ltd.", "CPiA Camera", }, + { + USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_5300, + 0, + "Visioneer", + "OneTouch 5300 / 7600", + }, + { + USB_VENDOR_VISIONEER, USB_PRODUCT_VISIONEER_6100, + 0, + "Visioneer", + "OneTouch 6100", + }, { USB_VENDOR_WACOM, USB_PRODUCT_WACOM_CT0405U, 0, @@ -1467,6 +1671,12 @@ struct usb_knowndev usb_knowndevs[] = { "Canon, Inc.", NULL, }, + { + USB_VENDOR_VISIONEER, 0, + USB_KNOWNDEV_NOPROD, + "Visioneer", + NULL, + }, { USB_VENDOR_IBM, 0, USB_KNOWNDEV_NOPROD, @@ -1791,6 +2001,12 @@ struct usb_knowndev usb_knowndevs[] = { "Axiohm Transaction Solutions", NULL, }, + { + USB_VENDOR_MICROTEK, 0, + USB_KNOWNDEV_NOPROD, + "Microtek", + NULL, + }, { USB_VENDOR_EIZONANAO, 0, USB_KNOWNDEV_NOPROD,