diff --git a/sys/arch/arm/conf/files.sa11x0 b/sys/arch/arm/conf/files.sa11x0 index 3c2d5c2ae382..f76a299089d5 100644 --- a/sys/arch/arm/conf/files.sa11x0 +++ b/sys/arch/arm/conf/files.sa11x0 @@ -1,4 +1,4 @@ -# $NetBSD: files.sa11x0,v 1.5 2003/04/14 14:20:10 rjs Exp $ +# $NetBSD: files.sa11x0,v 1.6 2007/01/08 16:21:45 ichiro Exp $ # # First try for arm-specific configuration info # @@ -28,23 +28,8 @@ device sacc { [addr=-1], [size=0], [intr=-1] } attach sacc at saip file arch/arm/sa11x0/sa1111.c sacc -# -# Workstation Console -# -include "dev/wscons/files.wscons" - -# XXX this is a hack to use dev/pcmcia without fdc.c -device fdc - -# PCMCIA -include "dev/pcmcia/files.pcmcia" - device sacpcic: pcmciabus attach sacpcic at sacc file arch/arm/sa11x0/sa11x1_pcic.c sacpcic needs-flag file arch/arm/sa11x0/sa11xx_pcic.c sacpcic | ipaqpcic - -# USB - -include "dev/usb/files.usb" diff --git a/sys/arch/hpcarm/conf/JORNADA720 b/sys/arch/hpcarm/conf/JORNADA720 index c5aa6183661e..1cd6310a14e0 100644 --- a/sys/arch/hpcarm/conf/JORNADA720 +++ b/sys/arch/hpcarm/conf/JORNADA720 @@ -1,4 +1,4 @@ -# $NetBSD: JORNADA720,v 1.62 2006/11/11 18:47:09 jmmv Exp $ +# $NetBSD: JORNADA720,v 1.63 2007/01/08 16:21:46 ichiro Exp $ # # JORNADA -- Windows-CE based jornada 720 # @@ -7,7 +7,7 @@ include "arch/hpcarm/conf/std.hpcarm" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.62 $" +#ident "GENERIC-$Revision: 1.63 $" # estimated number of users maxusers 32 @@ -35,7 +35,7 @@ file-system MFS # memory file system file-system NFS # Network file system #file-system ADOSFS # AmigaDOS-compatible file system #file-system EXT2FS # second extended file system (linux) -#file-system CD9660 # ISO 9660 + Rock Ridge file system +file-system CD9660 # ISO 9660 + Rock Ridge file system file-system MSDOSFS # MS-DOS file system file-system FDESC # /dev/fd #file-system FILECORE # Acorn filecore file system @@ -43,11 +43,11 @@ file-system KERNFS # /kern file-system NULLFS # loopback file system #file-system OVERLAY # overlay filesystem #file-system PORTAL # portal filesystem (still experimental) -#file-system PROCFS # /proc +file-system PROCFS # /proc #file-system UMAPFS # NULLFS + uid and gid remapping -#file-system UNION # union file system +file-system UNION # union file system file-system PTYFS # /dev/pts/N support -#file-system TMPFS # Efficient memory file-system +file-system TMPFS # Efficient memory file-system #file-system UDF # experimental - OSTA UDF CD/DVD file-system # File system options @@ -62,12 +62,12 @@ options SOFTDEP # FFS soft updates support. options GATEWAY # packet forwarding options INET # IP + ICMP + TCP + UDP options INET6 # IPV6 -#options IPSEC # IP security -#options IPSEC_ESP # IP security (encryption part; define w/IPSEC) +options IPSEC # IP security +options IPSEC_ESP # IP security (encryption part; define w/IPSEC) #options IPSEC_NAT_T # IPsec NAT traversal (NAT-T) #options IPSEC_DEBUG # debug for IP security -#options MROUTING # IP multicast routing -#options PIM # Protocol Independent Multicast +options MROUTING # IP multicast routing +options PIM # Protocol Independent Multicast options ISO,TPIP # OSI #options EON # OSI tunneling over IP options NETATALK # AppleTalk networking @@ -157,6 +157,26 @@ pcmcia* at sacpcic? # PCMCIA serial interfaces com* at pcmcia? function ? # Modems and serial cards +pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards +com* at pcmcom? slave ? # ...and the slave devices + +# PCMCIA SCSI controllers +aic* at pcmcia? function ? # Adaptec APA-1460 SCSI +esp* at pcmcia? function ? # Qlogic ESP406/FAS408 SCSI +spc* at pcmcia? function ? # Fujitsu MB87030/MB89352 SCSI + +# SCSI bus support +scsibus* at scsi? + +# SCSI devices +sd* at scsibus? target ? lun ? # SCSI disk drives +st* at scsibus? target ? lun ? # SCSI tape drives +cd* at scsibus? target ? lun ? # SCSI CD-ROM drives +ch* at scsibus? target ? lun ? # SCSI autochangers +ses* at scsibus? target ? lun ? # SCSI Enclosure Services devices +ss* at scsibus? target ? lun ? # SCSI scanners +uk* at scsibus? target ? lun ? # SCSI unknown + # PCMCIA IDE controllers and disks wdc* at pcmcia? function ? atabus* at ata? @@ -166,17 +186,19 @@ wd* at atabus? drive ? an* at pcmcia? function ? # Aironet PC4500/PC4800 (802.11) awi* at pcmcia? function ? # BayStack 650/660 (802.11FH/DS) cnw* at pcmcia? function ? # Xircom/Netwave AirSurfer +cs* at pcmcia? function ? # CS89xx Ethernet ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet mbe* at pcmcia? function ? # MB8696x based Ethernet ne* at pcmcia? function ? # NE2000-compatible Ethernet ray* at pcmcia? function ? # Raytheon Raylink (802.11) -#sm* at pcmcia? function ? # Megahertz Ethernet +sm* at pcmcia? function ? # Megahertz Ethernet wi* at pcmcia? function ? # Lucent WaveLan IEEE (802.11) -#xi* at pcmcia? function ? # Xircom CreditCard Ethernet - -#mhzc* at pcmcia? function ? # Megahertz Ethernet/Modem combo cards -#com* at mhzc? -#sm* at mhzc? +xirc* at pcmcia? function ? # Xircom CreditCard Ethernet +com* at xirc? +xi* at xirc? +mhzc* at pcmcia? function ? # Megahertz Ethernet/Modem combo cards +com* at mhzc? +sm* at mhzc? # MII/PHY support acphy* at mii? phy ? # DAltima AC101 and AMD Am79c874 PHYs @@ -188,6 +210,7 @@ exphy* at mii? phy ? # 3Com internal PHYs glxtphy* at mii? phy ? # Level One LXT-1000 PHYs gphyter* at mii? phy ? # NS83861 Gig-E PHY icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x +ikphy* at mii? phy ? # Intel 82563 PHYs inphy* at mii? phy ? # Intel 82555 PHYs iophy* at mii? phy ? # Intel 82553 PHYs lxtphy* at mii? phy ? # Level One LXT-970 PHYs @@ -196,12 +219,44 @@ nsphy* at mii? phy ? # NS83840 PHYs nsphyter* at mii? phy ? # NS83843 PHYs pnaphy* at mii? phy ? # generic HomePNA PHYs qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs +rgephy* at mii? phy ? # Realtek 8169S/8110S internal PHYs +rlphy* at mii? phy ? # Realtek 8139/8201L PHYs sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs tlphy* at mii? phy ? # ThunderLAN PHYs tqphy* at mii? phy ? # TDK Semiconductor PHYs ukphy* at mii? phy ? # generic unknown PHYs urlphy* at mii? phy ? # Realtek RTL8150L internal PHYs +# PCMCIA audio devices +#esl* at pcmcia? function ? # ESS 1688 AudioDrive +# OPL[23] FM synthesizers +#opl* at esl? + +# Audio support +#audio* at audiobus? + +# Bluetooth Controller and Device support + +# Bluetooth PCMCIA Controllers +bt3c* at pcmcia? function ? # 3Com 3CRWB6096-A + +# Bluetooth Device Hub +bthub* at bt3c? + +# Bluetooth HID support +bthidev* at bthub? + +# Bluetooth Mouse +btms* at bthidev? reportid ? +wsmouse* at btms? mux 0 + +# Bluetooth Keyboard +btkbd* at bthidev? reportid ? +wskbd* at btkbd? console ? mux 1 + +# Bluetooth Audio support +#btsco* at bthub? + # wscons options options WSEMUL_VT100 options WSDISPLAY_DEFAULTSCREENS=2 diff --git a/sys/arch/hpcarm/conf/files.hpcarm b/sys/arch/hpcarm/conf/files.hpcarm index 164dff1397d0..abe116e9b7f5 100644 --- a/sys/arch/hpcarm/conf/files.hpcarm +++ b/sys/arch/hpcarm/conf/files.hpcarm @@ -1,4 +1,4 @@ -# $NetBSD: files.hpcarm,v 1.60 2006/10/07 14:27:54 peter Exp $ +# $NetBSD: files.hpcarm,v 1.61 2007/01/08 16:21:46 ichiro Exp $ # # hpcarm specific configuration info # @@ -26,6 +26,9 @@ file arch/hpcarm/hpcarm/spl.S # HPCARM specific files file arch/hpcarm/hpcarm/hpc_machdep.c +# Workstation Console +include "dev/wscons/files.wscons" + # Include hpcarm/StrongARM config definitions. include "arch/arm/conf/files.sa11x0" @@ -45,6 +48,12 @@ device ipaqpcic: pcmciabus attach ipaqpcic at ipaqbus file arch/hpcarm/dev/ipaq_pcic.c ipaqpcic needs-flag +# PCMCIA +include "dev/pcmcia/files.pcmcia" + +# XXX this is a hack to use dev/pcmcia without fdc.c +device fdc + # # H/PC Platform common files. # @@ -116,4 +125,10 @@ include "dev/ata/files.ata" # Machine-independent SCSI/ATAPI drivers include "dev/scsipi/files.scsipi" +# USB +include "dev/usb/files.usb" + +# Bluetooth +include "dev/bluetooth/files.bluetooth" + include "arch/hpcarm/conf/majors.hpcarm"