Fri Sep 19 11:29:35 2008 UTC ()
Remove qcm driver definition that slipped in accidentally on the previous
commit, pointed out by cegger


(jmcneill)
diff -r1.88 -r1.89 src/sys/dev/usb/files.usb
cvs diff -r1.88 -r1.89 src/sys/dev/usb/files.usb (switch to unified diff)

--- src/sys/dev/usb/files.usb 2008/09/18 16:40:37 1.88
+++ src/sys/dev/usb/files.usb 2008/09/19 11:29:35 1.89
@@ -1,328 +1,323 @@ @@ -1,328 +1,323 @@
1# $NetBSD: files.usb,v 1.88 2008/09/18 16:40:37 jmcneill Exp $ 1# $NetBSD: files.usb,v 1.89 2008/09/19 11:29:35 jmcneill Exp $
2# 2#
3# Config file and device description for machine-independent USB code. 3# Config file and device description for machine-independent USB code.
4# Included by ports that need it. Ports that use it must provide 4# Included by ports that need it. Ports that use it must provide
5# their own "major" declarations for the appropriate devices. 5# their own "major" declarations for the appropriate devices.
6 6
7defflag USBVERBOSE 7defflag USBVERBOSE
8 8
9defflag opt_uvideo.h UVIDEO_DEBUG 9defflag opt_uvideo.h UVIDEO_DEBUG
10 10
11define usbroothubif { } 11define usbroothubif { }
12define usbdevif { [port = -1], [configuration = -1], [interface = -1], 12define usbdevif { [port = -1], [configuration = -1], [interface = -1],
13 [vendor = -1], [product = -1], [release = -1] } 13 [vendor = -1], [product = -1], [release = -1] }
14define usbifif { [port = -1], [configuration = -1], [interface = -1], 14define usbifif { [port = -1], [configuration = -1], [interface = -1],
15 [vendor = -1], [product = -1], [release = -1] } 15 [vendor = -1], [product = -1], [release = -1] }
16 16
17device usb: usbroothubif 17device usb: usbroothubif
18attach usb at usbus 18attach usb at usbus
19file dev/usb/usb.c usb needs-flag 19file dev/usb/usb.c usb needs-flag
20file dev/usb/usbdi.c usb 20file dev/usb/usbdi.c usb
21file dev/usb/usbdi_util.c usb 21file dev/usb/usbdi_util.c usb
22file dev/usb/usb_mem.c usb 22file dev/usb/usb_mem.c usb
23file dev/usb/usb_subr.c usb 23file dev/usb/usb_subr.c usb
24file dev/usb/usb_quirks.c usb 24file dev/usb/usb_quirks.c usb
25 25
26# Hub driver 26# Hub driver
27device uhub: usbdevif, usbifif 27device uhub: usbdevif, usbifif
28attach uhub at usbroothubif with uroothub 28attach uhub at usbroothubif with uroothub
29attach uhub at usbdevif 29attach uhub at usbdevif
30file dev/usb/uhub.c usb 30file dev/usb/uhub.c usb
31 31
32# Modem and com serial port "bus" 32# Modem and com serial port "bus"
33define ucombus {[ portno = -1 ]} 33define ucombus {[ portno = -1 ]}
34 34
35# EZ-USB firmware loader 35# EZ-USB firmware loader
36define ezload 36define ezload
37file dev/usb/ezload.c ezload 37file dev/usb/ezload.c ezload
38 38
39# Audio devices 39# Audio devices
40device uaudio: audiobus, auconv, mulaw, aurateconv 40device uaudio: audiobus, auconv, mulaw, aurateconv
41attach uaudio at usbifif 41attach uaudio at usbifif
42file dev/usb/uaudio.c uaudio 42file dev/usb/uaudio.c uaudio
43 43
44# MIDI devices 44# MIDI devices
45device umidi: midibus 45device umidi: midibus
46attach umidi at usbifif 46attach umidi at usbifif
47file dev/usb/umidi.c umidi 47file dev/usb/umidi.c umidi
48file dev/usb/umidi_quirks.c umidi 48file dev/usb/umidi_quirks.c umidi
49 49
50# Modem and com serial port 50# Modem and com serial port
51device ucom 51device ucom
52attach ucom at ucombus 52attach ucom at ucombus
53file dev/usb/ucom.c ucom | ucombus needs-flag 53file dev/usb/ucom.c ucom | ucombus needs-flag
54 54
55 55
56# Generic devices 56# Generic devices
57defflag UGEN_BULK_RA_WB 57defflag UGEN_BULK_RA_WB
58device ugen 58device ugen
59attach ugen at usbdevif 59attach ugen at usbdevif
60file dev/usb/ugen.c ugen needs-flag 60file dev/usb/ugen.c ugen needs-flag
61 61
62 62
63# HID 63# HID
64# HID "bus" 64# HID "bus"
65define uhidbus {[ reportid = -1 ]} 65define uhidbus {[ reportid = -1 ]}
66 66
67# HID root device for multiple report IDs 67# HID root device for multiple report IDs
68device uhidev: hid, uhidbus 68device uhidev: hid, uhidbus
69attach uhidev at usbifif 69attach uhidev at usbifif
70file dev/usb/uhidev.c uhidev 70file dev/usb/uhidev.c uhidev
71 71
72# Generic HID devices 72# Generic HID devices
73device uhid: hid 73device uhid: hid
74attach uhid at uhidbus 74attach uhid at uhidbus
75file dev/usb/uhid.c uhid needs-flag 75file dev/usb/uhid.c uhid needs-flag
76 76
77# Keyboards 77# Keyboards
78defparam UKBD_LAYOUT 78defparam UKBD_LAYOUT
79device ukbd: hid, wskbddev 79device ukbd: hid, wskbddev
80attach ukbd at uhidbus 80attach ukbd at uhidbus
81file dev/usb/ukbd.c ukbd needs-flag 81file dev/usb/ukbd.c ukbd needs-flag
82file dev/usb/ukbdmap.c ukbd | btkbd 82file dev/usb/ukbdmap.c ukbd | btkbd
83 83
84# Mice 84# Mice
85device ums: hid, wsmousedev 85device ums: hid, wsmousedev
86attach ums at uhidbus 86attach ums at uhidbus
87file dev/usb/ums.c ums 87file dev/usb/ums.c ums
88 88
89# eGalax USB Touch Panel 89# eGalax USB Touch Panel
90device uep: wsmousedev, tpcalib 90device uep: wsmousedev, tpcalib
91attach uep at usbdevif 91attach uep at usbdevif
92file dev/usb/uep.c uep needs-flag 92file dev/usb/uep.c uep needs-flag
93 93
94# Cypress microcontroller based serial adpaters 94# Cypress microcontroller based serial adpaters
95device ucycom: hid 95device ucycom: hid
96attach ucycom at uhidbus 96attach ucycom at uhidbus
97file dev/usb/ucycom.c ucycom needs-flag 97file dev/usb/ucycom.c ucycom needs-flag
98 98
99# Printers 99# Printers
100device ulpt 100device ulpt
101attach ulpt at usbifif 101attach ulpt at usbifif
102file dev/usb/ulpt.c ulpt needs-flag 102file dev/usb/ulpt.c ulpt needs-flag
103 103
104 104
105# Mass storage 105# Mass storage
106device umass: scsi, atapi, ata_hl 106device umass: scsi, atapi, ata_hl
107attach umass at usbifif 107attach umass at usbifif
108file dev/usb/umass.c umass 108file dev/usb/umass.c umass
109file dev/usb/umass_isdata.c umass & wd 109file dev/usb/umass_isdata.c umass & wd
110file dev/usb/umass_quirks.c umass 110file dev/usb/umass_quirks.c umass
111file dev/usb/umass_scsipi.c umass & (scsibus | atapibus) 111file dev/usb/umass_scsipi.c umass & (scsibus | atapibus)
112 112
113 113
114# IrDA bridges 114# IrDA bridges
115device uirda: irbus 115device uirda: irbus
116attach uirda at usbifif 116attach uirda at usbifif
117file dev/usb/uirda.c uirda | stuirda 117file dev/usb/uirda.c uirda | stuirda
118 118
119# SigmaTel not quite UIRDA IrDA bridge 119# SigmaTel not quite UIRDA IrDA bridge
120device stuirda: irbus,firmload 120device stuirda: irbus,firmload
121attach stuirda at usbifif 121attach stuirda at usbifif
122file dev/usb/stuirda.c stuirda 122file dev/usb/stuirda.c stuirda
123 123
124# SigmaTel IrDA bridge 124# SigmaTel IrDA bridge
125device ustir: irbus, irdasir 125device ustir: irbus, irdasir
126attach ustir at usbdevif 126attach ustir at usbdevif
127file dev/usb/ustir.c ustir 127file dev/usb/ustir.c ustir
128 128
129 129
130# Bluetooth controllers 130# Bluetooth controllers
131device ubt: btbus, bluetooth 131device ubt: btbus, bluetooth
132attach ubt at usbdevif 132attach ubt at usbdevif
133file dev/usb/ubt.c ubt 133file dev/usb/ubt.c ubt
134 134
135# 135#
136# Capture devices 136# Capture devices
137# 137#
138 138
139# Sony PLAYSTATION(R) Eye 139# Sony PLAYSTATION(R) Eye
140device pseye: videobus 140device pseye: videobus
141attach pseye at usbifif 141attach pseye at usbifif
142file dev/usb/pseye.c pseye 142file dev/usb/pseye.c pseye
143 143
144# Logitech QuickCam Messenger 
145device qcm: videobus 
146attach qcm at usbifif 
147file dev/usb/qcm.c qcm 
148 
149# USB Video Class capture devices 144# USB Video Class capture devices
150device uvideo: videobus 145device uvideo: videobus
151attach uvideo at usbifif 146attach uvideo at usbifif
152file dev/usb/uvideo.c uvideo 147file dev/usb/uvideo.c uvideo
153 148
154# 149#
155# Misc 150# Misc
156# 151#
157 152
158# Diamond Multimedia Rio 500 153# Diamond Multimedia Rio 500
159device urio 154device urio
160attach urio at usbdevif 155attach urio at usbdevif
161file dev/usb/urio.c urio needs-flag 156file dev/usb/urio.c urio needs-flag
162 157
163# BlackBerries 158# BlackBerries
164device uberry 159device uberry
165attach uberry at usbdevif 160attach uberry at usbdevif
166file dev/usb/uberry.c uberry 161file dev/usb/uberry.c uberry
167 162
168# Handspring Visor 163# Handspring Visor
169device uvisor: ucombus 164device uvisor: ucombus
170attach uvisor at usbdevif 165attach uvisor at usbdevif
171file dev/usb/uvisor.c uvisor 166file dev/usb/uvisor.c uvisor
172 167
173# Generic Serial Adapter 168# Generic Serial Adapter
174device ugensa: ucombus 169device ugensa: ucombus
175attach ugensa at usbdevif 170attach ugensa at usbdevif
176file dev/usb/ugensa.c ugensa 171file dev/usb/ugensa.c ugensa
177 172
178# YAP phone firmware loader 173# YAP phone firmware loader
179device uyap: ezload 174device uyap: ezload
180attach uyap at usbdevif 175attach uyap at usbdevif
181file dev/usb/uyap.c uyap 176file dev/usb/uyap.c uyap
182 177
183# D-Link DSB-R100 FM radio 178# D-Link DSB-R100 FM radio
184device udsbr: radiodev 179device udsbr: radiodev
185attach udsbr at usbdevif 180attach udsbr at usbdevif
186file dev/usb/udsbr.c udsbr 181file dev/usb/udsbr.c udsbr
187 182
188 183
189# Ethernet adapters 184# Ethernet adapters
190# ADMtek AN986 Pegasus 185# ADMtek AN986 Pegasus
191device aue: arp, ether, ifnet, mii, mii_phy 186device aue: arp, ether, ifnet, mii, mii_phy
192attach aue at usbdevif 187attach aue at usbdevif
193file dev/usb/if_aue.c aue 188file dev/usb/if_aue.c aue
194 189
195# CDC Ethernet 190# CDC Ethernet
196device cdce: arp, ether, ifnet 191device cdce: arp, ether, ifnet
197attach cdce at usbifif 192attach cdce at usbifif
198file dev/usb/if_cdce.c cdce 193file dev/usb/if_cdce.c cdce
199 194
200# CATC USB-EL1201A 195# CATC USB-EL1201A
201device cue: arp, ether, ifnet 196device cue: arp, ether, ifnet
202attach cue at usbdevif 197attach cue at usbdevif
203file dev/usb/if_cue.c cue 198file dev/usb/if_cue.c cue
204 199
205# Kawasaki LSI KL5KUSB101B 200# Kawasaki LSI KL5KUSB101B
206device kue: arp, ether, ifnet 201device kue: arp, ether, ifnet
207attach kue at usbdevif 202attach kue at usbdevif
208file dev/usb/if_kue.c kue 203file dev/usb/if_kue.c kue
209 204
210# Prolific PL2302 host-host 205# Prolific PL2302 host-host
211device upl: ifnet 206device upl: ifnet
212attach upl at usbdevif 207attach upl at usbdevif
213file dev/usb/if_upl.c upl 208file dev/usb/if_upl.c upl
214 209
215# Realtek RTL8150L(M) 210# Realtek RTL8150L(M)
216device url: arp, ether, ifnet, mii 211device url: arp, ether, ifnet, mii
217attach url at usbdevif 212attach url at usbdevif
218file dev/usb/if_url.c url 213file dev/usb/if_url.c url
219 214
220# ASIX AX88172 215# ASIX AX88172
221device axe: arp, ether, ifnet, mii, mii_phy 216device axe: arp, ether, ifnet, mii, mii_phy
222attach axe at usbdevif 217attach axe at usbdevif
223file dev/usb/if_axe.c axe 218file dev/usb/if_axe.c axe
224 219
225# DAVICOM DM9601 220# DAVICOM DM9601
226device udav: arp, ether, ifnet, mii, mii_phy 221device udav: arp, ether, ifnet, mii, mii_phy
227attach udav at usbdevif 222attach udav at usbdevif
228file dev/usb/if_udav.c udav 223file dev/usb/if_udav.c udav
229 224
230 225
231# Serial drivers 226# Serial drivers
232# Modems 227# Modems
233define umodem_common 228define umodem_common
234file dev/usb/umodem_common.c umodem_common 229file dev/usb/umodem_common.c umodem_common
235device umodem: ucombus, umodem_common 230device umodem: ucombus, umodem_common
236attach umodem at usbifif 231attach umodem at usbifif
237file dev/usb/umodem.c umodem 232file dev/usb/umodem.c umodem
238 233
239# FTDI serial driver 234# FTDI serial driver
240device uftdi: ucombus 235device uftdi: ucombus
241attach uftdi at usbdevif 236attach uftdi at usbdevif
242file dev/usb/uftdi.c uftdi 237file dev/usb/uftdi.c uftdi
243 238
244# Prolific PL2303 serial driver 239# Prolific PL2303 serial driver
245device uplcom: ucombus 240device uplcom: ucombus
246attach uplcom at usbdevif 241attach uplcom at usbdevif
247file dev/usb/uplcom.c uplcom 242file dev/usb/uplcom.c uplcom
248 243
249# MCT USB-232 serial driver 244# MCT USB-232 serial driver
250device umct: ucombus 245device umct: ucombus
251attach umct at usbdevif 246attach umct at usbdevif
252file dev/usb/umct.c umct 247file dev/usb/umct.c umct
253 248
254# SUNTAC Slipper U VS-10U driver 249# SUNTAC Slipper U VS-10U driver
255device uvscom: ucombus 250device uvscom: ucombus
256attach uvscom at usbdevif 251attach uvscom at usbdevif
257file dev/usb/uvscom.c uvscom 252file dev/usb/uvscom.c uvscom
258 253
259# Belkin & other serial driver 254# Belkin & other serial driver
260define ubsa_common 255define ubsa_common
261file dev/usb/ubsa_common.c ubsa_common 256file dev/usb/ubsa_common.c ubsa_common
262device ubsa: ucombus, ubsa_common 257device ubsa: ucombus, ubsa_common
263attach ubsa at usbdevif 258attach ubsa at usbdevif
264file dev/usb/ubsa.c ubsa 259file dev/usb/ubsa.c ubsa
265 260
266# Huawei E220 3G/HSDPA modem (ubsa) 261# Huawei E220 3G/HSDPA modem (ubsa)
267device uhmodem: ucombus, ubsa_common 262device uhmodem: ucombus, ubsa_common
268attach uhmodem at usbifif 263attach uhmodem at usbifif
269file dev/usb/uhmodem.c uhmodem 264file dev/usb/uhmodem.c uhmodem
270 265
271# iPAQ PDAs 266# iPAQ PDAs
272device uipaq: ucombus 267device uipaq: ucombus
273attach uipaq at usbdevif 268attach uipaq at usbdevif
274file dev/usb/uipaq.c uipaq 269file dev/usb/uipaq.c uipaq
275 270
276# Kyocera AIR-EDGE PHONE 271# Kyocera AIR-EDGE PHONE
277device ukyopon: ucombus, umodem_common 272device ukyopon: ucombus, umodem_common
278attach ukyopon at usbifif 273attach ukyopon at usbifif
279file dev/usb/ukyopon.c ukyopon 274file dev/usb/ukyopon.c ukyopon
280 275
281# Silicon Labs CP210x serial driver 276# Silicon Labs CP210x serial driver
282device uslsa: ucombus 277device uslsa: ucombus
283attach uslsa at usbdevif 278attach uslsa at usbdevif
284file dev/usb/uslsa.c uslsa 279file dev/usb/uslsa.c uslsa
285 280
286# WinChipHead CH341/340 serial driver 281# WinChipHead CH341/340 serial driver
287device uchcom: ucombus 282device uchcom: ucombus
288attach uchcom at usbdevif 283attach uchcom at usbdevif
289file dev/usb/uchcom.c uchcom 284file dev/usb/uchcom.c uchcom
290 285
291# Scanners 286# Scanners
292# Generic scanner support 287# Generic scanner support
293device uscanner 288device uscanner
294attach uscanner at usbdevif 289attach uscanner at usbdevif
295file dev/usb/uscanner.c uscanner needs-flag 290file dev/usb/uscanner.c uscanner needs-flag
296 291
297# Avision SCSI over USB, HP5300 292# Avision SCSI over USB, HP5300
298device usscanner: scsi 293device usscanner: scsi
299attach usscanner at usbdevif 294attach usscanner at usbdevif
300file dev/usb/usscanner.c usscanner 295file dev/usb/usscanner.c usscanner
301 296
302# Atmel AT76c503 / AT76c503a / AT76c505 / AT76c505a @ USB 297# Atmel AT76c503 / AT76c503a / AT76c505 / AT76c505a @ USB
303device atu: ether, ifnet, arp, wlan 298device atu: ether, ifnet, arp, wlan
304attach atu at usbdevif 299attach atu at usbdevif
305file dev/usb/if_atu.c atu 300file dev/usb/if_atu.c atu
306 301
307# Ralink Technology RT2500USB 302# Ralink Technology RT2500USB
308attach ral at usbdevif with ural 303attach ral at usbdevif with ural
309file dev/usb/if_ural.c ural 304file dev/usb/if_ural.c ural
310 305
311device rum: ether, ifnet, arp, wlan, firmload 306device rum: ether, ifnet, arp, wlan, firmload
312attach rum at usbdevif 307attach rum at usbdevif
313file dev/usb/if_rum.c rum 308file dev/usb/if_rum.c rum
314 309
315# Topfield digital PVRs 310# Topfield digital PVRs
316device utoppy 311device utoppy
317attach utoppy at usbdevif 312attach utoppy at usbdevif
318file dev/usb/utoppy.c utoppy 313file dev/usb/utoppy.c utoppy
319 314
320# Microsoft Xbox controller (gamepad) 315# Microsoft Xbox controller (gamepad)
321device xboxcontroller: wsmousedev 316device xboxcontroller: wsmousedev
322attach xboxcontroller at usbdevif 317attach xboxcontroller at usbdevif
323file dev/usb/xboxcontroller.c xboxcontroller 318file dev/usb/xboxcontroller.c xboxcontroller
324 319
325# Zydas ZD1211 320# Zydas ZD1211
326device zyd: ether, ifnet, arp, wlan, firmload 321device zyd: ether, ifnet, arp, wlan, firmload
327attach zyd at usbdevif 322attach zyd at usbdevif
328file dev/usb/if_zyd.c zyd 323file dev/usb/if_zyd.c zyd