Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/arch/alpha/conf/GENERIC,v rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/alpha/conf/GENERIC,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.230.2.14 retrieving revision 1.231 diff -u -p -r1.230.2.14 -r1.231 --- src/sys/arch/alpha/conf/GENERIC 2005/12/11 10:28:13 1.230.2.14 +++ src/sys/arch/alpha/conf/GENERIC 2003/08/06 12:32:04 1.231 @@ -1,3 +1,6 @@ +# $NetBSD: GENERIC,v 1.231 2003/08/06 12:32:04 bouyer Exp $ +# +# GENERIC machine description file # # This machine description file is used to generate the default NetBSD # kernel. The generic kernel on NetBSD/alpha does enough to get booted, @@ -22,7 +25,7 @@ include "arch/alpha/conf/std.alpha" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.230.2.14 $" +#ident "GENERIC-$Revision: 1.231 $" maxusers 32 @@ -54,13 +57,11 @@ options NTP # kernel PLL for NTP # Enable experimental buffer queue strategy for better responsiveness under # high disk I/O load. Use it with caution - it's not proven to be stable yet. -#options BUFQ_READPRIO -#options BUFQ_PRIOCSCAN +#options NEW_BUFQ_STRATEGY # Diagnostic/debugging support options -#options DIAGNOSTIC # Cheap kernel consistency checks +options DIAGNOSTIC # Cheap kernel consistency checks options DDB # kernel debugger -options DDB_HISTORY_SIZE=512 # enable history editing in DDB #makeoptions DEBUG="-g" #makeoptions DEBUGLIST="pattern1 pattern2 ..." @@ -78,16 +79,12 @@ file-system NTFS # Windows/NT file syst file-system NFS # Sun NFS-compatible file system client file-system KERNFS # Kernel variable file system (/kern) file-system PROCFS # Process file system (/proc) -file-system PTYFS # /dev/pts/N support -#file-system TMPFS # experimental - Efficient memory file-system # File system options options QUOTA # UFS quotas #options FFS_EI # FFS Endian Independant support options SOFTDEP # FFS soft updates support. -#options UFS_DIRHASH # UFS Large Directory Hashing - Experimental options NFSSERVER # Sun NFS-compatible file system server -#options FFS_NO_SNAPSHOT # No FFS snapshot support # Networking options #options GATEWAY # packet forwarding @@ -95,10 +92,8 @@ 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_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 NS # XNS #options NSIP # XNS tunneling over IP #options ISO,TPIP # OSI @@ -109,23 +104,10 @@ options INET6 # IPV6 #options PPP_DEFLATE # Deflate compression support for PPP #options PPP_FILTER # Active filter support for PPP (requires bpf) #options PFIL_HOOKS # pfil(9) packet filter hooks -options IPFILTER_LOG # ipmon(8) log support +#options IPFILTER_LOG # ipmon(8) log support #options IPFILTER_DEFAULT_BLOCK # block all packets by default #options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG -#options ALTQ # Manipulate network interfaces' output queues -#options ALTQ_BLUE # Stochastic Fair Blue -#options ALTQ_CBQ # Class-Based Queueing -#options ALTQ_CDNR # Diffserv Traffic Conditioner -#options ALTQ_FIFOQ # First-In First-Out Queue -#options ALTQ_FLOWVALVE # RED/flow-valve (red-penalty-box) -#options ALTQ_HFSC # Hierarchical Fair Service Curve -#options ALTQ_LOCALQ # Local queueing discipline -#options ALTQ_PRIQ # Priority Queueing -#options ALTQ_RED # Random Early Detection -#options ALTQ_RIO # RED with IN/OUT -#options ALTQ_WFQ # Weighted Fair Queueing - # 4.3BSD compatibility. Should be optional, but necessary for now. options COMPAT_43 @@ -136,17 +118,13 @@ options COMPAT_11 options COMPAT_12 options COMPAT_13 options COMPAT_14 -options COMPAT_16 -options COMPAT_20 -options COMPAT_30 # NetBSD 3.0 compatibility. + # OSF/1 binary compatibility options COMPAT_OSF1 # Linux binary compatibility options COMPAT_LINUX -options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. - # System V-like message queues options SYSVMSG #options SEMMNI=10 # number of semaphore identifiers @@ -161,9 +139,6 @@ options SYSVSEM options SYSVSHM #options SHMMAXPGS=1024 # 1024 pages is the default -# p1003.1b semaphore support -options P1003_1B_SEMAPHORE - # Loadable Kernel Modules options LKM @@ -176,12 +151,10 @@ options PCIVERBOSE # recognize "unknow options MIIVERBOSE # verbose PHY autoconfig messages #options PCI_CONFIG_DUMP # verbosely dump PCI config space options SCSIVERBOSE # Verbose SCSI errors -options USBVERBOSE # verbose USB device autoconfig messages options TCVERBOSE # recognize "unknown" TC devices #options PCMCIAVERBOSE options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) -options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel options FONT_GALLANT12x22 # Console font for TC devices # The Alpha console firmware network boots using the BOOTP @@ -242,6 +215,7 @@ le* at ioasic? offset ? zsc0 at ioasic? offset 0x100000 zsc1 at ioasic? offset 0x180000 bba0 at ioasic? offset ? +audio* at bba? tcds* at tc? slot ? offset ? asc* at tcds? chip ? asc* at tc? slot ? offset ? @@ -293,11 +267,6 @@ pci* at ttwopci? agp* at irongate? # PCI devices - -# PCI cryptographic devices -hifn* at pci? dev ? function ? # Hifn 7755/7811/795x -ubsec* at pci? dev ? function ? # Broadcom 5501/5601/580x/582x - adv* at pci? dev ? function ? # AdvanSys SCSI adw* at pci? dev ? function ? # AdvanSys Wide SCSI #options SCSI_ADW_WDTR_DISABLE # disable WDTR @@ -330,25 +299,11 @@ mlx* at pci? dev ? function ? # Mylex D mpt* at pci? dev ? function ? # LSI Fusion SCSI/FC ne* at pci? dev ? function ? # NE2000-compatible Ethernet ohci* at pci? dev ? function ? # USB Open Host Controller -ehci* at pci? dev ? function ? # USB-2 Host controller pceb* at pci? dev ? function ? # Intel PCI-EISA Bridges -pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver -acardide* at pci? dev ? function ? # Acard IDE controllers -aceride* at pci? dev ? function ? # Acer Lab IDE controllers -artsata* at pci? dev ? function ? # Intel i31244 SATA controller -cmdide* at pci? dev ? function ? # CMD tech IDE controllers -cypide* at pci? dev ? function ? # Cypress IDE controllers -hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers -optiide* at pci? dev ? function ? # Opti IDE controllers -pdcide* at pci? dev ? function ? # Promise IDE controllers -pdcsata* at pci? dev ? function ? # Promise SATA150 controllers -satalink* at pci? dev ? function ? # SiI SATALink controllers -siside* at pci? dev ? function ? # SiS IDE controllers -slide* at pci? dev ? function ? # Symphony Labs IDE controllers -viaide* at pci? dev ? function ? # VIA/AMD/Nvidia IDE controllers +pciide* at pci? dev ? function ? # PCI IDE controllers pcscp* at pci? dev ? function ? # AMD Am53c974 PCscsi-PCI ppb* at pci? dev ? function ? # PCI-PCI Bridges -rtk* at pci? dev ? function ? # Realtek 8129/8139 Ethernet +rtk* at pci? dev ? function ? # RealTek 8129/8139 Ethernet sio* at pci? dev ? function ? # Intel PCI-ISA Bridges sip* at pci? dev ? function ? # SiS 900 Ethernet stge* at pci? dev ? function ? # Sundance/Tamarack TC9021 GigE @@ -363,15 +318,26 @@ vr* at pci? dev ? function ? # VIA Rhin wi* at pci? dev ? function ? # Lucent/Intersil WaveLAN/IEEE yds* at pci? dev ? function ? # Yamaha DS-1 PCI Audio +audio* at cmpci? +audio* at eap? +audio* at eso? +audio* at sv? +audio* at yds? +audio* at ess? + opl* at cmpci? flags 1 opl* at eso? #opl* at sv? opl* at yds? +midi* at opl? + mpu* at cmpci? mpu* at eso? mpu* at yds? +midi* at mpu? + # MII/PHY support exphy* at mii? phy ? # 3Com internal PHYs icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x @@ -397,10 +363,10 @@ mcclock* at isa? port 0x70 pckbc* at isa? # PC keyboard controller pckbd* at pckbc? # PC keyboard (kbd port) pms* at pckbc? # PS/2-style mouse (aux port) -attimer* at isa? # AT Timer pcppi* at isa? # PC prog. periph. interface spkr0 at pcppi? # IBM BASIC emulation isabeep0 at pcppi? # "keyboard" beep +midi* at pcppi? com* at isa? port 0x3f8 irq 4 # standard serial ports com* at isa? port 0x2f8 irq 3 cs* at isa? port 0x300 iomem ? irq ? drq ? # CS8900 Ethernet @@ -424,10 +390,13 @@ we0 at isa? port 0x280 iomem 0xd0000 irq we1 at isa? port 0x300 iomem 0xcc000 irq 10 #wss* at isa? port 0x530 irq 9 drq 0 # Windows Sound System #wss* at isapnp? +#audio* at wss? +#midi* at wss? ess0 at isa? port 0x220 irq 5 drq 1 drq2 5 # ESS 18XX sb* at isa? port 0x220 irq 5 drq 1 # SoundBlaster #sb* at isapnp? +audio* at sb? #adv* at isa? port ? irq ? drq ? # AdvanSys APB-514[02] aha* at isa? port 0x330 irq ? drq ? # Adaptec 154[02] SCSI aha* at isa? port 0x334 irq ? drq ? # Adaptec 154[02] SCSI @@ -452,42 +421,45 @@ le* at depca? uha* at eisa? slot ? # UltraStor 24f SCSI (unt.) # PCMCIA device -com* at pcmcia? function ? # Modems and serial cards - -aic* at pcmcia? function ? # Adaptec APA-1460 SCSI -spc* at pcmcia? function ? # Fujitsu MB87030 SCSI - -wdc* at pcmcia? function ? # PCMCIA IDE controllers - -ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Eth. -mbe* at pcmcia? function ? # MB8696x based Ethernet -ne* at pcmcia? function ? # NE2000-compatible Eth. -ray* at pcmcia? function ? # Raytheon Raylink (802.11) -sm* at pcmcia? function ? # Megahertz Ethernet -wi* at pcmcia? function ? # Lucent/Intersil WaveLAN/IEEE -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? +aic* at pcmcia? function ? # Adaptec APA-1460 SCSI +com* at pcmcia? function ? # Modems and serial cards +wdc* at pcmcia? function ? # PCMCIA IDE controllers +ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Eth. +mbe* at pcmcia? function ? # MB8696x based Ethernet +ne* at pcmcia? function ? # NE2000-compatible Eth. +sm* at pcmcia? function ? # Megahertz Ethernet +ray* at pcmcia? function ? # Raytheon Raylink (802.11) +wi* at pcmcia? function ? # Lucent/Intersil WaveLAN/IEEE # SCSI bus support -scsibus* at scsi? +scsibus* at adv? +scsibus* at adw? +scsibus* at aha? +scsibus* at ahb? +scsibus* at ahc? +scsibus* at aic? +scsibus* at asc? +scsibus* at bha? +scsibus* at dpt? +scsibus* at iha? +scsibus* at isp? +scsibus* at siop? +scsibus* at esiop? +scsibus* at pcscp? +scsibus* at uha? # SCSI devices cd* at scsibus? target ? lun ? # SCSI CD-ROM drives sd* at scsibus? target ? lun ? # SCSI disk drives st* at scsibus? target ? lun ? # SCSI tape drives -# ATA (IDE) bus support -atabus* at ata? - -# IDE drives -wd* at atabus? drive ? +# ST506/ESDI/IDE devices +wd* at pciide? channel ? +wd* at wdc? drive ? # ATAPI bus support -atapibus* at atapi? +atapibus* at pciide? channel ? +atapibus* at wdc? # ATAPI devices sd* at atapibus? drive ? # ATAPI disk devices @@ -503,7 +475,6 @@ ld* at mlx? unit ? # USB bus support usb* at uhci? usb* at ohci? -usb* at ehci? # USB Hubs uhub* at usb? @@ -519,10 +490,6 @@ wsmouse* at ums? # USB Keyboards ukbd* at uhidev? reportid ? wskbd* at ukbd? console ? -options WSDISPLAY_COMPAT_RAWKBD - -# USB serial adpater -ucycom* at uhidev? reportid ? # USB Generic HID devices uhid* at uhidev? reportid ? @@ -536,41 +503,21 @@ ucom* at umodem? # USB Mass Storage umass* at uhub? port ? configuration ? interface ? -atapibus* at umass? +atapibus* at umass? channel ? scsibus* at umass? channel ? -# USB audio -uaudio* at uhub? port ? configuration ? - -# USB MIDI -umidi* at uhub? port ? configuration ? - -# USB IrDA -# USB-IrDA bridge spec -uirda* at uhub? port ? configuration ? interface ? -irframe* at uirda? - -# SigmaTel STIr4200 USB/IrDA Bridge -ustir* at uhub? port ? -irframe* at ustir? - # USB Ethernet adapters aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters -axe* at uhub? port ? # ASIX AX88172 based adapters cue* at uhub? port ? # CATC USB-EL1201A based adapters kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters +uax* at uhub? port ? # ASIX AX88172 based adapters url* at uhub? port ? # Realtek RTL8150L based adapters -udav* at uhub? port ? # Davicom DM9601 based adapters # Serial adapters # FTDI FT8U100AX serial adapter uftdi* at uhub? port ? ucom* at uftdi? portno ? -# Kyocera AIR-EDGE PHONE -#ukyopon* at uhub? port ? -#ucom* at ukyopon? portno ? - # USB scanners uscanner* at uhub? port ? @@ -584,18 +531,6 @@ radio* at udsbr? # USB Generic driver ugen* at uhub? port ? -# PCI IEEE1394 controllers -#fwohci* at pci? dev ? function ? # IEEE1394 Open Host Controller - -#ieee1394if* at fwohci? -#fwip* at ieee1394if? # IP over IEEE1394 -#sbp* at ieee1394if? euihi ? euilo ? - -# Audio support -audio* at audiobus? -midi* at midibus? -midi* at pcppi? - # Workstation Console attachments wsdisplay* at cfb? wsdisplay* at mfb? @@ -611,9 +546,6 @@ wsmouse* at vsms? wskbd* at pckbd? wsmouse* at pms? -pseudo-device crypto # /dev/crypto device -pseudo-device swcrypto # software crypto implementation - pseudo-device bpfilter 16 pseudo-device ccd 4 #pseudo-device cgd 4 # cryptographic disk devices @@ -627,7 +559,6 @@ options RAID_AUTOCONFIG # auto-configu # options RF_INCLUDE_INTERDECLUSTER=1 # options RF_INCLUDE_PARITY_DECLUSTERING=1 # options RF_INCLUDE_PARITY_DECLUSTERING_DS=1 -pseudo-device fss 4 # file system snapshot device pseudo-device ipfilter 1 pseudo-device loop 1 pseudo-device md 1 @@ -636,7 +567,6 @@ pseudo-device pppoe # PPP over Etherne pseudo-device pty # pseudo-terminals pseudo-device sl 4 pseudo-device vnd 4 -#options VND_COMPRESSION # compressed vnd(4) #pseudo-device gre 2 # generic L3 over IP tunnel pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933) #pseudo-device faith 1 # IPv[46] tcp relay translation i/f @@ -649,24 +579,4 @@ pseudo-device rnd # /dev/random and in #options RND_COM # use "com" randomness too pseudo-device clockctl # user control of clock subsystem pseudo-device wsfont -pseudo-device wsmux # mouse and keyboad multiplexing pseudo-device ksyms # /dev/ksyms -#pseudo-device pf # PF packet filter -#pseudo-device pflog # PF log if - -# Veriexec -#options VERIFIED_EXEC -# -# a pseudo device needed for veriexec -#pseudo-device veriexec 1 -# -# Uncomment the fingerprint methods below that are desired. Note that -# removing fingerprint methods will have almost no impact on the kernel -# code size. -# -#options VERIFIED_EXEC_FP_RMD160 -#options VERIFIED_EXEC_FP_SHA256 -#options VERIFIED_EXEC_FP_SHA384 -#options VERIFIED_EXEC_FP_SHA512 -#options VERIFIED_EXEC_FP_SHA1 -#options VERIFIED_EXEC_FP_MD5