diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-12-28 09:15:51 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1998-12-28 09:15:51 +0000 |
| commit | ebc9e685400597e1a6c470e036933f437a10dcba (patch) | |
| tree | fdb7ab9ce2b725915747f5cdfff7d58bbb6fd59f /sys/dev/isa | |
| parent | d1cdcb643a0f012e60a58431315395ec731fd297 (diff) | |
merge tags for similar drivers
Diffstat (limited to 'sys/dev/isa')
| -rw-r--r-- | sys/dev/isa/pnpdevs | 60 |
1 files changed, 21 insertions, 39 deletions
diff --git a/sys/dev/isa/pnpdevs b/sys/dev/isa/pnpdevs index d66a0d6a3fc..8772dbefd2e 100644 --- a/sys/dev/isa/pnpdevs +++ b/sys/dev/isa/pnpdevs @@ -1,4 +1,4 @@ -# $OpenBSD: pnpdevs,v 1.49 1998/12/28 03:29:36 deraadt Exp $ +# $OpenBSD: pnpdevs,v 1.50 1998/12/28 09:15:50 deraadt Exp $ # # NOTE: All `com' devices also need pccom identifiers. @@ -58,10 +58,8 @@ aic ADP1520 # Adaptec AHA-152x series # PNP0401 # ECP printer port #--Serial Devices-- -com PNP0500 # Standard PC COM port -pccom PNP0500 # Standard PC COM port -com PNP0501 # 16550A-compatible COM port -pccom PNP0501 # 16550A-compatible COM port +com/pccom PNP0500 # Standard PC COM port +com/pccom PNP0501 # 16550A-compatible COM port # PNP0510 # Generic IRDA-compatible device #--Disk Controllers-- @@ -346,10 +344,8 @@ sb PNPB003 # Sound Blaster 16-compatible sound device joy PNPB02F # Joystick/Game port #***** Modems - PNPCxxx-Dxxx**************************** -com PNPC000 # Compaq 14400 Modem (TBD) -pccom PNPC000 # Compaq 14400 Modem (TBD) -com PNPC001 # Compaq 2400/9600 Modem (TBD) -pccom PNPC001 # Compaq 2400/9600 Modem (TBD) +com/pccom PNPC000 # Compaq 14400 Modem (TBD) +com/pccom PNPC001 # Compaq 2400/9600 Modem (TBD) # # Everything else. The following list is exlusively for devices which @@ -358,36 +354,22 @@ pccom PNPC001 # Compaq 2400/9600 Modem (TBD) # # Modems: -com NECE761 # 33.6Modem -pccom NECE761 # 33.6Modem -com BDP0356 # Best Data 56x2 -pccom BDP0356 # Best Data 56x2 -com GWY6290 # Telepath with x2 Technology -pccom GWY6290 # Telepath with x2 Technology -com GVC0303 # MaxTech 33.6 PnP D/F/V -pccom GVC0303 # MaxTech 33.6 PnP D/F/V -com GWY0038 # Telepath with v.90 -pccom GWY0038 # Telepath with v.90 -com USR0001 # U.S. Robotics Inc., Sportster W -pccom USR0001 # U.S. Robotics Inc., Sportster W -com USR0006 # USR modem -pccom USR0006 # USR modem -com USR2030 # U.S.Robotics Inc. Sportster 560 -pccom USR2030 # U.S.Robotics Inc. Sportster 560 -com SUP1380 # SupraExpress 288i PnP Voice Modem -pccom SUP1380 # SupraExpress 288i PnP Voice Modem -com SUP1381 # SupraExpress 336i PnP Voice Modem -pccom SUP1381 # SupraExpress 336i PnP Voice Modem -com GVC5000 # some GVC modem -pccom GVC5000 # some GVC modem -com MOT0000 # Motorola ModemSURFR 33.6 Intern -pccom MOT0000 # Motorola ModemSURFR 33.6 Intern -com MOT15F0 # Motorola VoiceSURFR 56K Modem -pccom MOT15F0 # Motorola VoiceSURFR 56K Modem -com CIR3000 # Cirrus Logic V43 -pccom CIR3000 # Cirrus Logic V43 -com USR2070 # U.S.Robotics Inc. Sportster 560 -pccom USR2070 # U.S.Robotics Inc. Sportster 560 +com/pccom NECE761 # 33.6Modem +com/pccom BDP0356 # Best Data 56x2 +com/pccom GWY6290 # Telepath with x2 Technology +com/pccom GVC0303 # MaxTech 33.6 PnP D/F/V +com/pccom GWY0038 # Telepath with v.90 +com/pccom USR0001 # U.S. Robotics Inc., Sportster W +com/pccom USR0006 # USR modem +com/pccom USR2030 # U.S.Robotics Inc. Sportster 560 +com/pccom SUP1380 # SupraExpress 288i PnP Voice Modem +com/pccom SUP1381 # SupraExpress 336i PnP Voice Modem +com/pccom GVC5000 # some GVC modem +com/pccom MOT0000 # Motorola ModemSURFR 33.6 Intern +com/pccom MOT15F0 # Motorola VoiceSURFR 56K Modem +com/pccom CIR3000 # Cirrus Logic V43 +com/pccom USR2070 # U.S.Robotics Inc. Sportster 560 +#com/pccom ROK0010 # ? # Ethernet: #le BRI1001 # BOCALANcard COMBO (PNP8200) |