d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge changes from GENERIC into PCCARD (cdrom)

Browse Source 
Merge changes from PCCARD into NEWCARD (cdrom and markm's comments)
This commit is contained in:
Warner Losh 1999-12-19 21:55:29 +00:00
parent 968b30ead8
commit 60a3c2983d
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/i386/conf/NEWCARD
View File

@ -40,8 +40,8 @@ options MATH_EMULATE #Support for x87 emulation
options INET #InterNETworking
options FFS #Berkeley Fast Filesystem
options FFS_ROOT #FFS usable as root device [keep this!]
options MD_ROOT #MD is a potential root device
options MFS #Memory Filesystem
options MD_ROOT #MD is a potential root device
options NFS #Network Filesystem
options NFS_ROOT #NFS usable as root device, "NFS" req'ed
options MSDOSFS #MSDOS Filesystem
@ -118,12 +118,6 @@ device pass0 # Passthrough device (direct SCSI access)
#device amr0 # AMI MegaRAID
#device mlx0 # Mylex DAC960 family
# Proprietary or custom CD-ROM Interfaces
#device wt0 at isa? port 0x300 irq 5 drq 1
#device mcd0 at isa? port 0x300 irq 10
#device matcd0 at isa? port 0x230
#device scd0 at isa? port 0x230
# atkbdc0 controls both the keyboard and the PS/2 mouse
controller atkbdc0 at isa? port IO_KBD
device atkbd0 at atkbdc? irq 1
@ -189,6 +183,8 @@ device xl0 # 3Com 3c90x (``Boomerang'', ``Cyclone'')
# ISA Ethernet NICs.
device ed0 at isa? port 0x280 irq 10 iomem 0xd8000
device ex0 at isa? port? irq?
# NOTE: This removes the isa attachment so that the pccard unit numbers
# come out right.
device ep0
# WaveLAN/IEEE 802.1 wireless NICs. Note: the WaveLAN/IEEE really
# exists only as a PCMCIA device, so there is no ISA attatement needed

6
sys/i386/conf/PCCARD
View File

@ -108,12 +108,6 @@ device pass0 # Passthrough device (direct SCSI access)
#device amr0 # AMI MegaRAID
#device mlx0 # Mylex DAC960 family
# Proprietary or custom CD-ROM Interfaces
device wt0 at isa? port 0x300 irq 5 drq 1
device mcd0 at isa? port 0x300 irq 10
device matcd0 at isa? port 0x230
device scd0 at isa? port 0x230
# atkbdc0 controls both the keyboard and the PS/2 mouse
controller atkbdc0 at isa? port IO_KBD
device atkbd0 at atkbdc? irq 1