diff options
| author | sanpei <sanpei@FreeBSD.org> | 2004-09-03 23:29:01 +0000 |
|---|---|---|
| committer | sanpei <sanpei@FreeBSD.org> | 2004-09-03 23:29:01 +0000 |
| commit | 8d1cad031ed9b957b7008df3ca2893b57bb71cf3 (patch) | |
| tree | 23c34b3da2d54b20f218a8917fd61dabe0da38c6 | |
| parent | 2a3d4ce88cf449b85f9f739976109465f9813001 (diff) | |
| download | FreeBSD-src-8d1cad031ed9b957b7008df3ca2893b57bb71cf3.zip FreeBSD-src-8d1cad031ed9b957b7008df3ca2893b57bb71cf3.tar.gz | |
Add support Nikon CoolScan LS40 ED
PR: kern/71139
Submitted by: Pierre DAVID <Pierre.David@crc.u-strasbg.fr>
MFC after: 1 week
| -rw-r--r-- | share/man/man4/uscanner.4 | 2 | ||||
| -rw-r--r-- | sys/dev/usb/usbdevs | 2 | ||||
| -rw-r--r-- | sys/dev/usb/uscanner.c | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/share/man/man4/uscanner.4 b/share/man/man4/uscanner.4 index 42b40d3..f119a4f 100644 --- a/share/man/man4/uscanner.4 +++ b/share/man/man4/uscanner.4 @@ -182,6 +182,8 @@ Mustek BearPaw 1200TA .It NatSemi BearPaw 1200 .It +Nikon CoolScan LS40 ED +.It Primax 6200 .It Primax Colorado 1200u diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index c6e6b96..ef57d8b 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -1118,6 +1118,7 @@ product NETGEAR FA120 0x1040 USB 2.0 Ethernet adapter /* Nikon products */ product NIKON E990 0x0102 Digital Camera E990 +product NIKON LS40 0x4000 CoolScan LS40 ED /* Olympus products */ product OLYMPUS C1 0x0102 C-1 Digital Camera @@ -1143,7 +1144,6 @@ product PALM TUNGSTEN_T 0x0060 Palm Tungsten T product PALM ZIRE31 0x0061 Palm Zire 31 product PALM ZIRE 0x0070 Palm Zire -/* Panasonic products */ product PANASONIC KXLRW32AN 0x0d09 CD-R Drive KXL-RW32AN product PANASONIC KXLCB20AN 0x0d0a CD-R Drive KXL-CB20AN product PANASONIC KXLCB35AN 0x0d0e DVD-ROM & CD-R/RW diff --git a/sys/dev/usb/uscanner.c b/sys/dev/usb/uscanner.c index fad3dc1..eed75e4 100644 --- a/sys/dev/usb/uscanner.c +++ b/sys/dev/usb/uscanner.c @@ -170,6 +170,9 @@ static const struct uscan_info uscanner_devs[] = { {{ USB_VENDOR_NATIONAL, USB_PRODUCT_NATIONAL_BEARPAW1200 }, 0 }, {{ USB_VENDOR_NATIONAL, USB_PRODUCT_NATIONAL_BEARPAW2400 }, 0 }, + /* Nikon */ + {{ USB_VENDOR_NIKON, USB_PRODUCT_NIKON_LS40 }, 0 }, + /* Primax */ {{ USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2X300 }, 0 }, {{ USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2E300 }, 0 }, |
