View | Details | Raw Unified | Return to bug 98106
Collapse All | Expand All

(-)sys/dev/usb/uscanner.c (+4 lines)
Lines 123-128 Link Here
123
  /* Canon */
123
  /* Canon */
124
 {{ USB_VENDOR_CANON, USB_PRODUCT_CANON_N656U }, 0 },
124
 {{ USB_VENDOR_CANON, USB_PRODUCT_CANON_N656U }, 0 },
125
 {{ USB_VENDOR_CANON, USB_PRODUCT_CANON_N676U }, 0 },
125
 {{ USB_VENDOR_CANON, USB_PRODUCT_CANON_N676U }, 0 },
126
 {{ USB_VENDOR_CANON, USB_PRODUCT_CANON_LIDE20 }, 0 }, 
127
 {{ USB_VENDOR_CANON, USB_PRODUCT_CANON_LIDE25 }, 0 }, 
128
 {{ USB_VENDOR_CANON, USB_PRODUCT_CANON_LIDE30 }, 0 }, 
126
 {{ USB_VENDOR_CANON, USB_PRODUCT_CANON_N1220U }, 0 },
129
 {{ USB_VENDOR_CANON, USB_PRODUCT_CANON_N1220U }, 0 },
127
 {{ USB_VENDOR_CANON, USB_PRODUCT_CANON_N1240U }, 0 },
130
 {{ USB_VENDOR_CANON, USB_PRODUCT_CANON_N1240U }, 0 },
128
131
Lines 203-208 Link Here
203
 {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1660 }, 0 },
206
 {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1660 }, 0 },
204
 {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1670 }, 0 },
207
 {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1670 }, 0 },
205
 {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1260 }, 0 },
208
 {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1260 }, 0 },
209
 {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_1270 }, 0 },
206
 {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_3200 }, USC_KEEP_OPEN },
210
 {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_3200 }, USC_KEEP_OPEN },
207
 {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_GT9700F }, USC_KEEP_OPEN },
211
 {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_GT9700F }, USC_KEEP_OPEN },
208
 {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_GT9300UF }, 0 },
212
 {{ USB_VENDOR_EPSON, USB_PRODUCT_EPSON_GT9300UF }, 0 },
(-)sys/dev/usb/usbdevs (+4 lines)
Lines 707-712 Link Here
707
product CANON N1220U		0x2207	CanoScan N1220U
707
product CANON N1220U		0x2207	CanoScan N1220U
708
product CANON N676U		0x220d	CanoScan N676U
708
product CANON N676U		0x220d	CanoScan N676U
709
product CANON N1240U		0x220e	CanoScan N1240U
709
product CANON N1240U		0x220e	CanoScan N1240U
710
product CANON LIDE20		0x220d	CanoScan LiDE 20
711
product CANON LIDE25		0x2220	CanoScan LiDE 25
712
product CANON LIDE30		0x220e	CanoScan LiDE 30
710
product CANON S10		0x3041	PowerShot S10
713
product CANON S10		0x3041	PowerShot S10
711
product CANON S100		0x3045	PowerShot S100
714
product CANON S100		0x3045	PowerShot S100
712
product CANON S200		0x3065	PowerShot S200
715
product CANON S200		0x3065	PowerShot S200
Lines 856-861 Link Here
856
product EPSON GT9300UF		0x011b	GT-9300UF scanner
859
product EPSON GT9300UF		0x011b	GT-9300UF scanner
857
product EPSON 3200		0x011c	Perfection 3200 scanner
860
product EPSON 3200		0x011c	Perfection 3200 scanner
858
product EPSON 1260		0x011d	Perfection 1260 scanner
861
product EPSON 1260		0x011d	Perfection 1260 scanner
862
product EPSON 1270		0x0120	Perfection 1270 scanner
859
product EPSON 1660		0x011e	Perfection 1660 scanner
863
product EPSON 1660		0x011e	Perfection 1660 scanner
860
product EPSON 1670		0x011f	Perfection 1670 scanner
864
product EPSON 1670		0x011f	Perfection 1670 scanner
861
865
(-)share/man/man4/uscanner.4 (-4 lines)
Lines 100-107 Link Here
100
.It
100
.It
101
Canon CanoScan LIDE 20
101
Canon CanoScan LIDE 20
102
.It
102
.It
103
Canon CanoScan LIDE 25
104
.It
105
Canon CanoScan LIDE 30
103
Canon CanoScan LIDE 30
106
.It
104
.It
107
Epson Perfection 610
105
Epson Perfection 610
Lines 117-124 Link Here
117
Epson Perfection 1250
115
Epson Perfection 1250
118
.It
116
.It
119
Epson Perfection 1260
117
Epson Perfection 1260
120
.It
121
Epson Perfection 1270
122
.It
118
.It
123
Epson Expression 1600
119
Epson Expression 1600
124
.It
120
.It

Return to bug 98106