Sat Jul 19 18:18:31 2014 UTC ()
Fix uhidev entries (sync with i386)


(bouyer)
diff -r1.21 -r1.22 src/sys/arch/evbarm/conf/BEAGLEBONE
cvs diff -r1.21 -r1.22 src/sys/arch/evbarm/conf/Attic/BEAGLEBONE (expand / switch to unified diff)

--- src/sys/arch/evbarm/conf/Attic/BEAGLEBONE 2014/07/16 18:36:46 1.21
+++ src/sys/arch/evbarm/conf/Attic/BEAGLEBONE 2014/07/19 18:18:31 1.22
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# 1#
2# $NetBSD: BEAGLEBONE,v 1.21 2014/07/16 18:36:46 bouyer Exp $ 2# $NetBSD: BEAGLEBONE,v 1.22 2014/07/19 18:18:31 bouyer Exp $
3# 3#
4# BEAGLEBONE -- TI AM335x board Kernel 4# BEAGLEBONE -- TI AM335x board Kernel
5# 5#
6 6
7include "arch/evbarm/conf/std.beagle" 7include "arch/evbarm/conf/std.beagle"
8 8
9# estimated number of users 9# estimated number of users
10 10
11maxusers 32 11maxusers 32
12 12
13# Standard system options 13# Standard system options
14 14
15options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT 15options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
@@ -262,31 +262,41 @@ options FONT_GALLANT12x22 @@ -262,31 +262,41 @@ options FONT_GALLANT12x22
262options FONT_BOLD8x16 262options FONT_BOLD8x16
263# compatibility to other console drivers 263# compatibility to other console drivers
264options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes 264options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
265 265
266pseudo-device wsmux # mouse & keyboard multiplexor 266pseudo-device wsmux # mouse & keyboard multiplexor
267pseudo-device wsfont 267pseudo-device wsfont
268 268
269# On-board USB. Experimental 269# On-board USB. Experimental
270tiotg* at obio0 addr 0x47400000 size 0x5000 intrbase 17 270tiotg* at obio0 addr 0x47400000 size 0x5000 intrbase 17
271motg* at tiotg? port ? 271motg* at tiotg? port ?
272usb* at motg? 272usb* at motg?
273uhub* at usb? 273uhub* at usb?
274uhub* at uhub? port ? 274uhub* at uhub? port ?
 275
275uhidev* at uhub? 276uhidev* at uhub?
276ukbd* at uhidev? 277
277ums* at uhidev? 278# USB Keyboards
278wskbd* at ukbd? 279ukbd* at uhidev? reportid ?
279wsmouse* at ums? 280wskbd* at ukbd? console ? mux 1
 281
 282# USB Mice
 283ums* at uhidev? reportid ?
 284wsmouse* at ums? mux 0
 285
 286# USB generic touchscreen
 287uts* at uhidev? reportid ?
 288wsmouse* at uts? mux 0
 289
280# USB Modem 290# USB Modem
281umodem* at uhub? port ? configuration ? 291umodem* at uhub? port ? configuration ?
282ucom* at umodem? 292ucom* at umodem?
283# Serial adapters 293# Serial adapters
284ubsa* at uhub? port ? # Belkin serial adapter 294ubsa* at uhub? port ? # Belkin serial adapter
285ucom* at ubsa? portno ? 295ucom* at ubsa? portno ?
286 296
287uchcom* at uhub? port ? # WinChipHead CH341/CH340 serial adapter 297uchcom* at uhub? port ? # WinChipHead CH341/CH340 serial adapter
288ucom* at uchcom? portno ? 298ucom* at uchcom? portno ?
289 299
290uftdi* at uhub? port ? # FTDI FT8U100AX serial adapter 300uftdi* at uhub? port ? # FTDI FT8U100AX serial adapter
291ucom* at uftdi? portno ? 301ucom* at uftdi? portno ?
292 302