diff options
| -rw-r--r-- | sys/dev/usb/usbdevs.h | 12 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs_data.h | 42 | ||||
| -rw-r--r-- | sys/dev/usb/uscanner.c | 10 |
3 files changed, 55 insertions, 9 deletions
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h index d9646c1..c29b39e 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.61 2001/07/05 09:35:46 n_hibma Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.62 2001/08/21 21:35:40 n_hibma Exp */ /* @@ -182,6 +182,7 @@ #define USB_VENDOR_QTRONIX 0x05c7 /* Qtronix Corp */ #define USB_VENDOR_ELSA 0x05cc /* ELSA Gmbh */ #define USB_VENDOR_BRAINBOXES 0x05d1 /* Brainboxes Limited */ +#define USB_VENDOR_ULTIMA 0x05d8 /* Ultima */ #define USB_VENDOR_AXIOHM 0x05d9 /* Axiohm Transaction Solutions */ #define USB_VENDOR_MICROTEK 0x05da /* Microtek */ #define USB_VENDOR_LEXAR 0x05dc /* Lexar Media */ @@ -745,13 +746,17 @@ #define USB_PRODUCT_MUSTEK_600CU 0x0002 /* 600 CU scanner */ #define USB_PRODUCT_MUSTEK_1200USB 0x0003 /* 1200 USB scanner */ #define USB_PRODUCT_MUSTEK_1200UB 0x0006 /* 1200 UB scanner */ +#define USB_PRODUCT_MUSTEK_1200USBPLUS 0x0007 /* 1200 USB Plus scanner */ +#define USB_PRODUCT_MUSTEK_BEARPAW1200F 0x0010 /* BearPaw 1200F scanner */ +#define USB_PRODUCT_MUSTEK_600USB 0x0873 /* 600 USB scanner */ #define USB_PRODUCT_MUSTEK_MDC800 0xa800 /* MDC-800 digital camera */ /* M-Systems products */ #define USB_PRODUCT_MSYSTEMS_DISKONKEY 0x0010 /* DiskOnKey */ /* National Semiconductor */ -#define USB_PRODUCT_NATIONAL_BEARPAW 0x1000 /* BearPaw 1200 */ +#define USB_PRODUCT_NATIONAL_BEARPAW1200 0x1000 /* BearPaw 1200 scanner */ +#define USB_PRODUCT_NATIONAL_BEARPAW2400 0x1001 /* BearPaw 2400 scanner */ /* NEC products */ #define USB_PRODUCT_NEC_HUB 0x55aa /* hub */ @@ -930,6 +935,9 @@ /* Trek Technology products */ #define USB_PRODUCT_TREK_THUMBDRIVE 0x1111 /* ThumbDrive */ +/* Ultima products */ +#define USB_PRODUCT_ULTIMA_1200UBPLUS 0x4002 /* 1200 UB Plus scanner */ + /* UMAX products */ #define USB_PRODUCT_UMAX_ASTRA1236U 0x0002 /* Astra 1236U Scanner */ #define USB_PRODUCT_UMAX_ASTRA1220U 0x0010 /* Astra 1220U Scanner */ diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h index 724a758..de33da4 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.61 2001/07/05 09:35:46 n_hibma Exp + * FreeBSD: src/sys/dev/usb/usbdevs,v 1.62 2001/08/21 21:35:40 n_hibma Exp */ /* @@ -1486,6 +1486,24 @@ struct usb_knowndev usb_knowndevs[] = { "1200 UB scanner", }, { + USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200USBPLUS, + 0, + "Mustek Systems, Inc.", + "1200 USB Plus scanner", + }, + { + USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_BEARPAW1200F, + 0, + "Mustek Systems, Inc.", + "BearPaw 1200F scanner", + }, + { + USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_600USB, + 0, + "Mustek Systems, Inc.", + "600 USB scanner", + }, + { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_MDC800, 0, "Mustek Systems, Inc.", @@ -1498,10 +1516,16 @@ struct usb_knowndev usb_knowndevs[] = { "DiskOnKey", }, { - USB_VENDOR_NATIONAL, USB_PRODUCT_NATIONAL_BEARPAW, + USB_VENDOR_NATIONAL, USB_PRODUCT_NATIONAL_BEARPAW1200, 0, "National Semiconductor", - "BearPaw 1200", + "BearPaw 1200 scanner", + }, + { + USB_VENDOR_NATIONAL, USB_PRODUCT_NATIONAL_BEARPAW2400, + 0, + "National Semiconductor", + "BearPaw 2400 scanner", }, { USB_VENDOR_NEC, USB_PRODUCT_NEC_HUB, @@ -2068,6 +2092,12 @@ struct usb_knowndev usb_knowndevs[] = { "ThumbDrive", }, { + USB_VENDOR_ULTIMA, USB_PRODUCT_ULTIMA_1200UBPLUS, + 0, + "Ultima", + "1200 UB Plus scanner", + }, + { USB_VENDOR_UMAX, USB_PRODUCT_UMAX_ASTRA1236U, 0, "UMAX Data Systems, Inc.", @@ -2926,6 +2956,12 @@ struct usb_knowndev usb_knowndevs[] = { NULL, }, { + USB_VENDOR_ULTIMA, 0, + USB_KNOWNDEV_NOPROD, + "Ultima", + NULL, + }, + { USB_VENDOR_AXIOHM, 0, USB_KNOWNDEV_NOPROD, "Axiohm Transaction Solutions", diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c index 4a4c4c5..5a13a23 100644 --- a/sys/dev/usb/uscanner.c +++ b/sys/dev/usb/uscanner.c @@ -123,10 +123,12 @@ static const struct scanner_id { /* Mustek */ { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200CU }, - { USB_VENDOR_NATIONAL, USB_PRODUCT_NATIONAL_BEARPAW }, - { USB_VENDOR_NATIONAL, USB_PRODUCT_MUSTEK_600CU }, - { USB_VENDOR_NATIONAL, USB_PRODUCT_MUSTEK_1200USB }, - { USB_VENDOR_NATIONAL, USB_PRODUCT_MUSTEK_1200UB }, + { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_600CU }, + { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200USB }, + { USB_VENDOR_MUSTEK, USB_PRODUCT_MUSTEK_1200UB }, + + /* National */ + { USB_VENDOR_NATIONAL, USB_PRODUCT_NATIONAL_BEARPAW1200 }, /* Primax */ { USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2X300 }, |
