Module Name: src Committed By: ryo Date: Sat May 28 13:01:51 UTC 2011
Modified Files: src/sys/arch/i386/conf: ALL GENERIC GENERIC_PS2TINY GENERIC_TINY INSTALL INSTALL_FLOPPY INSTALL_TINY INSTALL_XEN3PAE_DOMU INSTALL_XEN3_DOMU NET4501 XBOX XEN3_DOM0 XEN3_DOMU Log Message: many whitespace cleanup. confirmed "cvs diff -b" are identical. To generate a diff of this commit: cvs rdiff -u -r1.306 -r1.307 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1031 -r1.1032 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.61 -r1.62 src/sys/arch/i386/conf/GENERIC_PS2TINY cvs rdiff -u -r1.127 -r1.128 src/sys/arch/i386/conf/GENERIC_TINY cvs rdiff -u -r1.329 -r1.330 src/sys/arch/i386/conf/INSTALL cvs rdiff -u -r1.12 -r1.13 src/sys/arch/i386/conf/INSTALL_FLOPPY \ src/sys/arch/i386/conf/INSTALL_XEN3_DOMU cvs rdiff -u -r1.132 -r1.133 src/sys/arch/i386/conf/INSTALL_TINY cvs rdiff -u -r1.5 -r1.6 src/sys/arch/i386/conf/INSTALL_XEN3PAE_DOMU cvs rdiff -u -r1.75 -r1.76 src/sys/arch/i386/conf/NET4501 cvs rdiff -u -r1.25 -r1.26 src/sys/arch/i386/conf/XBOX cvs rdiff -u -r1.51 -r1.52 src/sys/arch/i386/conf/XEN3_DOM0 cvs rdiff -u -r1.34 -r1.35 src/sys/arch/i386/conf/XEN3_DOMU Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.306 src/sys/arch/i386/conf/ALL:1.307 --- src/sys/arch/i386/conf/ALL:1.306 Tue Apr 26 16:57:40 2011 +++ src/sys/arch/i386/conf/ALL Sat May 28 13:01:49 2011 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.306 2011/04/26 16:57:40 joerg Exp $ +# $NetBSD: ALL,v 1.307 2011/05/28 13:01:49 ryo Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.306 $" +#ident "ALL-$Revision: 1.307 $" maxusers 64 # estimated number of users @@ -122,9 +122,9 @@ options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600 options IPKDB # IP Kernel Debugger options IPKDBKEY="\"Pass_phrase_to_debug_over_network\"" -makeoptions DEBUG="-g" # compile full symbol table +makeoptions DEBUG="-g" # compile full symbol table options SYSCALL_STATS # per syscall counts -options SYSCALL_TIMES # per syscall times +options SYSCALL_TIMES # per syscall times options SYSCALL_TIMES_HASCOUNTER # use 'broken' rdtsc (soekris) # Compatibility options @@ -209,7 +209,7 @@ 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 MPLS # MultiProtocol Label Switching (needs ifmpls) +options MPLS # MultiProtocol Label Switching (needs ifmpls) options MROUTING # IP multicast routing options PIM # Protocol Independent Multicast options ISO,TPIP # OSI @@ -286,7 +286,7 @@ options PCKBD_CNATTACH_MAY_FAIL # see dev/pckbport/wskbdmap_mfii.c for implemented layouts options PCKBD_LAYOUT="(KB_DE | KB_NODEAD)" # for pckbd driver -options UKBD_LAYOUT="(KB_DE | KB_NODEAD)" # for ukbd driver +options UKBD_LAYOUT="(KB_DE | KB_NODEAD)" # for ukbd driver # allocate a number of virtual screens at autoconfiguration time options WSDISPLAY_DEFAULTSCREENS=4 # use a large software cursor that doesn't blink @@ -343,20 +343,20 @@ options MPBIOS_SCANPCI # find PCI roots using MPBIOS options ACPI_SCANPCI # find PCI roots using ACPI -acpi0 at mainbus0 +acpi0 at mainbus0 options ACPI_ACTIVATE_DEV # If set, activate inactive devices # ACPI devices apm* at acpi? # ACPI apm emulation -acpiacad* at acpi? # ACPI AC Adapter -acpibat* at acpi? # ACPI Battery -acpibut* at acpi? # ACPI Button +acpiacad* at acpi? # ACPI AC Adapter +acpibat* at acpi? # ACPI Battery +acpibut* at acpi? # ACPI Button acpidalb* at acpi? # ACPI Direct Application Launch Button acpiec* at acpi? # ACPI Embedded Controller (late) -acpiecdt* at acpi? # ACPI Embedded Controller (early) -acpifan* at acpi? # ACPI Fan -acpilid* at acpi? # ACPI Lid Switch +acpiecdt* at acpi? # ACPI Embedded Controller (early) +acpifan* at acpi? # ACPI Fan +acpilid* at acpi? # ACPI Lid Switch acpipmtr* at acpi? # ACPI Power Meter (experimental) # XXX Do not enable this in a real kernel unless you also disable any # XXX "native" i2c controller. Otherwise you'll have two accessors to @@ -372,35 +372,35 @@ aibs* at acpi? # ASUSTeK AI Booster hardware monitor asus* at acpi? # ASUS hotkeys attimer* at acpi? # AT Timer -com* at acpi? # Serial communications interface -fdc* at acpi? # Floppy disk controller +com* at acpi? # Serial communications interface +fdc* at acpi? # Floppy disk controller fujbp* at acpi? # Fujitsu Brightness & Pointer fujhk* at acpi? # Fujitsu Hotkeys hpqlb* at acpi? # HP Quick Launch Buttons -hpet* at acpi? # High Precision Event Timer +hpet* at acpi? # High Precision Event Timer joy* at acpi? # Joystick/Game port -lpt* at acpi? # Parallel port +lpt* at acpi? # Parallel port mpu* at acpi? # Roland MPU-401 MIDI UART npx* at acpi? # Math coprocessor -pckbc* at acpi? # PC keyboard controller -pcppi* at acpi? # AT-style speaker sound +pckbc* at acpi? # PC keyboard controller +pcppi* at acpi? # AT-style speaker sound thinkpad* at acpi? # IBM/Lenovo Thinkpad hotkeys -ug* at acpi? # Abit uGuru Hardware monitor +ug* at acpi? # Abit uGuru Hardware monitor wb* at acpi? # Winbond W83L518D SD/MMC reader sdmmc* at wb? # SD/MMC bus wmidell* at acpiwmibus? # Dell WMI mappings wmieeepc* at acpiwmibus? # Asus Eee PC WMI mappings wmihp* at acpiwmibus? # HP WMI mappings -wmimsi* at acpiwmibus? # MSI WMI mappings -wss* at acpi? # NeoMagic 256AV in wss mode -ym* at acpi? # Yamaha OPL3-SA[23] audio +wmimsi* at acpiwmibus? # MSI WMI mappings +wss* at acpi? # NeoMagic 256AV in wss mode +ym* at acpi? # Yamaha OPL3-SA[23] audio # Sony Vaio jog dial -spic* at acpi? # Sony Programmable I/O Controller -wsmouse* at spic? +spic* at acpi? # Sony Programmable I/O Controller +wsmouse* at spic? # Sony LCD brightness etc. -sony* at acpi? # Sony Miscellaneous Controller +sony* at acpi? # Sony Miscellaneous Controller # Toshiba Libretto devices vald* at acpi? @@ -463,7 +463,7 @@ # System Controllers elansc* at mainbus? bus ? # AMD Elan SC520 System Controller -gpio* at elansc? +gpio* at elansc? elanpar* at elansc? elanpex* at elansc? @@ -472,13 +472,13 @@ # PCI bridges amdpcib* at pci? dev ? function ? # AMD 8111 PCI-ISA w/ HPET -hpet* at amdpcib? +hpet* at amdpcib? ichlpcib* at pci? dev ? function ? # Intel ICH PCI-ISA w/ timecounter, # watchdog, SpeedStep and HPET -hpet0 at ichlpcib? # High Precision Event Timer +hpet0 at ichlpcib? # High Precision Event Timer fwhrng* at ichlpcib? # Intel 82802 FWH Random Number Generator gcscpcib* at pci? dev ? function ? # AMD CS5535/CS5536 PCI-ISA w/ -gpio* at gcscpcib? # timecounter, watchdog and GPIO +gpio* at gcscpcib? # timecounter, watchdog and GPIO piixpcib* at pci? dev ? function ? # Intel PIIX4 PCI-ISA w/ SpeedStep gscpcib* at pci? dev ? function ? # NS Geode PCI-ISA w/ GPIO support viapcib* at pci? dev ? function ? # VIA VT8235 PCI-ISA w/ SMBus support @@ -492,7 +492,7 @@ # XXX 'puc's aren't really bridges, but there's no better place for them here puc* at pci? dev ? function ? # PCI "universal" comm. cards -agp* at pchb? +agp* at pchb? # EISA bus support @@ -500,8 +500,8 @@ eisa0 at pceb? # ISA bus support -isa0 at amdpcib? -isa0 at gcscpcib? +isa0 at amdpcib? +isa0 at gcscpcib? isa0 at ichlpcib? isa0 at piixpcib? isa0 at gscpcib? @@ -565,9 +565,9 @@ chipsfb* at pci? dev ? function ? genfb* at pci? dev ? function ? igsfb* at pci? dev ? function ? -machfb* at pci? dev ? function ? +machfb* at pci? dev ? function ? pm2fb* at pci? dev ? function ? -r128fb* at pci? dev ? function ? +r128fb* at pci? dev ? function ? radeonfb* at pci? dev ? function ? unichromefb* at pci? dev ? function ? # VIA Unichrome framebuffer console voodoofb* at pci? dev ? function ? @@ -706,7 +706,7 @@ xbseeprom* at iic? addr 0x54 # XBOX serial EEPROM # IBM Thinkpad Active Protection System -aps0 at isa? port 0x1600 +aps0 at isa? port 0x1600 # Fintek Super I/O with hardware monitor finsio0 at isa? port 0x4e @@ -730,7 +730,7 @@ gpio* at nsclpcsio? # Abit uGuru Hardware system monitor -ug0 at isa? port 0xe0 +ug0 at isa? port 0xe0 # VIA VT82C686A/VT8231 Hardware Monitor and Power Management Timer viaenv* at pci? dev ? function ? @@ -800,10 +800,10 @@ aic* at pcmcia? function ? # Adaptec APA-1460 SCSI esp* at pcmcia? function ? # Qlogic ESP406/FAS408 SCSI nca* at pcmcia? function ? # NCR53C400 SCSI -spc* at pcmcia? function ? # Fujitsu MB87030/MB89352 SCSI +spc* at pcmcia? function ? # Fujitsu MB87030/MB89352 SCSI # ISA Plug-and-Play SCSI controllers -aha* at isapnp? # Adaptec AHA-154[02 +aha* at isapnp? # Adaptec AHA-154[02 aic* at isapnp? # Adaptec AHA-1520B # ISA SCSI controllers @@ -880,31 +880,31 @@ # a machine hang with some controllers. 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 -ahcisata* at pci? dev ? function ? # AHCI SATA controllers -artsata* at pci? dev ? function ? # Intel i31244 SATA controller +aceride* at pci? dev ? function ? # Acer Lab IDE controllers +ahcisata* at pci? dev ? function ? # AHCI SATA 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 -gcscide* at pci? dev ? function ? # AMD CS5535 Companion IDE controllers -geodeide* at pci? dev ? function ? # AMD Geode IDE controllers +gcscide* at pci? dev ? function ? # AMD CS5535 Companion IDE controllers +geodeide* at pci? dev ? function ? # AMD Geode IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers iteide* at pci? dev ? function ? # IT Express IDE controllers ixpide* at pci? dev ? function ? # ATI IXP IDE controllers jmide* at pci? dev ? function ? # JMicron PCI-e PATA/SATA controllers -ahcisata* at jmide? +ahcisata* at jmide? mvsata* at pci? dev ? function ? # Marvell Hercules-I/II -optiide* at pci? dev ? function ? # Opti IDE controllers -piixide* at pci? dev ? function ? # Intel IDE controllers +optiide* at pci? dev ? function ? # Opti IDE controllers +piixide* at pci? dev ? function ? # Intel IDE controllers pdcide* at pci? dev ? function ? # Promise IDE controllers pdcsata* at pci? dev ? function ? # Promise SATA150 controllers rccide* at pci? dev ? function ? # ServerWorks IDE controllers rdcide* at pci? dev ? function ? # RDC PMX-1000 IDE controllers satalink* at pci? dev ? function ? # SiI SATALink controllers -schide* at pci? dev ? function ? # Intel SCH IDE controllers +schide* at pci? dev ? function ? # Intel SCH IDE controllers siisata* at pci? dev ? function ? # SiI SteelVine controllers siside* at pci? dev ? function ? # SiS IDE controllers slide* at pci? dev ? function ? # Symphony Labs IDE controllers -svwsata* at pci? dev ? function ? # ServerWorks SATA controllers +svwsata* at pci? dev ? function ? # ServerWorks SATA controllers stpcide* at pci? dev ? function ? # STMicro STPC IDE controllers toshide* at pci? dev ? function ? # TOSHIBA PICCOLO controllers viaide* at pci? dev ? function ? # VIA/AMD/Nvidia IDE controllers @@ -990,9 +990,9 @@ ale* at pci? dev ? function ? # Attansic/Atheros L1E Ethernet ath* at pci? dev ? function ? # Atheros 5210/5211/5212 802.11 atw* at pci? dev ? function ? # ADMtek ADM8211 (802.11) -bce* at pci? dev ? function ? # Broadcom 4401 10/100 Ethernet -bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet -bnx* at pci? dev ? function ? # Broadcom NetXtremeII gigabit Ethernet +bce* at pci? dev ? function ? # Broadcom 4401 10/100 Ethernet +bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet +bnx* at pci? dev ? function ? # Broadcom NetXtremeII gigabit Ethernet bwi* at pci? dev ? function ? # Broadcom BCM43xx wireless dge* at pci? dev ? function ? # Intel 82597 10GbE LR en* at pci? dev ? function ? # ENI/Adaptec ATM @@ -1015,9 +1015,9 @@ mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet msk* at mskc? # Marvell Yukon 2 Gigabit Ethernet mtd* at pci? dev ? function ? # Myson MTD803 3-in-1 Ethernet -#ndis* at pci? dev ? function ? # Experimental - NDIS Network Driver +#ndis* at pci? dev ? function ? # Experimental - NDIS Network Driver ne* at pci? dev ? function ? # NE2000-compatible Ethernet -nfe* at pci? dev ? function ? # NVIDIA nForce Ethernet +nfe* at pci? dev ? function ? # NVIDIA nForce Ethernet ntwoc* at pci? dev ? function ? # Riscom/N2 PCI Sync Serial pcn* at pci? dev ? function ? # AMD PCnet-PCI Ethernet ral* at pci? dev ? function ? # Ralink Technology RT25x0 802.11a/b/g @@ -1200,7 +1200,7 @@ uep* at uhub? port ? wsmouse* at uep? mux 0 -uyurex* at uhidev? reportid ? +uyurex* at uhidev? reportid ? # USB Keyboards ukbd* at uhidev? reportid ? @@ -1353,7 +1353,7 @@ # IrDA and Consumer Ir devices # Toshiba Oboe -oboe* at pci? dev ? function ? +oboe* at pci? dev ? function ? irframe* at oboe? @@ -1376,7 +1376,7 @@ # CardBus SD/MMC controller sdhc* at cardbus? function ? # SD Host Controller -sdmmc* at sdhc? # SD/MMC bus +sdmmc* at sdhc? # SD/MMC bus ld* at sdmmc? @@ -1412,7 +1412,7 @@ # ISA audio devices # the "aria" probe might give false hits -aria0 at isa? port 0x290 irq 10 # Aria +aria0 at isa? port 0x290 irq 10 # Aria ess0 at isa? port 0x220 irq 5 drq 1 drq2 5 # ESS 18XX gus0 at isa? port 0x220 irq 7 drq 1 drq2 6 # Gravis Ultra Sound pas0 at isa? port 0x220 irq 7 drq 1 # ProAudio Spectrum @@ -1459,15 +1459,15 @@ # FM-Radio devices # ISA radio devices -az0 at isa? port 0x350 # Aztech/PackardBell FM Radio Card +az0 at isa? port 0x350 # Aztech/PackardBell FM Radio Card az1 at isa? port 0x358 -rt0 at isa? port 0x20c # AIMS Lab Radiotrack & compatible +rt0 at isa? port 0x20c # AIMS Lab Radiotrack & compatible rt1 at isa? port 0x284 rt2 at isa? port 0x30c rt3 at isa? port 0x384 -rtii0 at isa? port 0x20c # AIMS Lab Radiotrack II FM Radio Card +rtii0 at isa? port 0x20c # AIMS Lab Radiotrack II FM Radio Card rtii1 at isa? port 0x30c -sf2r0 at isa? port 0x384 # SoundForte RadioLink SF16-FMR2 FM Radio Card +sf2r0 at isa? port 0x384 # SoundForte RadioLink SF16-FMR2 FM Radio Card # PCI radio devices gtp* at pci? dev ? function ? # Guillemot Maxi Radio FM 2000 Radio Card @@ -1482,10 +1482,10 @@ # Video capture devices -pseye* at uhub? # Sony PLAYSTATION(R) Eye webcam +pseye* at uhub? # Sony PLAYSTATION(R) Eye webcam uvideo* at uhub? # USB Video Class capture devices auvitek* at uhub? # Auvitek AU0828 video capture devices -video* at videobus? +video* at videobus? # TV cards @@ -1633,7 +1633,7 @@ pseudo-device loop # network loopback pseudo-device ppp # Point-to-Point Protocol pseudo-device pppoe # PPP over Ethernet (RFC 2516) -options PPPOE_SERVER # Enable PPPoE server via link0 +options PPPOE_SERVER # Enable PPPoE server via link0 pseudo-device sl # Serial Line IP pseudo-device strip # Starmode Radio IP (Metricom) pseudo-device irframetty # IrDA frame line discipline @@ -2328,7 +2328,7 @@ options UBSA_DEBUG options UBSEC_DEBUG options UBT_DEBUG -options UCB1200_DEBUG +options UCB1200_DEBUG options UCBIO_DEBUG options UCBSNDDEBUG options UCBTPDEBUG @@ -2364,7 +2364,7 @@ options URL_DEBUG options USB_DEBUG options USCANNER_DEBUG -options USEFULL_DEBUG +options USEFULL_DEBUG options USSCANNER_DEBUG options USTIR_DEBUG options UTOPPY_DEBUG Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1031 src/sys/arch/i386/conf/GENERIC:1.1032 --- src/sys/arch/i386/conf/GENERIC:1.1031 Tue Apr 26 16:57:40 2011 +++ src/sys/arch/i386/conf/GENERIC Sat May 28 13:01:49 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1031 2011/04/26 16:57:40 joerg Exp $ +# $NetBSD: GENERIC,v 1.1032 2011/05/28 13:01:49 ryo Exp $ # # GENERIC machine description file # @@ -22,14 +22,14 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1031 $" +#ident "GENERIC-$Revision: 1.1032 $" maxusers 64 # estimated number of users # For GENERIC, we build the exec formats as module(7)s by default. -no options EXEC_AOUT # exec a.out binaries -no options EXEC_ELF32 # exec ELF binaries -no options EXEC_SCRIPT # exec #! scripts +no options EXEC_AOUT # exec a.out binaries +no options EXEC_ELF32 # exec ELF binaries +no options EXEC_SCRIPT # exec #! scripts no options COREDUMP # CPU-related options. @@ -123,7 +123,7 @@ #options DDB_VERBOSE_HELP #options KGDB # remote debugger #options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600 -#makeoptions DEBUG="-g" # compile full symbol table +#makeoptions DEBUG="-g" # compile full symbol table #options SYSCALL_STATS # per syscall counts #options SYSCALL_TIMES # per syscall times #options SYSCALL_TIMES_HASCOUNTER # use 'broken' rdtsc (soekris) @@ -205,7 +205,7 @@ #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 MPLS # MultiProtocol Label Switching (needs ifmpls) +#options MPLS # MultiProtocol Label Switching (needs ifmpls) #options MROUTING # IP multicast routing #options PIM # Protocol Independent Multicast #options ISO,TPIP # OSI @@ -334,7 +334,7 @@ #options MPBIOS_SCANPCI # find PCI roots using MPBIOS options ACPI_SCANPCI # find PCI roots using ACPI -acpi0 at mainbus0 +acpi0 at mainbus0 #options ACPI_ACTIVATE_DEV # If set, activate inactive devices options VGA_POST # in-kernel support for VGA POST @@ -347,7 +347,7 @@ acpidalb* at acpi? # ACPI Direct Application Launch Button acpiec* at acpi? # ACPI Embedded Controller (late) acpiecdt* at acpi? # ACPI Embedded Controller (early) -acpifan* at acpi? # ACPI Fan +acpifan* at acpi? # ACPI Fan acpilid* at acpi? # ACPI Lid Switch #acpipmtr* at acpi? # ACPI Power Meter (experimental) #acpismbus* at acpi? # ACPI SMBus CMI (experimental) @@ -372,7 +372,7 @@ mpu* at acpi? # Roland MPU-401 MIDI UART npx* at acpi? # Math coprocessor pckbc* at acpi? # PC keyboard controller -pcppi* at acpi? # AT-style speaker sound +pcppi* at acpi? # AT-style speaker sound sony* at acpi? # Sony Miscellaneous Controller thinkpad* at acpi? # IBM/Lenovo Thinkpad hotkeys ug* at acpi? # Abit uGuru Hardware monitor @@ -382,7 +382,7 @@ wmidell* at acpiwmibus? # Dell WMI mappings wmieeepc* at acpiwmibus? # Asus Eee PC WMI mappings #wmihp* at acpiwmibus? # HP WMI mappings -wmimsi* at acpiwmibus? # MSI WMI mappings +wmimsi* at acpiwmibus? # MSI WMI mappings wss* at acpi? # NeoMagic 256AV in wss mode ym* at acpi? # Yamaha OPL3-SA[23] audio @@ -445,20 +445,20 @@ # System Controllers elansc* at mainbus? bus ? # AMD Elan SC520 System Controller -gpio* at elansc? +gpio* at elansc? # Temperatures amdtemp* at pci? dev ? function ? # AMD CPU Temperature sensors # PCI bridges #amdpcib* at pci? dev ? function ? # AMD 8111 PCI-ISA w/ HPET -#hpet* at amdpcib? +#hpet* at amdpcib? ichlpcib* at pci? dev ? function ? # Intel ICH PCI-LPC w/ timecounter, # watchdog, SpeedStep and HPET fwhrng* at ichlpcib? # Intel 82802 FWH Random Number Generator -#hpet* at ichlpcib? +#hpet* at ichlpcib? gcscpcib* at pci? dev ? function ? # AMD CS5535/CS5536 PCI-ISA w/ -gpio* at gcscpcib? # timecounter, watchdog and GPIO +gpio* at gcscpcib? # timecounter, watchdog and GPIO #piixpcib* at pci? dev ? function ? # Intel PIIX4 PCI-ISA w/ SpeedStep #gscpcib* at pci? dev ? function ? # NS Geode PCI-ISA w/ GPIO support viapcib* at pci? dev ? function ? # VIA VT8235 PCI-ISA w/ SMBus support @@ -473,7 +473,7 @@ # XXX 'puc's aren't really bridges, but there's no better place for them here puc* at pci? dev ? function ? # PCI "universal" comm. cards -agp* at pchb? +agp* at pchb? # EISA bus support @@ -481,8 +481,8 @@ eisa0 at pceb? # ISA bus support -#isa0 at amdpcib? -isa0 at gcscpcib? +#isa0 at amdpcib? +isa0 at gcscpcib? isa0 at ichlpcib? #isa0 at piixpcib? #isa0 at gscpcib? @@ -551,8 +551,8 @@ wsmouse* at pms? mux 0 # VIA Unichrome framebuffer console -#unichromefb* at pci? dev ? function ? -#wsdisplay* at unichromefb? +#unichromefb* at pci? dev ? function ? +#wsdisplay* at unichromefb? attimer0 at isa? pcppi0 at isa? @@ -561,13 +561,13 @@ # DRI driver i915drm* at drm? # Intel i915, i945 DRM driver mach64drm* at drm? # mach64 (3D Rage Pro, Rage) DRM driver -mgadrm* at drm? # Matrox G[24]00, G[45]50 DRM driver +mgadrm* at drm? # Matrox G[24]00, G[45]50 DRM driver r128drm* at drm? # ATI Rage 128 DRM driver radeondrm* at drm? # ATI Radeon DRM driver savagedrm* at drm? # S3 Savage DRM driver -sisdrm* at drm? # SiS DRM driver +sisdrm* at drm? # SiS DRM driver tdfxdrm* at drm? # 3dfx (voodoo) DRM driver -viadrm* at drm? # VIA DRM driver +viadrm* at drm? # VIA DRM driver # Serial Devices @@ -654,7 +654,7 @@ #dbcool* at iic? addr 0x2E # Tyan S2882-D # IBM Thinkpad Active Protection System -#aps0 at isa? port 0x1600 +#aps0 at isa? port 0x1600 # Fintek Super I/O with hardware monitor #finsio0 at isa? port 0x4e @@ -686,7 +686,7 @@ #gpio* at nsclpcsio? # Abit uGuru Hardware system monitor -#ug0 at isa? port 0xe0 +#ug0 at isa? port 0xe0 # VIA VT82C686A/VT8231 Hardware Monitor and Power Management Timer #viaenv* at pci? dev ? function ? @@ -753,10 +753,10 @@ # 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 +spc* at pcmcia? function ? # Fujitsu MB87030/MB89352 SCSI # ISA Plug-and-Play SCSI controllers -aha* at isapnp? # Adaptec AHA-154[02 +aha* at isapnp? # Adaptec AHA-154[02 aic* at isapnp? # Adaptec AHA-1520B # ISA SCSI controllers @@ -828,21 +828,21 @@ # a machine hang with some controllers. 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 -ahcisata* at pci? dev ? function ? # AHCI SATA controllers -artsata* at pci? dev ? function ? # Intel i31244 SATA controller +aceride* at pci? dev ? function ? # Acer Lab IDE controllers +ahcisata* at pci? dev ? function ? # AHCI SATA 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 -gcscide* at pci? dev ? function ? # AMD CS5535 Companion IDE controllers -geodeide* at pci? dev ? function ? # AMD Geode IDE controllers +gcscide* at pci? dev ? function ? # AMD CS5535 Companion IDE controllers +geodeide* at pci? dev ? function ? # AMD Geode IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers iteide* at pci? dev ? function ? # IT Express IDE controllers ixpide* at pci? dev ? function ? # ATI IXP IDE controllers jmide* at pci? dev ? function ? # JMicron PCI-e PATA/SATA controllers -ahcisata* at jmide? +ahcisata* at jmide? mvsata* at pci? dev ? function ? # Marvell Hercules-I/II -optiide* at pci? dev ? function ? # Opti IDE controllers -piixide* at pci? dev ? function ? # Intel IDE controllers +optiide* at pci? dev ? function ? # Opti IDE controllers +piixide* at pci? dev ? function ? # Intel IDE controllers pdcide* at pci? dev ? function ? # Promise IDE controllers pdcsata* at pci? dev ? function ? # Promise SATA150 controllers rccide* at pci? dev ? function ? # ServerWorks IDE controllers @@ -852,7 +852,7 @@ siisata* at pci? dev ? function ? # SiI SteelVine controllers siside* at pci? dev ? function ? # SiS IDE controllers slide* at pci? dev ? function ? # Symphony Labs IDE controllers -svwsata* at pci? dev ? function ? # ServerWorks SATA controllers +svwsata* at pci? dev ? function ? # ServerWorks SATA controllers stpcide* at pci? dev ? function ? # STMicro STPC IDE controllers toshide* at pci? dev ? function ? # TOSHIBA PICCOLO controllers viaide* at pci? dev ? function ? # VIA/AMD/Nvidia IDE controllers @@ -938,9 +938,9 @@ ale* at pci? dev ? function ? # Attansic/Atheros L1E Ethernet ath* at pci? dev ? function ? # Atheros 5210/5211/5212 802.11 atw* at pci? dev ? function ? # ADMtek ADM8211 (802.11) -bce* at pci? dev ? function ? # Broadcom 4401 10/100 Ethernet +bce* at pci? dev ? function ? # Broadcom 4401 10/100 Ethernet bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet -bnx* at pci? dev ? function ? # Broadcom NetXtremeII gigabit Ethernet +bnx* at pci? dev ? function ? # Broadcom NetXtremeII gigabit Ethernet bwi* at pci? dev ? function ? # Broadcom BCM43xx wireless dge* at pci? dev ? function ? # Intel 82597 10GbE LR en* at pci? dev ? function ? # ENI/Adaptec ATM @@ -963,7 +963,7 @@ mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet msk* at mskc? # Marvell Yukon 2 Gigabit Ethernet mtd* at pci? dev ? function ? # Myson MTD803 3-in-1 Ethernet -#ndis* at pci? dev ? function ? # Experimental - NDIS Network Driver +#ndis* at pci? dev ? function ? # Experimental - NDIS Network Driver ne* at pci? dev ? function ? # NE2000-compatible Ethernet nfe* at pci? dev ? function ? # NVIDIA nForce Ethernet ntwoc* at pci? dev ? function ? # Riscom/N2 PCI Sync Serial @@ -1098,7 +1098,7 @@ nsphyter* at mii? phy ? # NS83843 PHYs pnaphy* at mii? phy ? # generic HomePNA PHYs qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs -rdcphy* at mii? phy ? # RDC R6040 10/100 PHY +rdcphy* at mii? phy ? # RDC R6040 10/100 PHY 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 @@ -1185,18 +1185,18 @@ uaudio* at usbifif? # USB MIDI -umidi* at uhub? port ? configuration ? +umidi* at uhub? port ? configuration ? # USB IrDA # USB-IrDA bridge spec -uirda* at uhub? port ? configuration ? interface ? +uirda* at uhub? port ? configuration ? interface ? irframe* at uirda? stuirda* at uhub? port ? configuration ? interface ? irframe* at stuirda? # SigmaTel STIr4200 USB/IrDA Bridge -ustir* at uhub? port ? +ustir* at uhub? port ? irframe* at ustir? # USB Ethernet adapters @@ -1418,10 +1418,10 @@ # Video capture devices -pseye* at uhub? # Sony PLAYSTATION(R) Eye webcam +pseye* at uhub? # Sony PLAYSTATION(R) Eye webcam uvideo* at uhub? # USB Video Class capture devices auvitek* at uhub? # Auvitek AU0828 video capture devices -video* at videobus? +video* at videobus? # TV cards @@ -1560,7 +1560,7 @@ #pseudo-device ifmpls # MPLS pseudo-interface pseudo-device ppp # Point-to-Point Protocol pseudo-device pppoe # PPP over Ethernet (RFC 2516) -#options PPPOE_SERVER # Enable PPPoE server via link0 +#options PPPOE_SERVER # Enable PPPoE server via link0 pseudo-device sl # Serial Line IP pseudo-device strip # Starmode Radio IP (Metricom) pseudo-device irframetty # IrDA frame line discipline Index: src/sys/arch/i386/conf/GENERIC_PS2TINY diff -u src/sys/arch/i386/conf/GENERIC_PS2TINY:1.61 src/sys/arch/i386/conf/GENERIC_PS2TINY:1.62 --- src/sys/arch/i386/conf/GENERIC_PS2TINY:1.61 Tue Nov 23 11:14:00 2010 +++ src/sys/arch/i386/conf/GENERIC_PS2TINY Sat May 28 13:01:49 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC_PS2TINY,v 1.61 2010/11/23 11:14:00 hannken Exp $ +# $NetBSD: GENERIC_PS2TINY,v 1.62 2011/05/28 13:01:49 ryo Exp $ # # GENERIC-style kernel config for IBM PS/2 with MCA bus. It only contains # IBM PS/2 related stuff and has been generally trimmed down somewhat, @@ -65,8 +65,8 @@ options DDB_HISTORY_SIZE=512 # enable history editing in DDB #options KGDB # remote debugger #options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600 -#makeoptions DEBUG="-g" # compile full symbol table -makeoptions COPTS="-Os" # generates smaller code than -O2, -O1 +#makeoptions DEBUG="-g" # compile full symbol table +makeoptions COPTS="-Os" # generates smaller code than -O2, -O1 makeoptions USE_SSP="no" # File systems Index: src/sys/arch/i386/conf/GENERIC_TINY diff -u src/sys/arch/i386/conf/GENERIC_TINY:1.127 src/sys/arch/i386/conf/GENERIC_TINY:1.128 --- src/sys/arch/i386/conf/GENERIC_TINY:1.127 Sun Mar 6 17:08:25 2011 +++ src/sys/arch/i386/conf/GENERIC_TINY Sat May 28 13:01:49 2011 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC_TINY,v 1.127 2011/03/06 17:08:25 bouyer Exp $ +# $NetBSD: GENERIC_TINY,v 1.128 2011/05/28 13:01:49 ryo Exp $ # # GENERIC_TINY -- suitable default for 4M machines # No EISA, PCI, or SCSI. @@ -8,7 +8,7 @@ #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -makeoptions COPTS="-Os" +makeoptions COPTS="-Os" makeoptions USE_SSP="no" maxusers 8 # estimated number of users @@ -56,7 +56,7 @@ #options DDB_HISTORY_SIZE=512 # enable history editing in DDB #options KGDB # remote debugger #options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600 -#makeoptions DEBUG="-g" # compile full symbol table +#makeoptions DEBUG="-g" # compile full symbol table # Compatibility options #options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI Index: src/sys/arch/i386/conf/INSTALL diff -u src/sys/arch/i386/conf/INSTALL:1.329 src/sys/arch/i386/conf/INSTALL:1.330 --- src/sys/arch/i386/conf/INSTALL:1.329 Fri Feb 11 01:59:57 2011 +++ src/sys/arch/i386/conf/INSTALL Sat May 28 13:01:50 2011 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.329 2011/02/11 01:59:57 jmcneill Exp $ +# $NetBSD: INSTALL,v 1.330 2011/05/28 13:01:50 ryo Exp $ # # INSTALL - Installation kernel. # @@ -7,12 +7,12 @@ include "arch/i386/conf/MONOLITHIC" -#ident "INSTALL-$Revision: 1.329 $" +#ident "INSTALL-$Revision: 1.330 $" no options MEMORY_DISK_DYNAMIC -options MEMORY_DISK_IS_ROOT # force root on memory disk -options MEMORY_DISK_SERVER=0 # no userspace memory disk support -options MEMORY_DISK_ROOT_SIZE=10000 # size of memory disk, in blocks +options MEMORY_DISK_IS_ROOT # force root on memory disk +options MEMORY_DISK_SERVER=0 # no userspace memory disk support +options MEMORY_DISK_ROOT_SIZE=10000 # size of memory disk, in blocks options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode # DRI driver Index: src/sys/arch/i386/conf/INSTALL_FLOPPY diff -u src/sys/arch/i386/conf/INSTALL_FLOPPY:1.12 src/sys/arch/i386/conf/INSTALL_FLOPPY:1.13 --- src/sys/arch/i386/conf/INSTALL_FLOPPY:1.12 Sun Mar 6 17:08:26 2011 +++ src/sys/arch/i386/conf/INSTALL_FLOPPY Sat May 28 13:01:50 2011 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL_FLOPPY,v 1.12 2011/03/06 17:08:26 bouyer Exp $ +# $NetBSD: INSTALL_FLOPPY,v 1.13 2011/05/28 13:01:50 ryo Exp $ # # INSTALL - Installation kernel. # @@ -13,9 +13,9 @@ #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -makeoptions CPUFLAGS="-march=i486 -mtune=i486" # i486 is densest code -makeoptions COPTS="-Os" -makeoptions USE_SSP="no" +makeoptions CPUFLAGS="-march=i486 -mtune=i486" # i486 is densest code +makeoptions COPTS="-Os" +makeoptions USE_SSP="no" # Enable the hooks used for initializing the root memory-disk. options MEMORY_DISK_HOOKS @@ -75,7 +75,7 @@ #options DDB_HISTORY_SIZE=512 # enable history editing in DDB #options KGDB # remote debugger #options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600 -#makeoptions DEBUG="-g" # compile full symbol table +#makeoptions DEBUG="-g" # compile full symbol table # Compatibility options #options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI @@ -154,7 +154,7 @@ # # wscons options # -# builtin terminal emulations +# builtin terminal emulations #options WSEMUL_SUN # sun terminal emulation options WSEMUL_VT100 # VT100 / VT220 emulation # customization of console and kernel output - see dev/wscons/wsdisplayvar.h @@ -229,10 +229,10 @@ pcmcia* at tcic? controller ? socket ? # ISA PCMCIA controllers -pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000 -pcic1 at isa? port 0x3e2 iomem 0xe0000 iosiz 0x4000 +pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000 +pcic1 at isa? port 0x3e2 iomem 0xe0000 iosiz 0x4000 pcic2 at isa? port 0x3e4 iomem 0xe0000 iosiz 0x4000 -tcic0 at isa? port 0x240 iomem 0xd0000 iosiz 0x10000 +tcic0 at isa? port 0x240 iomem 0xd0000 iosiz 0x10000 # PCI PCMCIA controllers pcic0 at pci? dev? function ? @@ -343,7 +343,7 @@ aic* at pcmcia? function ? # Adaptec APA-1460 SCSI # ISA Plug-and-Play SCSI controllers -aha* at isapnp? # Adaptec AHA-154[02 +aha* at isapnp? # Adaptec AHA-154[02 aic* at isapnp? # Adaptec AHA-1520B # ISA SCSI controllers @@ -405,24 +405,24 @@ # a machine hang with some controllers. 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 -#ahcisata* at pci? dev ? function ? # AHCI SATA controllers +aceride* at pci? dev ? function ? # Acer Lab IDE controllers +#ahcisata* at pci? dev ? function ? # AHCI SATA 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 -geodeide* at pci? dev ? function ? # AMD Geode IDE controllers +geodeide* at pci? dev ? function ? # AMD Geode IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers iteide* at pci? dev ? function ? # IT Express IDE controllers #ixpide* at pci? dev ? function ? # ATI IXP IDE controllers -optiide* at pci? dev ? function ? # Opti IDE controllers -piixide* at pci? dev ? function ? # Intel IDE controllers +optiide* at pci? dev ? function ? # Opti IDE controllers +piixide* at pci? dev ? function ? # Intel IDE controllers pdcide* at pci? dev ? function ? # Promise IDE controllers pdcsata* at pci? dev ? function ? # Promise SATA150 controllers rccide* at pci? dev ? function ? # ServerWorks IDE 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 -#svwsata* at pci? dev ? function ? # ServerWorks SATA controllers +#svwsata* at pci? dev ? function ? # ServerWorks SATA controllers viaide* at pci? dev ? function ? # VIA/AMD/Nvidia IDE controllers stpcide* at pci? dev ? function ? # STMicro STPC IDE controllers @@ -495,9 +495,9 @@ an* at pci? dev ? function ? # Aironet PC4500/PC4800 (802.11) ath* at pci? dev ? function ? # Atheros 5210/5211/5212 802.11 atw* at pci? dev ? function ? # ADMtek ADM8211 (802.11) -bce* at pci? dev ? function ? # Broadcom 4401 10/100 Ethernet -bge* at pci? dev ? function ? # Broadcom 570x Gigabit Ethernet -# bnx* at pci? dev ? function ? # Broadcom NetXtremeII gigabit Ethernet +bce* at pci? dev ? function ? # Broadcom 4401 10/100 Ethernet +bge* at pci? dev ? function ? # Broadcom 570x Gigabit Ethernet +# bnx* at pci? dev ? function ? # Broadcom NetXtremeII gigabit Ethernet #en* at pci? dev ? function ? # ENI/Adaptec ATM ep* at pci? dev ? function ? # 3Com 3c59x ex* at pci? dev ? function ? # 3Com 3c90x[BC] @@ -557,7 +557,7 @@ 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) +ray* at pcmcia? function ? # Raytheon Raylink (802.11) sm* at pcmcia? function ? # Megahertz Ethernet wi* at pcmcia? function ? # Lucent/Intersil WaveLAN/IEEE (802.11) options WI_PCMCIA_SPECTRUM24T_FW=0 @@ -673,10 +673,10 @@ # USB Ethernet adapters #atu* at uhub? port ? # Atmel AT76C50XX based adapters -aue* at uhub? port ? # ADMtek AN986 Pegasus based 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 +cue* at uhub? port ? # CATC USB-EL1201A based adapters +kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters url* at uhub? port ? # Realtek RTL8150L based adapters # Audio Devices Index: src/sys/arch/i386/conf/INSTALL_XEN3_DOMU diff -u src/sys/arch/i386/conf/INSTALL_XEN3_DOMU:1.12 src/sys/arch/i386/conf/INSTALL_XEN3_DOMU:1.13 --- src/sys/arch/i386/conf/INSTALL_XEN3_DOMU:1.12 Sun Jan 3 03:53:34 2010 +++ src/sys/arch/i386/conf/INSTALL_XEN3_DOMU Sat May 28 13:01:50 2011 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL_XEN3_DOMU,v 1.12 2010/01/03 03:53:34 dholland Exp $ +# $NetBSD: INSTALL_XEN3_DOMU,v 1.13 2011/05/28 13:01:50 ryo Exp $ # # INSTALL_XEN3_DOMU - Installation kernel for Xen 3/DomU. # @@ -7,10 +7,10 @@ include "arch/i386/conf/XEN3_DOMU" -#ident "INSTALL-$Revision: 1.12 $" +#ident "INSTALL-$Revision: 1.13 $" options MEMORY_DISK_HOOKS -options MEMORY_DISK_IS_ROOT # force root on memory disk -options MEMORY_DISK_SERVER=0 # no userspace memory disk support -options MEMORY_DISK_ROOT_SIZE=10000 # size of memory disk, in blocks +options MEMORY_DISK_IS_ROOT # force root on memory disk +options MEMORY_DISK_SERVER=0 # no userspace memory disk support +options MEMORY_DISK_ROOT_SIZE=10000 # size of memory disk, in blocks options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode Index: src/sys/arch/i386/conf/INSTALL_TINY diff -u src/sys/arch/i386/conf/INSTALL_TINY:1.132 src/sys/arch/i386/conf/INSTALL_TINY:1.133 --- src/sys/arch/i386/conf/INSTALL_TINY:1.132 Sun Mar 6 17:08:26 2011 +++ src/sys/arch/i386/conf/INSTALL_TINY Sat May 28 13:01:50 2011 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL_TINY,v 1.132 2011/03/06 17:08:26 bouyer Exp $ +# $NetBSD: INSTALL_TINY,v 1.133 2011/05/28 13:01:50 ryo Exp $ # # This kernel should be derived from INSTALL (which is derived # from GENERIC) with some features commented out. @@ -12,7 +12,7 @@ #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -makeoptions COPTS="-Os" # Optimise for space. Implies -O2 +makeoptions COPTS="-Os" # Optimise for space. Implies -O2 makeoptions USE_SSP="no" # Enable the hooks used for initializing the root memory-disk. @@ -64,7 +64,7 @@ #options DDB_HISTORY_SIZE=512 # enable history editing in DDB #options KGDB # remote debugger #options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600 -#makeoptions DEBUG="-g" # compile full symbol table +#makeoptions DEBUG="-g" # compile full symbol table # Compatibility options #options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI @@ -235,8 +235,8 @@ # wscons pckbc0 at isa? # PC keyboard controller pckbd* at pckbc? # PC keyboard -pcdisplay0 at isa? # CGA, MDA, EGA, HGA -wsdisplay* at pcdisplay? console ? +pcdisplay0 at isa? # CGA, MDA, EGA, HGA +wsdisplay* at pcdisplay? console ? wskbd* at pckbd? console ? #wsmouse* at pms? mux 0 Index: src/sys/arch/i386/conf/INSTALL_XEN3PAE_DOMU diff -u src/sys/arch/i386/conf/INSTALL_XEN3PAE_DOMU:1.5 src/sys/arch/i386/conf/INSTALL_XEN3PAE_DOMU:1.6 --- src/sys/arch/i386/conf/INSTALL_XEN3PAE_DOMU:1.5 Sun Jan 3 03:53:34 2010 +++ src/sys/arch/i386/conf/INSTALL_XEN3PAE_DOMU Sat May 28 13:01:50 2011 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL_XEN3PAE_DOMU,v 1.5 2010/01/03 03:53:34 dholland Exp $ +# $NetBSD: INSTALL_XEN3PAE_DOMU,v 1.6 2011/05/28 13:01:50 ryo Exp $ # # INSTALL_XEN3PAE_DOMU - Installation kernel for Xen 3/DomU with PAE. # @@ -7,10 +7,10 @@ include "arch/i386/conf/XEN3PAE_DOMU" -#ident "INSTALL-$Revision: 1.5 $" +#ident "INSTALL-$Revision: 1.6 $" options MEMORY_DISK_HOOKS -options MEMORY_DISK_IS_ROOT # force root on memory disk -options MEMORY_DISK_SERVER=0 # no userspace memory disk support -options MEMORY_DISK_ROOT_SIZE=10000 # size of memory disk, in blocks +options MEMORY_DISK_IS_ROOT # force root on memory disk +options MEMORY_DISK_SERVER=0 # no userspace memory disk support +options MEMORY_DISK_ROOT_SIZE=10000 # size of memory disk, in blocks options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode Index: src/sys/arch/i386/conf/NET4501 diff -u src/sys/arch/i386/conf/NET4501:1.75 src/sys/arch/i386/conf/NET4501:1.76 --- src/sys/arch/i386/conf/NET4501:1.75 Tue Apr 26 16:57:40 2011 +++ src/sys/arch/i386/conf/NET4501 Sat May 28 13:01:50 2011 @@ -1,23 +1,23 @@ -# $NetBSD: NET4501,v 1.75 2011/04/26 16:57:40 joerg Exp $ +# $NetBSD: NET4501,v 1.76 2011/05/28 13:01:50 ryo Exp $ # # NET4501 -- kernel configuration for a Soekris Engineering net4501 # single-board computer. # # http://www.soekris.com/ -# +# include "arch/i386/conf/std.i386" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "NET4501-$Revision: 1.75 $" +#ident "NET4501-$Revision: 1.76 $" maxusers 32 # estimated number of users # AMD Elan SC520's timer runs at a different frequency options TIMER_FREQ=1189200 -makeoptions COPTS="-Os" +makeoptions COPTS="-Os" # CPU-related options. #options VM86 # virtual 8086 emulation @@ -74,7 +74,7 @@ options DDB_HISTORY_SIZE=512 # enable history editing in DDB #options KGDB # remote debugger #options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600 -#makeoptions DEBUG="-g" # compile full symbol table +#makeoptions DEBUG="-g" # compile full symbol table # Compatibility options options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI @@ -185,7 +185,7 @@ elansc* at mainbus? bus ? # Elan SC520 System Controller #elanpar* at elansc? # Programmable Address Regions #elanpex* at elansc? # PCI Exception Instrumentation -gpio* at elansc? +gpio* at elansc? #gpioow* at gpio? offset 6 mask 0x1 # 1-wire bus bitbanging via gpio #onewire* at gpioow? Index: src/sys/arch/i386/conf/XBOX diff -u src/sys/arch/i386/conf/XBOX:1.25 src/sys/arch/i386/conf/XBOX:1.26 --- src/sys/arch/i386/conf/XBOX:1.25 Sat Nov 27 20:18:46 2010 +++ src/sys/arch/i386/conf/XBOX Sat May 28 13:01:50 2011 @@ -1,4 +1,4 @@ -# $NetBSD: XBOX,v 1.25 2010/11/27 20:18:46 christos Exp $ +# $NetBSD: XBOX,v 1.26 2011/05/28 13:01:50 ryo Exp $ # # XBOX -- A basic Microsoft XBox kernel config file. # @@ -33,7 +33,7 @@ options DDB_HISTORY_SIZE=512 # enable history editing in DDB #options KGDB # remote debugger #options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600 -#makeoptions DEBUG="-g" # compile full symbol table +#makeoptions DEBUG="-g" # compile full symbol table # Compatibility options options COMPAT_30 # NetBSD 3.0 @@ -94,7 +94,7 @@ pcib* at pci? dev ? function ? # PCI-ISA bridges ppb* at pci? dev ? function ? # PCI-PCI bridges -agp* at pchb? +agp* at pchb? # ISA bus support isa0 at pcib? @@ -110,7 +110,7 @@ # XBOX X3LCD console #x3lcd0 at isa0 #x3lcd0 at mainbus? -#wsdisplay* at x3lcd0 console ? +#wsdisplay* at x3lcd0 console ? # I2C/SMBus support amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface Index: src/sys/arch/i386/conf/XEN3_DOM0 diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.51 src/sys/arch/i386/conf/XEN3_DOM0:1.52 --- src/sys/arch/i386/conf/XEN3_DOM0:1.51 Fri Apr 29 01:51:52 2011 +++ src/sys/arch/i386/conf/XEN3_DOM0 Sat May 28 13:01:50 2011 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.51 2011/04/29 01:51:52 jym Exp $ +# $NetBSD: XEN3_DOM0,v 1.52 2011/05/28 13:01:50 ryo Exp $ # # XEN3_0: Xen 3.0 domain0 kernel @@ -14,7 +14,7 @@ # options XEN -#options __XEN_INTERFACE_VERSION__=0x00030205 # Xen 3.1 interface +#options __XEN_INTERFACE_VERSION__=0x00030205 # Xen 3.1 interface # boot messages with MPBIOS, acpi and ioapic can be quite large options MSGBUFSIZE=24576 @@ -24,7 +24,7 @@ # to a domU, at the expense of a higher memory usage by the network stack. #options MCLSHIFT=12 -makeoptions CPUFLAGS="-march=i686" +makeoptions CPUFLAGS="-march=i686" #options VM86 # virtual 8086 emulation #options USER_LDT # user-settable LDT; used by WINE @@ -61,14 +61,14 @@ # Diagnostic/debugging support options options DIAGNOSTIC # expensive kernel consistency checks -options DEBUG # expensive debugging checks/support +options DEBUG # expensive debugging checks/support options KMEMSTATS # kernel memory statistics (vmstat -m) options DDB # in-kernel debugger options DDB_ONPANIC=1 # see also sysctl(8): `ddb.onpanic' options DDB_HISTORY_SIZE=512 # enable history editing in DDB #options KGDB # remote debugger #options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x2f8,KGDB_DEVRATE=57600 -#makeoptions DEBUG="-g" # compile full symbol table +#makeoptions DEBUG="-g" # compile full symbol table options DDB_COMMANDONENTER="trace;show registers" # Compatibility options @@ -236,7 +236,7 @@ # XXX 'puc's aren't really bridges, but there's no better place for them here puc* at pci? dev ? function ? # PCI "universal" comm. cards -agp* at pchb? +agp* at pchb? # ISA bus support isa0 at ichlpcib? @@ -300,9 +300,9 @@ ale* at pci? dev ? function ? # Attansic/Atheros L1E Ethernet ath* at pci? dev ? function ? # Atheros 5210/5211/5212 802.11 atw* at pci? dev ? function ? # ADMtek ADM8211 (802.11) -bce* at pci? dev ? function ? # Broadcom 4401 10/100 Ethernet -bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet -bnx* at pci? dev ? function ? # Broadcom NetXtremeII gigabit Ethernet +bce* at pci? dev ? function ? # Broadcom 4401 10/100 Ethernet +bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet +bnx* at pci? dev ? function ? # Broadcom NetXtremeII gigabit Ethernet dge* at pci? dev ? function ? # Intel 82597 10GbE LR en* at pci? dev ? function ? # ENI/Adaptec ATM ep* at pci? dev ? function ? # 3Com 3c59x @@ -316,7 +316,7 @@ hme* at pci? dev ? function ? # Sun Microelectronics STP2002-STQ ipw* at pci? dev ? function ? # Intel PRO/Wireless 2100 iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG -iwn* at pci? dev ? function ? # Intel PRO/Wireless 4965AGN +iwn* at pci? dev ? function ? # Intel PRO/Wireless 4965AGN jme* at pci? dev ? function ? # JMicron JMC2[56]0 Ethernet le* at pci? dev ? function ? # PCnet-PCI Ethernet lii* at pci? dev ? function ? # Atheros L2 Fast-Ethernet @@ -393,19 +393,19 @@ # a machine hang with some controllers. 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 -ahcisata* at pci? dev ? function ? # AHCI SATA controllers -artsata* at pci? dev ? function ? # Intel i31244 SATA controller +aceride* at pci? dev ? function ? # Acer Lab IDE controllers +ahcisata* at pci? dev ? function ? # AHCI SATA 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 -geodeide* at pci? dev ? function ? # AMD Geode IDE controllers +geodeide* at pci? dev ? function ? # AMD Geode IDE controllers hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers iteide* at pci? dev ? function ? # IT Express IDE controllers ixpide* at pci? dev ? function ? # ATI IXP IDE controllers -jmide* at pci? dev ? function ? # JMicron PCI-e PATA/SATA controllers -ahcisata* at jmide? -optiide* at pci? dev ? function ? # Opti IDE controllers -piixide* at pci? dev ? function ? # Intel IDE controllers +jmide* at pci? dev ? function ? # JMicron PCI-e PATA/SATA controllers +ahcisata* at jmide? +optiide* at pci? dev ? function ? # Opti IDE controllers +piixide* at pci? dev ? function ? # Intel IDE controllers pdcide* at pci? dev ? function ? # Promise IDE controllers pdcsata* at pci? dev ? function ? # Promise SATA150 controllers rccide* at pci? dev ? function ? # ServerWorks IDE controllers @@ -413,8 +413,8 @@ schide* at pci? dev ? function ? # Intel SCH IDE controllers siisata* at pci? dev ? function ? # SiI SteelVine controllers siside* at pci? dev ? function ? # SiS IDE controllers -slide* at pci? dev ? function ? # Symphony Labs IDE controllers -svwsata* at pci? dev ? function ? # ServerWorks SATA controllers +slide* at pci? dev ? function ? # Symphony Labs IDE controllers +svwsata* at pci? dev ? function ? # ServerWorks SATA controllers stpcide* at pci? dev ? function ? # STMicro STPC IDE controllers viaide* at pci? dev ? function ? # VIA/AMD/Nvidia IDE controllers @@ -512,115 +512,115 @@ #machfb* at pci? dev ? function ? # ATI Mach64 framebuffer driver wsdisplay* at vga? console ? #wsdisplay* at pcdisplay? console ? -#wsdisplay* at machfb? console ? +#wsdisplay* at machfb? console ? wskbd* at pckbd? console ? wsmouse* at pms? mux 0 # USB Controller and Devices # PCI USB controllers -ehci* at pci? dev ? function ? # Enhanced Host Controller -ohci* at pci? dev ? function ? # Open Host Controller -uhci* at pci? dev ? function ? # Universal Host Controller (Intel) +ehci* at pci? dev ? function ? # Enhanced Host Controller +ohci* at pci? dev ? function ? # Open Host Controller +uhci* at pci? dev ? function ? # Universal Host Controller (Intel) # USB bus support -usb* at ehci? -usb* at ohci? -usb* at uhci? +usb* at ehci? +usb* at ohci? +usb* at uhci? # USB Hubs -uhub* at usb? -uhub* at uhub? port ? +uhub* at usb? +uhub* at uhub? port ? # USB HID device uhidev* at uhub? port ? configuration ? interface ? # USB Mice -ums* at uhidev? reportid ? +ums* at uhidev? reportid ? wsmouse* at ums? mux 0 # USB eGalax touch-panel -uep* at uhub? port ? +uep* at uhub? port ? wsmouse* at uep? mux 0 # USB Keyboards -ukbd* at uhidev? reportid ? -wskbd* at ukbd? console ? mux 1 +ukbd* at uhidev? reportid ? +wskbd* at ukbd? console ? mux 1 # USB serial adapter ucycom* at uhidev? reportid ? # USB Generic HID devices -uhid* at uhidev? reportid ? +uhid* at uhidev? reportid ? # USB Printer -ulpt* at uhub? port ? configuration ? interface ? +ulpt* at uhub? port ? configuration ? interface ? # USB Modem umodem* at uhub? port ? configuration ? -ucom* at umodem? +ucom* at umodem? # Option N.V. Wireless WAN modems uhso* at uhub? port ? configuration ? # USB Mass Storage -umass* at uhub? port ? configuration ? interface ? -wd* at umass? +umass* at uhub? port ? configuration ? interface ? +wd* at umass? # USB audio uaudio* at uhub? port ? configuration ? # USB MIDI -umidi* at uhub? port ? configuration ? +umidi* at uhub? port ? configuration ? # USB IrDA # USB-IrDA bridge spec -uirda* at uhub? port ? configuration ? interface ? +uirda* at uhub? port ? configuration ? interface ? irframe* at uirda? # SigmaTel STIr4200 USB/IrDA Bridge -ustir* at uhub? port ? +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 -cdce* at uhub? port ? # CDC, Ethernet Networking Control Model -cue* at uhub? port ? # CATC USB-EL1201A based adapters -kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters -udav* at uhub? port ? # Davicom DM9601 based adapters -url* at uhub? port ? # Realtek RTL8150L based adapters +aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters +axe* at uhub? port ? # ASIX AX88172 based adapters +cdce* at uhub? port ? # CDC, Ethernet Networking Control Model +cue* at uhub? port ? # CATC USB-EL1201A based adapters +kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters +udav* at uhub? port ? # Davicom DM9601 based adapters +url* at uhub? port ? # Realtek RTL8150L based adapters # USB 802.11 adapters -atu* at uhub? port ? # Atmel AT76C50XX based adapters +atu* at uhub? port ? # Atmel AT76C50XX based adapters ral* at uhub? port ? # Ralink Technology RT25x0 802.11a/b/g rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g # Prolific PL2301/PL2302 host-to-host adapter -upl* at uhub? port ? +upl* at uhub? port ? # Serial adapters -ubsa* at uhub? port ? # Belkin serial adapter -ucom* at ubsa? portno ? +ubsa* at uhub? port ? # Belkin serial adapter +ucom* at ubsa? portno ? -uftdi* at uhub? port ? # FTDI FT8U100AX serial adapter -ucom* at uftdi? portno ? +uftdi* at uhub? port ? # FTDI FT8U100AX serial adapter +ucom* at uftdi? portno ? -umct* at uhub? port ? # MCT USB-RS232 serial adapter -ucom* at umct? portno ? +umct* at uhub? port ? # MCT USB-RS232 serial adapter +ucom* at umct? portno ? -uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter -ucom* at uplcom? portno ? +uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter +ucom* at uplcom? portno ? -uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial adapter -ucom* at uvscom? portno ? +uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial adapter +ucom* at uvscom? portno ? # Diamond Multimedia Rio 500 -urio* at uhub? port ? +urio* at uhub? port ? # USB Handspring Visor uvisor* at uhub? port ? -ucom* at uvisor? +ucom* at uvisor? # Kyocera AIR-EDGE PHONE ukyopon* at uhub? port ? @@ -633,14 +633,14 @@ usscanner* at uhub? port ? # Y@P firmware loader -uyap* at uhub? port ? +uyap* at uhub? port ? # D-Link DSB-R100 USB radio -udsbr* at uhub? port ? -radio* at udsbr? +udsbr* at uhub? port ? +radio* at udsbr? # USB Generic driver -ugen* at uhub? port ? +ugen* at uhub? port ? # PCI IEEE1394 controllers fwohci* at pci? dev ? function ? # IEEE1394 Open Host Controller @@ -738,7 +738,7 @@ # Pseudo-Devices -pseudo-device crypto # /dev/crypto device +pseudo-device crypto # /dev/crypto device pseudo-device swcrypto # software crypto implementation # disk/mass storage pseudo-devices @@ -807,7 +807,7 @@ pseudo-device wsfont # userland interface to drivers, including autoconf and properties retrieval -pseudo-device drvctl +pseudo-device drvctl # xen pseudo-devices pseudo-device xenevt @@ -826,9 +826,9 @@ # pciback.hide=(bus:dev.fun)(bus:dev.func) to the dom0 kernel boot parameters. # bus and dev are 2-digits hex number, func is a single-digit number: # pciback.hide=(00:1a.0)(00:1a.1)(00:1a.7) -pciback* at pci? #pci backend device +pciback* at pci? #pci backend device -acpi0 at hypervisor? +acpi0 at hypervisor? options MPBIOS options MPDEBUG options MPVERBOSE @@ -840,15 +840,15 @@ ioapic* at mainbus? apid ? # ACPI devices -acpiacad* at acpi? # ACPI AC Adapter -acpibat* at acpi? # ACPI Battery -acpibut* at acpi? # ACPI Button +acpiacad* at acpi? # ACPI AC Adapter +acpibat* at acpi? # ACPI Battery +acpibut* at acpi? # ACPI Button acpidalb* at acpi? # ACPI Direct Application Launch Button # The ACPI Embedded Controller is generally configured via the special ECDT. # This is required as parts of the DSDT can reference the EC before the normal # attach phase. acpiec* at acpi? # ACPI Embedded Controller (late binding) -acpiecdt* at acpi? # ACPI Embedded Controller (early binding) -acpilid* at acpi? # ACPI Lid Switch +acpiecdt* at acpi? # ACPI Embedded Controller (early binding) +acpilid* at acpi? # ACPI Lid Switch aibs* at acpi? # ASUSTeK AI Booster hardware monitor hpqlb* at acpi? # HP Quick Launch Buttons Index: src/sys/arch/i386/conf/XEN3_DOMU diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.34 src/sys/arch/i386/conf/XEN3_DOMU:1.35 --- src/sys/arch/i386/conf/XEN3_DOMU:1.34 Fri Apr 29 01:51:52 2011 +++ src/sys/arch/i386/conf/XEN3_DOMU Sat May 28 13:01:50 2011 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOMU,v 1.34 2011/04/29 01:51:52 jym Exp $ +# $NetBSD: XEN3_DOMU,v 1.35 2011/05/28 13:01:50 ryo Exp $ include "arch/xen/conf/std.xen" @@ -14,7 +14,7 @@ options XEN #options DOM0OPS -makeoptions CPUFLAGS="-march=i686" +makeoptions CPUFLAGS="-march=i686" #options VM86 # virtual 8086 emulation #options USER_LDT # user-settable LDT; used by WINE @@ -47,14 +47,14 @@ # Diagnostic/debugging support options options DIAGNOSTIC # expensive kernel consistency checks -options DEBUG # expensive debugging checks/support +options DEBUG # expensive debugging checks/support options KMEMSTATS # kernel memory statistics (vmstat -m) options DDB # in-kernel debugger options DDB_ONPANIC=1 # see also sysctl(8): `ddb.onpanic' options DDB_HISTORY_SIZE=512 # enable history editing in DDB #options KGDB # remote debugger #options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x2f8,KGDB_DEVRATE=57600 -#makeoptions DEBUG="-g" # compile full symbol table +#makeoptions DEBUG="-g" # compile full symbol table options DDB_COMMANDONENTER="trace;show registers" # Compatibility options @@ -160,9 +160,9 @@ #options NFS_BOOTSTATIC_SERVADDR="\"169.254.1.1\"" #options NFS_BOOTSTATIC_SERVER="\"server:/path/to/root\"" -#options __XEN_INTERFACE_VERSION__=0x00030205 # Xen 3.1 interface +#options __XEN_INTERFACE_VERSION__=0x00030205 # Xen 3.1 interface options XEN_COMPAT_030001 #compatible with Xen3 before 3.0.2 -options MAXPHYS=32768 #xbd doesn't handle 64k transfers +options MAXPHYS=32768 #xbd doesn't handle 64k transfers config netbsd root on ? type ? #config netbsd root on wd0a type ffs @@ -251,7 +251,7 @@ options PAX_MPROTECT=0 # PaX mprotect(2) restrictions options PAX_ASLR=0 # PaX Address Space Layout Randomization -# PCI pass-through support: +# PCI pass-through support: xpci* at xenbus ? #Xen3 PCI front end driver pci* at xpci ? # you then need to add your PCI devices drivers below.