Subject: Re: What did I foolishly remove from my kernel config...
To: None <itojun@iijlab.net>
From: gabriel rosenkoetter <gr@eclipsed.net>
List: port-i386
Date: 11/17/2000 14:10:33
--82I3+IH0IqGh5yIs
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
On Sat, Nov 18, 2000 at 04:03:48AM +0900, itojun@iijlab.net wrote:
>
> >... if I'm getting:
> >ioctl(cdromreadtochdr): : Operation not supported by device
>
> diff -c1 YOURKERNELCONFIG GENERIC
Um, that's going to be really messy, considering there's all kinds
of debugging crap from when I was making a Xircom card (xi?) behave
in the PCMCIA slot and trying to figure out exactly which
unsupported audio hardware I had, but here we go...
Oh, if it matters to anyone:
ambriel:~% uname -a
NetBSD ambriel.eclipsed.net 1.5_ALPHA2 NetBSD 1.5_ALPHA2 (AMBRIEL) #0: Mon Sep 25 10:39:32 EDT 2000 gr@ambriel:/usr/src/sys/arch/i386/compile/AMBRIEL i386
(Yes, I'm aware that I'm out of date, but the point is that the
CD-ROM worked just fine before, and I don't *think* it was the move
to ALPHA2 that broke it, though I guess I could be wrong.)
~ g r @ eclipsed.net
--82I3+IH0IqGh5yIs
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="AMBRIEL-GENERIC.diff"
*** AMBRIEL Mon Sep 25 09:47:06 2000
--- GENERIC Thu Sep 21 06:53:53 2000
***************
*** 18,24 ****
# CPU-related options.
! #options MATH_EMULATE # floating point emulation
! #options VM86 # virtual 8086 emulation
! #options USER_LDT # user-settable LDT; used by WINE
# eliminate delay no-ops in I/O; recommended on all but very old machines
! options DUMMY_NOPS
--- 18,24 ----
# CPU-related options.
! options MATH_EMULATE # floating point emulation
! options VM86 # virtual 8086 emulation
! options USER_LDT # user-settable LDT; used by WINE
# eliminate delay no-ops in I/O; recommended on all but very old machines
! #options DUMMY_NOPS
***************
*** 88,90 ****
file-system FFS # UFS
! #file-system EXT2FS # second extended file system (linux)
file-system LFS # log-structured file system
--- 88,90 ----
file-system FFS # UFS
! file-system EXT2FS # second extended file system (linux)
file-system LFS # log-structured file system
***************
*** 106,108 ****
# File system options
! #options QUOTA # UFS quotas
#options FFS_EI # FFS Endian Independent support
--- 106,108 ----
# File system options
! options QUOTA # UFS quotas
#options FFS_EI # FFS Endian Independent support
***************
*** 142,148 ****
#options PCI_CONFIG_DUMP # verbosely dump PCI config space
! options PCMCIAVERBOSE # verbose PCMCIA configuration messages
options SCSIVERBOSE # human readable SCSI error messages
options USBVERBOSE # verbose USB device autoconfig messages
! options PNPBIOSVERBOSE # verbose PnP BIOS messages
! options PNPBIOSDEBUG # more fullsome Pnp BIOS debugging messages
options NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM
--- 142,148 ----
#options PCI_CONFIG_DUMP # verbosely dump PCI config space
! #options PCMCIAVERBOSE # verbose PCMCIA configuration messages
options SCSIVERBOSE # human readable SCSI error messages
options USBVERBOSE # verbose USB device autoconfig messages
! #options PNPBIOSVERBOSE # verbose PnP BIOS messages
! #options PNPBIOSDEBUG # more fullsome Pnp BIOS debugging messages
options NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM
***************
*** 166,168 ****
# allocate a number of virtual screens at autoconfiguration time
! options WSDISPLAY_DEFAULTSCREENS=4
# use a large software cursor that doesn't blink
--- 166,168 ----
# allocate a number of virtual screens at autoconfiguration time
! #options WSDISPLAY_DEFAULTSCREENS=4
# use a large software cursor that doesn't blink
***************
*** 171,173 ****
# Kernel root file system and dump configuration.
! config netbsd root on wd0a type ffs
#config netbsd root on sd0a type ffs
--- 171,173 ----
# Kernel root file system and dump configuration.
! config netbsd root on ? type ?
#config netbsd root on sd0a type ffs
***************
*** 195,203 ****
! pnpbios* at mainbus?
# mainboard audio chips
! ess* at pnpbios? index ? # ESS AudioDrive
! sb* at pnpbios? index ? # NeoMagic 256AV in sb mode
! wss* at pnpbios? index ? # NeoMagic 256AV in wss mode
! ym* at pnpbios? index ? # OPL3-SA3
--- 195,203 ----
! #pnpbios* at mainbus?
# mainboard audio chips
! #ess* at pnpbios? index ? # ESS AudioDrive
! #sb* at pnpbios? index ? # NeoMagic 256AV in sb mode
! #wss* at pnpbios? index ? # NeoMagic 256AV in wss mode
! #ym* at pnpbios? index ? # OPL3-SA3
***************
*** 223,235 ****
pci* at mainbus? bus ?
! #pci* at pchb? bus ?
! #pci* at ppb? bus ?
# Configure PCI using BIOS information
! options PCIBIOS # PCI BIOS support
! options PCIBIOSVERBOSE # PCI BIOS verbose info
! options PCIBIOS_ADDR_FIXUP # fixup PCI I/O addresses
! options PCIBIOS_BUS_FIXUP # fixup PCI bus numbering
! options PCIBIOS_INTR_FIXUP # fixup PCI interrupt routing
! options PCIBIOS_IRQS_HINT=0x0a00 # PCI interrupts hint. IRQ 9 or 11
! options PCIBIOS_INTR_GUESS # see pcibios(4)
#options PCIINTR_DEBUG # super-verbose PCI interrupt fixup
--- 223,235 ----
pci* at mainbus? bus ?
! pci* at pchb? bus ?
! pci* at ppb? bus ?
# Configure PCI using BIOS information
! #options PCIBIOS # PCI BIOS support
! #options PCIBIOSVERBOSE # PCI BIOS verbose info
! #options PCIBIOS_ADDR_FIXUP # fixup PCI I/O addresses
! #options PCIBIOS_BUS_FIXUP # fixup PCI bus numbering
! #options PCIBIOS_INTR_FIXUP # fixup PCI interrupt routing
! #options PCIBIOS_IRQS_HINT=0x0a00 # PCI interrupts hint. IRQ 9 or 11
! #options PCIBIOS_INTR_GUESS # see pcibios(4)
#options PCIINTR_DEBUG # super-verbose PCI interrupt fixup
***************
*** 238,252 ****
pchb* at pci? dev ? function ? # PCI-Host bridges
! #pceb* at pci? dev ? function ? # PCI-EISA bridges
pcib* at pci? dev ? function ? # PCI-ISA bridges
! #ppb* at pci? dev ? function ? # PCI-PCI bridges
# 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
# EISA bus support
! #eisa* at mainbus?
! #eisa* at pceb?
# ISA bus support
! #isa* at mainbus?
! #isa* at pceb?
isa* at pcib?
--- 238,252 ----
pchb* at pci? dev ? function ? # PCI-Host bridges
! pceb* at pci? dev ? function ? # PCI-EISA bridges
pcib* at pci? dev ? function ? # PCI-ISA bridges
! ppb* at pci? dev ? function ? # PCI-PCI bridges
# 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
# EISA bus support
! eisa* at mainbus?
! eisa* at pceb?
# ISA bus support
! isa* at mainbus?
! isa* at pceb?
isa* at pcib?
***************
*** 255,257 ****
pcmcia* at pcic? controller ? socket ?
! #pcmcia* at tcic? controller ? socket ?
--- 255,257 ----
pcmcia* at pcic? controller ? socket ?
! pcmcia* at tcic? controller ? socket ?
***************
*** 259,265 ****
pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000
! #pcic1 at isa? port 0x3e2 iomem 0xe0000 iosiz 0x4000
! #tcic0 at isa? port 0x240 iomem 0xd0000 iosiz 0x10000
# PCI PCMCIA controllers
! #pcic0 at pci? dev? function ?
--- 259,265 ----
pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000
! pcic1 at isa? port 0x3e2 iomem 0xe0000 iosiz 0x4000
! tcic0 at isa? port 0x240 iomem 0xd0000 iosiz 0x10000
# PCI PCMCIA controllers
! pcic0 at pci? dev? function ?
***************
*** 269,279 ****
# ISA Plug-and-Play PCMCIA controllers
! #pcic* at isapnp?
# CardBus bridge support
! cbb* at pci? dev ? function ?
! cardslot* at cbb?
# CardBus bus support
! cardbus* at cardslot?
! pcmcia* at cardslot?
--- 269,279 ----
# ISA Plug-and-Play PCMCIA controllers
! pcic* at isapnp?
# CardBus bridge support
! #cbb* at pci? dev ? function ?
! #cardslot* at cbb?
# CardBus bus support
! #cardbus* at cardslot?
! #pcmcia* at cardslot?
***************
*** 306,315 ****
#opms* at pckbc? # backwards compatible PS/2 mouse
! #vga0 at isa?
vga* at pci? dev ? function ?
! #pcdisplay0 at isa? # CGA, MDA, EGA, HGA
wsdisplay* at vga? console ?
! #wsdisplay* at pcdisplay? console ?
wskbd* at pckbd? console ?
wsmouse* at pms? mux 0
! #wsmouse* at pmsi? mux 0
--- 306,315 ----
#opms* at pckbc? # backwards compatible PS/2 mouse
! vga0 at isa?
vga* at pci? dev ? function ?
! pcdisplay0 at isa? # CGA, MDA, EGA, HGA
wsdisplay* at vga? console ?
! wsdisplay* at pcdisplay? console ?
wskbd* at pckbd? console ?
wsmouse* at pms? mux 0
! wsmouse* at pmsi? mux 0
***************
*** 321,334 ****
# PCI serial interfaces
! #com* at puc? port ? # 16x50s on "universal" comm boards
! #cy* at pci? dev ? function ? # Cyclades Cyclom-Y serial boards
! #cz* at pci? dev ? function ? # Cyclades-Z multi-port serial boards
# ISA Plug-and-Play serial interfaces
! #com* at isapnp? # Modems and serial boards
# 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
--- 321,334 ----
# PCI serial interfaces
! com* at puc? port ? # 16x50s on "universal" comm boards
! cy* at pci? dev ? function ? # Cyclades Cyclom-Y serial boards
! cz* at pci? dev ? function ? # Cyclades-Z multi-port serial boards
# ISA Plug-and-Play serial interfaces
! com* at isapnp? # Modems and serial boards
# 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
***************
*** 360,362 ****
# PCI parallel printer interfaces
! #lpt* at puc? port ? # || ports on "universal" comm boards
--- 360,362 ----
# PCI parallel printer interfaces
! lpt* at puc? port ? # || ports on "universal" comm boards
***************
*** 377,411 ****
# PCI SCSI controllers
! #adv* at pci? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI
! #adw* at pci? dev ? function ? # AdvanSys 9x0UW[D], 3940U[2,3]W SCSI
! #ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI
! #bha* at pci? dev ? function ? # BusLogic 9xx SCSI
! #dpt* at pci? dev ? function ? # DPT SmartCache/SmartRAID
! #isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel
#ncr* at pci? dev ? function ? # NCR 53c8xx SCSI (old driver)
! #siop* at pci? dev ? function ? # Symbios 53c8xx SCSI
! #pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI
# EISA SCSI controllers
! #ahb* at eisa? slot ? # Adaptec 174[02] SCSI
! #ahc* at eisa? slot ? # Adaptec 274x, aic7770 SCSI
! #bha* at eisa? slot ? # BusLogic 7xx SCSI
! #dpt* at eisa? slot ? # DPT EATA SCSI
! #uha* at eisa? slot ? # UltraStor 24f SCSI
# PCMCIA SCSI controllers
! #aic* at pcmcia? function ? # Adaptec APA-1460 SCSI
! #esp* at pcmcia? function ? # Qlogic ESP406/FAS408 SCSI
# ISA Plug-and-Play SCSI controllers
! #aha* at isapnp? # Adaptec AHA-154[02
! #aic* at isapnp? # Adaptec AHA-1520B
# ISA SCSI controllers
! #adv0 at isa? port ? irq ? drq ? # AdvanSys APB-514[02]
! #aha0 at isa? port 0x330 irq ? drq ? # Adaptec 154[02] SCSI
! #aha1 at isa? port 0x334 irq ? drq ?
! #ahc0 at isa? port ? irq ? # Adaptec 284x SCSI
! #aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI
! #bha0 at isa? port 0x330 irq ? drq ? # BusLogic [457]4X SCSI
! #bha1 at isa? port 0x334 irq ? drq ?
# The "nca" and "dpt" probes might give false hits or hang your machine.
--- 377,411 ----
# PCI SCSI controllers
! adv* at pci? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI
! adw* at pci? dev ? function ? # AdvanSys 9x0UW[D], 3940U[2,3]W SCSI
! ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI
! bha* at pci? dev ? function ? # BusLogic 9xx SCSI
! dpt* at pci? dev ? function ? # DPT SmartCache/SmartRAID
! isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel
#ncr* at pci? dev ? function ? # NCR 53c8xx SCSI (old driver)
! siop* at pci? dev ? function ? # Symbios 53c8xx SCSI
! pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI
# EISA SCSI controllers
! ahb* at eisa? slot ? # Adaptec 174[02] SCSI
! ahc* at eisa? slot ? # Adaptec 274x, aic7770 SCSI
! bha* at eisa? slot ? # BusLogic 7xx SCSI
! dpt* at eisa? slot ? # DPT EATA SCSI
! uha* at eisa? slot ? # UltraStor 24f SCSI
# PCMCIA SCSI controllers
! aic* at pcmcia? function ? # Adaptec APA-1460 SCSI
! esp* at pcmcia? function ? # Qlogic ESP406/FAS408 SCSI
# ISA Plug-and-Play SCSI controllers
! aha* at isapnp? # Adaptec AHA-154[02
! aic* at isapnp? # Adaptec AHA-1520B
# ISA SCSI controllers
! adv0 at isa? port ? irq ? drq ? # AdvanSys APB-514[02]
! aha0 at isa? port 0x330 irq ? drq ? # Adaptec 154[02] SCSI
! aha1 at isa? port 0x334 irq ? drq ?
! ahc0 at isa? port ? irq ? # Adaptec 284x SCSI
! aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI
! bha0 at isa? port 0x330 irq ? drq ? # BusLogic [457]4X SCSI
! bha1 at isa? port 0x334 irq ? drq ?
# The "nca" and "dpt" probes might give false hits or hang your machine.
***************
*** 414,420 ****
#nca1 at isa? iomem 0xd8000 irq 5 # Memory-mapped controller (T128, etc.)
! #sea0 at isa? iomem 0xc8000 irq 5 # Seagate/Future Domain SCSI
! #uha0 at isa? port 0x330 irq ? drq ? # UltraStor [13]4f SCSI
! #uha1 at isa? port 0x340 irq ? drq ?
! #wds0 at isa? port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers
! #wds1 at isa? port 0x358 irq 11 drq 5
--- 414,420 ----
#nca1 at isa? iomem 0xd8000 irq 5 # Memory-mapped controller (T128, etc.)
! sea0 at isa? iomem 0xc8000 irq 5 # Seagate/Future Domain SCSI
! uha0 at isa? port 0x330 irq ? drq ? # UltraStor [13]4f SCSI
! uha1 at isa? port 0x340 irq ? drq ?
! wds0 at isa? port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers
! wds1 at isa? port 0x358 irq 11 drq 5
***************
*** 424,455 ****
# SCSI bus support
! #scsibus* at adv?
! #scsibus* at adw?
! #scsibus* at aha?
! #scsibus* at ahb?
! #scsibus* at ahc?
! #scsibus* at aic?
! #scsibus* at bha?
! #scsibus* at dpt?
! #scsibus* at esp?
! #scsibus* at isp?
#scsibus* at nca?
#scsibus* at ncr?
! #scsibus* at pcscp?
! #scsibus* at sea?
! #scsibus* at siop?
! #scsibus* at uha?
! #scsibus* at wds?
# 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
# RAID controllers and devices
! #cac* at pci? dev ? function ? # Compaq array controller
! #ca* at cac? unit ? # Compaq array disk device
--- 424,455 ----
# SCSI bus support
! scsibus* at adv?
! scsibus* at adw?
! scsibus* at aha?
! scsibus* at ahb?
! scsibus* at ahc?
! scsibus* at aic?
! scsibus* at bha?
! scsibus* at dpt?
! scsibus* at esp?
! scsibus* at isp?
#scsibus* at nca?
#scsibus* at ncr?
! scsibus* at pcscp?
! scsibus* at sea?
! scsibus* at siop?
! scsibus* at uha?
! scsibus* at wds?
# 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
# RAID controllers and devices
! cac* at pci? dev ? function ? # Compaq array controller
! ca* at cac? unit ? # Compaq array disk device
***************
*** 463,468 ****
# ISA Plug-and-Play IDE controllers
! #wdc* at isapnp?
# PCMCIA IDE controllers
! #wdc* at pcmcia? function ?
--- 463,468 ----
# ISA Plug-and-Play IDE controllers
! wdc* at isapnp?
# PCMCIA IDE controllers
! wdc* at pcmcia? function ?
***************
*** 472,475 ****
# Some controllers pass the initial 32bit test, but will fail later.
! #wdc0 at isa? port 0x1f0 irq 14 flags 0x00
! #wdc1 at isa? port 0x170 irq 15 flags 0x00
--- 472,475 ----
# Some controllers pass the initial 32bit test, but will fail later.
! wdc0 at isa? port 0x1f0 irq 14 flags 0x00
! wdc1 at isa? port 0x170 irq 15 flags 0x00
***************
*** 486,488 ****
# 0x0000 means "use whatever the drive claims to support".
! #wd* at wdc? channel ? drive ? flags 0x0000
wd* at pciide? channel ? drive ? flags 0x0000
--- 486,488 ----
# 0x0000 means "use whatever the drive claims to support".
! wd* at wdc? channel ? drive ? flags 0x0000
wd* at pciide? channel ? drive ? flags 0x0000
***************
*** 490,492 ****
# ATAPI bus support
! #atapibus* at wdc? channel ?
atapibus* at pciide? channel ?
--- 490,492 ----
# ATAPI bus support
! atapibus* at wdc? channel ?
atapibus* at pciide? channel ?
***************
*** 522,540 ****
# PCI network interfaces
! #de* at pci? dev ? function ? # DEC 21x4x-based Ethernet
! #en* at pci? dev ? function ? # ENI/Adaptec ATM
! #ep* at pci? dev ? function ? # 3Com 3c59x
! #ex* at pci? dev ? function ? # 3Com 90x[B]
! #epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
! #esh* at pci? dev ? function ? # Essential HIPPI card
! #fpa* at pci? dev ? function ? # DEC DEFPA FDDI
! #fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
! #le* at pci? dev ? function ? # PCnet-PCI Ethernet
! #lmc* at pci? dev ? function ? # Lan Media Corp SSI/HSSI/DS3
! #ne* at pci? dev ? function ? # NE2000-compatible Ethernet
! #ntwoc* at pci? dev ? function ? # Riscom/N2 PCI Sync Serial
! #rtk* at pci? dev ? function ? # Realtek 8129/8139
! #sip* at pci? dev ? function ? # SiS 900 Ethernet
! #ti* at pci? dev ? function ? # Alteon ACEnic gigabit Ethernet
! #tl* at pci? dev ? function ? # ThunderLAN-based Ethernet
! #tlp* at pci? dev ? function ? # DECchip 21x4x (and clones) Ethernet
#options TLP_MATCH_21040
--- 522,540 ----
# PCI network interfaces
! de* at pci? dev ? function ? # DEC 21x4x-based Ethernet
! en* at pci? dev ? function ? # ENI/Adaptec ATM
! ep* at pci? dev ? function ? # 3Com 3c59x
! ex* at pci? dev ? function ? # 3Com 90x[B]
! epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
! esh* at pci? dev ? function ? # Essential HIPPI card
! fpa* at pci? dev ? function ? # DEC DEFPA FDDI
! fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
! le* at pci? dev ? function ? # PCnet-PCI Ethernet
! lmc* at pci? dev ? function ? # Lan Media Corp SSI/HSSI/DS3
! ne* at pci? dev ? function ? # NE2000-compatible Ethernet
! ntwoc* at pci? dev ? function ? # Riscom/N2 PCI Sync Serial
! rtk* at pci? dev ? function ? # Realtek 8129/8139
! sip* at pci? dev ? function ? # SiS 900 Ethernet
! ti* at pci? dev ? function ? # Alteon ACEnic gigabit Ethernet
! tl* at pci? dev ? function ? # ThunderLAN-based Ethernet
! tlp* at pci? dev ? function ? # DECchip 21x4x (and clones) Ethernet
#options TLP_MATCH_21040
***************
*** 543,555 ****
#options TLP_MATCH_21142
! #vr* at pci? dev ? function ? # VIA Rhine Fast Ethernet
# EISA network interfaces
! #ep* at eisa? slot ? # 3Com 3c579 Ethernet
! #fea* at eisa? slot ? # DEC DEFEA FDDI
! #tlp* at eisa? slot ? # DEC DE-425 Ethernet
# ISA Plug-and-Play network interfaces
! #ep* at isapnp? # 3Com 3c509 Ethernet
! #ne* at isapnp? # NE2000-compatible Ethernet
! #tr* at isapnp? # IBM/3COM TROPIC Token-Ring
--- 543,555 ----
#options TLP_MATCH_21142
! vr* at pci? dev ? function ? # VIA Rhine Fast Ethernet
# EISA network interfaces
! ep* at eisa? slot ? # 3Com 3c579 Ethernet
! fea* at eisa? slot ? # DEC DEFEA FDDI
! tlp* at eisa? slot ? # DEC DE-425 Ethernet
# ISA Plug-and-Play network interfaces
! ep* at isapnp? # 3Com 3c509 Ethernet
! ne* at isapnp? # NE2000-compatible Ethernet
! tr* at isapnp? # IBM/3COM TROPIC Token-Ring
***************
*** 566,599 ****
! #mhzc* at pcmcia? function ? # Megahertz Ethernet/Modem combo cards
! #com* at mhzc?
! #sm* at mhzc?
# ISA network interfaces
! #ate0 at isa? port 0x2a0 irq ? # AT1700
! #cs0 at isa? port 0x300 iomem ? irq ? drq ? # CS8900 Ethernet
! #ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3Com 3c503 Ethernet
! #eg0 at isa? port 0x280 irq 9 # 3C505 ethernet cards
! #el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards
! #ep* at isa? port ? irq ? # 3C509 ethernet cards
! #ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3C507
! #ai0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN
! #fmv0 at isa? port 0x2a0 irq ? # FMV-180 series
! #ix0 at isa? port 0x300 irq 10 # EtherExpress/16
! #iy0 at isa? port 0x360 irq ? # EtherExpress PRO 10 ISA
! #lc0 at isa? port 0x320 iomem ? irq ? # DEC EtherWORKS III (LEMAC)
#depca0 at isa? port 0x300 iomem 0xc8000 iosiz 0x8000 irq 5 # DEPCA
#le* at depca?
! #nele0 at isa? port 0x320 irq 9 drq 7 # NE2100
! #le* at nele?
#ntwoc0 at isa? port 0x300 irq 5 iomem 0xc8000 flags 1 # Riscom/N2 sync serial
! #bicc0 at isa? port 0x320 irq 10 drq 7 # BICC IsoLan
! #le* at bicc?
! #ne0 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards
! #ne1 at isa? port 0x300 irq 10
! #sm0 at isa? port 0x300 irq 10 # SMC91C9x Ethernet
! #tr0 at isa? port 0xa20 iomem 0xd8000 irq ? # IBM TROPIC based Token-Ring
! #tr1 at isa? port 0xa24 iomem 0xd0000 irq ? # IBM TROPIC based Token-Ring
! #tr* at isa? port ? irq ? # 3COM TROPIC based Token-Ring
! #we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC Ethernet
! #we1 at isa? port 0x300 iomem 0xcc000 irq 10
--- 566,599 ----
! mhzc* at pcmcia? function ? # Megahertz Ethernet/Modem combo cards
! com* at mhzc?
! sm* at mhzc?
# ISA network interfaces
! ate0 at isa? port 0x2a0 irq ? # AT1700
! cs0 at isa? port 0x300 iomem ? irq ? drq ? # CS8900 Ethernet
! ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3Com 3c503 Ethernet
! eg0 at isa? port 0x280 irq 9 # 3C505 ethernet cards
! el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards
! ep* at isa? port ? irq ? # 3C509 ethernet cards
! ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3C507
! ai0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN
! fmv0 at isa? port 0x2a0 irq ? # FMV-180 series
! ix0 at isa? port 0x300 irq 10 # EtherExpress/16
! iy0 at isa? port 0x360 irq ? # EtherExpress PRO 10 ISA
! lc0 at isa? port 0x320 iomem ? irq ? # DEC EtherWORKS III (LEMAC)
#depca0 at isa? port 0x300 iomem 0xc8000 iosiz 0x8000 irq 5 # DEPCA
#le* at depca?
! nele0 at isa? port 0x320 irq 9 drq 7 # NE2100
! le* at nele?
#ntwoc0 at isa? port 0x300 irq 5 iomem 0xc8000 flags 1 # Riscom/N2 sync serial
! bicc0 at isa? port 0x320 irq 10 drq 7 # BICC IsoLan
! le* at bicc?
! ne0 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards
! ne1 at isa? port 0x300 irq 10
! sm0 at isa? port 0x300 irq 10 # SMC91C9x Ethernet
! tr0 at isa? port 0xa20 iomem 0xd8000 irq ? # IBM TROPIC based Token-Ring
! tr1 at isa? port 0xa24 iomem 0xd0000 irq ? # IBM TROPIC based Token-Ring
! tr* at isa? port ? irq ? # 3COM TROPIC based Token-Ring
! we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC Ethernet
! we1 at isa? port 0x300 iomem 0xcc000 irq 10
***************
*** 606,619 ****
# MII/PHY support
! #dmphy* at mii? phy ? # Davicom DM9101 PHYs
! #exphy* at mii? phy ? # 3Com internal PHYs
! #icsphy* at mii? phy ? # Integrated Circuit Systems ICS1890
! #inphy* at mii? phy ? # Intel 82555 PHYs
! #iophy* at mii? phy ? # Intel 82553 PHYs
! #lxtphy* at mii? phy ? # Level One LXT-970 PHYs
! #nsphy* at mii? phy ? # NS83840 PHYs
! #nsphyter* at mii? phy ? # NS83843 PHYs
! #qsphy* at mii? phy ? # Quality Semiconductor QS6612 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
--- 606,619 ----
# MII/PHY support
! dmphy* at mii? phy ? # Davicom DM9101 PHYs
! exphy* at mii? phy ? # 3Com internal PHYs
! icsphy* at mii? phy ? # Integrated Circuit Systems ICS1890
! inphy* at mii? phy ? # Intel 82555 PHYs
! iophy* at mii? phy ? # Intel 82553 PHYs
! lxtphy* at mii? phy ? # Level One LXT-970 PHYs
! nsphy* at mii? phy ? # NS83840 PHYs
! nsphyter* at mii? phy ? # NS83843 PHYs
! qsphy* at mii? phy ? # Quality Semiconductor QS6612 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
***************
*** 623,626 ****
# PCI USB controllers
! #ohci* at pci? dev ? function ? # Open Host Controller
! #uhci* at pci? dev ? function ? # Universal Host Controller (Intel)
--- 623,626 ----
# PCI USB controllers
! ohci* at pci? dev ? function ? # Open Host Controller
! uhci* at pci? dev ? function ? # Universal Host Controller (Intel)
***************
*** 630,671 ****
# USB bus support
! #usb* at ohci?
! #usb* at uhci?
# USB Hubs
! #uhub* at usb?
! #uhub* at uhub? port ? configuration ? interface ?
# USB Mice
! #ums* at uhub? port ? configuration ? interface ?
! #wsmouse* at ums? mux 0
# USB Keyboards
! #ukbd* at uhub? port ? configuration ? interface ?
! #wskbd* at ukbd? console ? mux 1
# USB Generic HID devices
! #uhid* at uhub? port ? configuration ? interface ?
# USB Printer
! #ulpt* at uhub? port ? configuration ? interface ?
# USB Modem
! #umodem* at uhub? port ? configuration ?
! #ucom* at umodem?
# USB Mass Storage
! #umass* at uhub? port ? configuration ? interface ?
! #atapibus* at umass? channel ?
! #scsibus* at umass? channel ?
# USB audio
! #uaudio* at uhub? port ? configuration ?
# USB Ethernet adapters
! #aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters
! #cue* at uhub? port ? # CATC USB-EL1201A based adapters
! #kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters
# Prolofic PL2301/PL2302 host-to-host adapter
! #upl* at uhub? port ?
--- 630,671 ----
# USB bus support
! usb* at ohci?
! usb* at uhci?
# USB Hubs
! uhub* at usb?
! uhub* at uhub? port ? configuration ? interface ?
# USB Mice
! ums* at uhub? port ? configuration ? interface ?
! wsmouse* at ums? mux 0
# USB Keyboards
! ukbd* at uhub? port ? configuration ? interface ?
! wskbd* at ukbd? console ? mux 1
# USB Generic HID devices
! uhid* at uhub? port ? configuration ? interface ?
# USB Printer
! ulpt* at uhub? port ? configuration ? interface ?
# USB Modem
! umodem* at uhub? port ? configuration ?
! ucom* at umodem?
# USB Mass Storage
! umass* at uhub? port ? configuration ? interface ?
! atapibus* at umass? channel ?
! scsibus* at umass? channel ?
# USB audio
! uaudio* at uhub? port ? configuration ?
# USB Ethernet adapters
! aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters
! cue* at uhub? port ? # CATC USB-EL1201A based adapters
! kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters
# Prolofic PL2301/PL2302 host-to-host adapter
! upl* at uhub? port ?
***************
*** 677,686 ****
# Diamond Multimedia Rio 500
! #urio* at uhub? port ?
# USB Handspring Visor
! #uvisor* at uhub? port ?
! #ucom* at uvisor?
# USB Generic driver
! #ugen* at uhub? port ?
--- 677,686 ----
# Diamond Multimedia Rio 500
! urio* at uhub? port ?
# USB Handspring Visor
! uvisor* at uhub? port ?
! ucom* at uvisor?
# USB Generic driver
! ugen* at uhub? port ?
***************
*** 719,727 ****
#opl0 at isa? port 0x388 # use only if not attached to sound card
! #opl* at eso?
! #opl* at ess?
! #opl* at fms?
! #opl* at sb?
! #opl* at sv?
! #opl* at wss?
! #opl* at ym?
--- 719,727 ----
#opl0 at isa? port 0x388 # use only if not attached to sound card
! opl* at eso?
! opl* at ess?
! opl* at fms?
! opl* at sb?
! opl* at sv?
! opl* at wss?
! opl* at ym?
***************
*** 742,744 ****
audio* at sv?
! #audio* at uaudio?
audio* at wss?
--- 742,744 ----
audio* at sv?
! audio* at uaudio?
audio* at wss?
***************
*** 758,760 ****
midi* at mpu? # MPU 401
! #midi* at opl? # OPL FM synth
midi* at pcppi? # MIDI interface to the PC speaker
--- 758,760 ----
midi* at mpu? # MPU 401
! midi* at opl? # OPL FM synth
midi* at pcppi? # MIDI interface to the PC speaker
***************
*** 763,765 ****
# The spkr driver provides a simple tone interface to the built in speaker.
! spkr0 at pcppi? # PC speaker
--- 763,765 ----
# The spkr driver provides a simple tone interface to the built in speaker.
! #spkr0 at pcppi? # PC speaker
***************
*** 768,770 ****
# Brooktree 848/849/878/879 based TV cards
! #bktr* at pci? dev ? function ?
--- 768,770 ----
# Brooktree 848/849/878/879 based TV cards
! bktr* at pci? dev ? function ?
***************
*** 773,780 ****
# ISA busmice
! #lms0 at isa? port 0x23c irq 5 # Logitech bus mouse
! #lms1 at isa? port 0x238 irq 5
! #mms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
! #mms1 at isa? port 0x238 irq 5
! #wsmouse* at lms? mux 0
! #wsmouse* at mms? mux 0
# backwards compatible versions
--- 773,780 ----
# ISA busmice
! lms0 at isa? port 0x23c irq 5 # Logitech bus mouse
! lms1 at isa? port 0x238 irq 5
! mms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
! mms1 at isa? port 0x238 irq 5
! wsmouse* at lms? mux 0
! wsmouse* at mms? mux 0
# backwards compatible versions
***************
*** 790,795 ****
# ISA Plug-and-Play joysticks
! #joy* at isapnp? # Game ports (usually on audio cards)
# PCI joysticks
! #joy* at pci? # Game ports (usually on audio cards)
--- 790,795 ----
# ISA Plug-and-Play joysticks
! joy* at isapnp? # Game ports (usually on audio cards)
# PCI joysticks
! joy* at pci? # Game ports (usually on audio cards)
***************
*** 806,808 ****
# Pull in optional local configuration
! #include "arch/i386/conf/GENERIC.local"
--- 806,808 ----
# Pull in optional local configuration
! include "arch/i386/conf/GENERIC.local"
--82I3+IH0IqGh5yIs--