diff options
author | peter <peter@FreeBSD.org> | 2000-01-24 08:49:24 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2000-01-24 08:49:24 +0000 |
commit | e9cca2953d7504b561271233ec7c23e59ab1be80 (patch) | |
tree | d263cca0d8f73d89361cec23805c474a29c1e1a5 /sys/i386 | |
parent | 3ced96f0cab39bfaf944028ea06505e9f12bbfcd (diff) | |
download | FreeBSD-src-e9cca2953d7504b561271233ec7c23e59ab1be80.zip FreeBSD-src-e9cca2953d7504b561271233ec7c23e59ab1be80.tar.gz |
Remove a bunch of no-op "port ?" and "irq ?" declarations.
Diffstat (limited to 'sys/i386')
-rw-r--r-- | sys/i386/conf/GENERIC | 18 | ||||
-rw-r--r-- | sys/i386/conf/LINT | 34 | ||||
-rw-r--r-- | sys/i386/conf/NOTES | 34 |
3 files changed, 43 insertions, 43 deletions
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index dfbfc3c..ea60ce8 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -90,11 +90,11 @@ device isp # Qlogic family device ncr # NCR/Symbios Logic device sym # NCR/Symbios Logic (newer chipsets) -device adv0 at isa? port ? irq ? +device adv0 at isa? device adw -device bt0 at isa? port ? irq ? -device aha0 at isa? port ? irq ? -device aic0 at isa? port ? irq ? +device bt0 at isa? +device aha0 at isa? +device aic0 at isa? # SCSI peripherals device scbus # SCSI bus (required) @@ -112,7 +112,7 @@ device atkbdc0 at isa? port IO_KBD device atkbd0 at atkbdc? irq 1 device psm0 at atkbdc? irq 12 -device vga0 at isa? port ? conflicts +device vga0 at isa? conflicts # splash screen/screen saver pseudo-device splash @@ -145,7 +145,7 @@ device sio2 at isa? disable port IO_COM3 irq 5 device sio3 at isa? disable port IO_COM4 irq 9 # Parallel port -device ppc0 at isa? port? irq 7 +device ppc0 at isa? irq 7 device ppbus # Parallel port bus (required) device lpt # Printer device plip # TCP/IP over parallel @@ -188,13 +188,13 @@ device wi device an # The probe order of these is presently determined by i386/isa/isa_compat.c. device ie0 at isa? port 0x300 irq 10 iomem 0xd0000 -device fe0 at isa? port 0x300 irq ? +device fe0 at isa? port 0x300 device le0 at isa? port 0x300 irq 5 iomem 0xd0000 device lnc0 at isa? port 0x280 irq 10 drq 0 -device cs0 at isa? port 0x300 irq ? +device cs0 at isa? port 0x300 device sn0 at isa? port 0x300 irq 10 # requires PCCARD (PCMCIA) support to be activated -#device xe0 at isa? port? irq ? +#device xe0 at isa? # Pseudo devices - the number indicates how many units to allocated. pseudo-device loop # Network loopback diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index 9109c7e..68048a7 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -951,7 +951,7 @@ options PSM_HOOKRESUME #hook the system resume event, useful options PSM_RESETAFTERSUSPEND #reset the device at the resume event # The video card driver. -device vga0 at isa? port ? conflicts +device vga0 at isa? conflicts # Options for vga: # Try the following option if the mouse pointer is not drawn correctly @@ -1068,11 +1068,11 @@ device npx0 at nexus? port IO_NPX flags 0x0 irq 13 # probed correctly. # -device bt0 at isa? port IO_BT0 irq ? -device adv0 at isa? port ? irq ? +device bt0 at isa? port IO_BT0 +device adv0 at isa? device adw -device aha0 at isa? port ? irq ? -device aic0 at isa? port ? irq ? +device aha0 at isa? +device aic0 at isa? # # Compaq Smart RAID controller. This driver also uses the major number @@ -1153,11 +1153,11 @@ options ATA_ENABLE_ATAPI_DMA # mode (for example, it is a 2nd IDE PCI interface), then use config line(s) # such as: # -#device wdc2 at isa? port 0 irq ? flags 0xa0ffa0ff +#device wdc2 at isa? port 0 flags 0xa0ffa0ff #device wd4 at wdc2 drive 0 #device wd5 at wdc2 drive 1 # -#device wdc3 at isa? port 0 irq ? flags 0xa0ffa0ff +#device wdc3 at isa? port 0 flags 0xa0ffa0ff #device wd6 at wdc3 drive 0 #device wd7 at wdc3 drive 1 # @@ -1285,13 +1285,13 @@ options COM_MULTIPORT #code for some cards with shared IRQs # (no options needed) # device ar0 at isa? port 0x300 irq 10 iomem 0xd0000 -device cs0 at isa? port 0x300 irq ? +device cs0 at isa? port 0x300 device cx0 at isa? port 0x240 irq 15 drq 7 device ed0 at isa? port 0x280 irq 5 iomem 0xd8000 device el0 at isa? port 0x300 irq 9 device ep device ex -device fe0 at isa? port 0x300 irq ? +device fe0 at isa? port 0x300 device ie0 at isa? port 0x300 irq 5 iomem 0xd0000 device ie1 at isa? port 0x360 irq 7 iomem 0xd0000 device le0 at isa? port 0x300 irq 5 iomem 0xd0000 @@ -1303,8 +1303,8 @@ device wi device an options WLCACHE # enables the signal-strength cache options WLDEBUG # enables verbose debugging output -device wl0 at isa? port 0x300 irq ? -device xe0 at isa? port? irq ? +device wl0 at isa? port 0x300 +device xe0 at isa? device oltr0 at isa? @@ -1417,7 +1417,7 @@ device uart0 at isa? port 0x330 irq 5 # Note that motherboard sound devices may require options PNPBIOS. # # For non-pnp sound cards with no bridge drivers only: -#device pcm0 at isa? port ? irq 10 drq 1 flags 0x0 +#device pcm0 at isa? irq 10 drq 1 flags 0x0 # # For pnp sound cards: #device pcm @@ -1547,15 +1547,15 @@ device matcd0 at isa? port 0x230 device wt0 at isa? port 0x300 irq 5 drq 1 device ctx0 at isa? port 0x230 iomem 0xd0000 device spigot0 at isa? port 0xad6 irq 15 iomem 0xee000 -device apm0 at nexus? +device apm0 device gp0 at isa? port 0x2c0 device gsc0 at isa? port IO_GSC1 drq 3 device joy0 at isa? port IO_GAME device cy0 at isa? irq 10 iomem 0xd4000 iosiz 0x2000 options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared -device dgb0 at isa? port 0x220 iomem 0xfc000 iosiz ? +device dgb0 at isa? port 0x220 iomem 0xfc000 options NDGBPORTS=16 # Defaults to 16*NDGB -device dgm0 at isa? port 0x104 iomem 0xd0000 iosiz ? +device dgm0 at isa? port 0x104 iomem 0xd0000 device labpc0 at isa? port 0x260 irq 5 device rc0 at isa? port 0x220 irq 12 device rp0 at isa? port 0x280 @@ -1566,7 +1566,7 @@ device asc0 at isa? port IO_ASC1 drq 3 irq 10 device stl0 at isa? port 0x2a0 irq 10 device stli0 at isa? port 0x2a0 iomem 0xcc000 flags 23 iosiz 0x1000 # You are unlikely to have the hardware for loran0 <phk@FreeBSD.org> -device loran0 at isa? port ? irq 5 +device loran0 at isa? irq 5 # HOT1 Xilinx 6200 card (http://www.vcc.com/) device xrpu @@ -2159,7 +2159,7 @@ options PLIP_DEBUG # Parallel network IP interface debug options PCFCLOCK_VERBOSE # Verbose pcfclock driver options PCFCLOCK_MAX_RETRIES=5 # Maximum read tries (default 10) -device ppc0 at isa? port? irq 7 +device ppc0 at isa? irq 7 device ppbus device vpo device lpt diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 9109c7e..68048a7 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -951,7 +951,7 @@ options PSM_HOOKRESUME #hook the system resume event, useful options PSM_RESETAFTERSUSPEND #reset the device at the resume event # The video card driver. -device vga0 at isa? port ? conflicts +device vga0 at isa? conflicts # Options for vga: # Try the following option if the mouse pointer is not drawn correctly @@ -1068,11 +1068,11 @@ device npx0 at nexus? port IO_NPX flags 0x0 irq 13 # probed correctly. # -device bt0 at isa? port IO_BT0 irq ? -device adv0 at isa? port ? irq ? +device bt0 at isa? port IO_BT0 +device adv0 at isa? device adw -device aha0 at isa? port ? irq ? -device aic0 at isa? port ? irq ? +device aha0 at isa? +device aic0 at isa? # # Compaq Smart RAID controller. This driver also uses the major number @@ -1153,11 +1153,11 @@ options ATA_ENABLE_ATAPI_DMA # mode (for example, it is a 2nd IDE PCI interface), then use config line(s) # such as: # -#device wdc2 at isa? port 0 irq ? flags 0xa0ffa0ff +#device wdc2 at isa? port 0 flags 0xa0ffa0ff #device wd4 at wdc2 drive 0 #device wd5 at wdc2 drive 1 # -#device wdc3 at isa? port 0 irq ? flags 0xa0ffa0ff +#device wdc3 at isa? port 0 flags 0xa0ffa0ff #device wd6 at wdc3 drive 0 #device wd7 at wdc3 drive 1 # @@ -1285,13 +1285,13 @@ options COM_MULTIPORT #code for some cards with shared IRQs # (no options needed) # device ar0 at isa? port 0x300 irq 10 iomem 0xd0000 -device cs0 at isa? port 0x300 irq ? +device cs0 at isa? port 0x300 device cx0 at isa? port 0x240 irq 15 drq 7 device ed0 at isa? port 0x280 irq 5 iomem 0xd8000 device el0 at isa? port 0x300 irq 9 device ep device ex -device fe0 at isa? port 0x300 irq ? +device fe0 at isa? port 0x300 device ie0 at isa? port 0x300 irq 5 iomem 0xd0000 device ie1 at isa? port 0x360 irq 7 iomem 0xd0000 device le0 at isa? port 0x300 irq 5 iomem 0xd0000 @@ -1303,8 +1303,8 @@ device wi device an options WLCACHE # enables the signal-strength cache options WLDEBUG # enables verbose debugging output -device wl0 at isa? port 0x300 irq ? -device xe0 at isa? port? irq ? +device wl0 at isa? port 0x300 +device xe0 at isa? device oltr0 at isa? @@ -1417,7 +1417,7 @@ device uart0 at isa? port 0x330 irq 5 # Note that motherboard sound devices may require options PNPBIOS. # # For non-pnp sound cards with no bridge drivers only: -#device pcm0 at isa? port ? irq 10 drq 1 flags 0x0 +#device pcm0 at isa? irq 10 drq 1 flags 0x0 # # For pnp sound cards: #device pcm @@ -1547,15 +1547,15 @@ device matcd0 at isa? port 0x230 device wt0 at isa? port 0x300 irq 5 drq 1 device ctx0 at isa? port 0x230 iomem 0xd0000 device spigot0 at isa? port 0xad6 irq 15 iomem 0xee000 -device apm0 at nexus? +device apm0 device gp0 at isa? port 0x2c0 device gsc0 at isa? port IO_GSC1 drq 3 device joy0 at isa? port IO_GAME device cy0 at isa? irq 10 iomem 0xd4000 iosiz 0x2000 options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared -device dgb0 at isa? port 0x220 iomem 0xfc000 iosiz ? +device dgb0 at isa? port 0x220 iomem 0xfc000 options NDGBPORTS=16 # Defaults to 16*NDGB -device dgm0 at isa? port 0x104 iomem 0xd0000 iosiz ? +device dgm0 at isa? port 0x104 iomem 0xd0000 device labpc0 at isa? port 0x260 irq 5 device rc0 at isa? port 0x220 irq 12 device rp0 at isa? port 0x280 @@ -1566,7 +1566,7 @@ device asc0 at isa? port IO_ASC1 drq 3 irq 10 device stl0 at isa? port 0x2a0 irq 10 device stli0 at isa? port 0x2a0 iomem 0xcc000 flags 23 iosiz 0x1000 # You are unlikely to have the hardware for loran0 <phk@FreeBSD.org> -device loran0 at isa? port ? irq 5 +device loran0 at isa? irq 5 # HOT1 Xilinx 6200 card (http://www.vcc.com/) device xrpu @@ -2159,7 +2159,7 @@ options PLIP_DEBUG # Parallel network IP interface debug options PCFCLOCK_VERBOSE # Verbose pcfclock driver options PCFCLOCK_MAX_RETRIES=5 # Maximum read tries (default 10) -device ppc0 at isa? port? irq 7 +device ppc0 at isa? irq 7 device ppbus device vpo device lpt |