diff options
| author | n_hibma <n_hibma@FreeBSD.org> | 1999-10-22 04:36:52 +0000 |
|---|---|---|
| committer | n_hibma <n_hibma@FreeBSD.org> | 1999-10-22 04:36:52 +0000 |
| commit | 935b7d4b2743b13ae140755d9772a020c0d484ee (patch) | |
| tree | bcb508960c5392022b8316e0d321ce79bb66079a /sys | |
| parent | a316fc2921e595d318c2021355aefda57ed9b0e0 (diff) | |
| download | FreeBSD-src-935b7d4b2743b13ae140755d9772a020c0d484ee.zip FreeBSD-src-935b7d4b2743b13ae140755d9772a020c0d484ee.tar.gz | |
From: src/sys/i386/conf/PCCARD
revision 1.21
date: 1999/10/15 17:29:20; author: imp; state: Exp; lines: +3 -3
Reorganize the attachement point for pcic (it was unattached and
floating before). Attach pccard devices to pcic, one per slot
(although this may change to one per pcic). pcic is now attached to
isa (to act as a bridge) and pccard is attached to pcic, cbb and
pc98ic (the last two are card bus bridge and the pc98ic version of
pcic, neither of which are in the tree yet). Move pccard compat code
into pccard/pccard_compat.c.
THIS REQUIRES A CONFIG FILE CHANGE. You must change your pcic/card
entries to be:
# PCCARD (PCMCIA) support
controller pcic0 at isa?
controller pcic1 at isa?
controller card0
The old system was upside down and this corrects that problem. It
will make it easier to add support for YENTA pccard/card bus bridges.
Much more cleanup needs to happen before newbus devices can have
pccard attachments. My previous commit's comments were premature.
Forgotten by: imp
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/amd64/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/i386/conf/GENERIC | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 827ace1..7d1c9db 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -139,8 +139,8 @@ device apm0 at nexus? disable flags 0x31 # Advanced Power Management # PCCARD (PCMCIA) support #controller card0 -#device pcic0 at card? -#device pcic1 at card? +#device pcic0 at isa? +#device pcic1 at isa? # Serial (COM) ports device sio0 at isa? port IO_COM1 flags 0x10 irq 4 diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 827ace1..7d1c9db 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -139,8 +139,8 @@ device apm0 at nexus? disable flags 0x31 # Advanced Power Management # PCCARD (PCMCIA) support #controller card0 -#device pcic0 at card? -#device pcic1 at card? +#device pcic0 at isa? +#device pcic1 at isa? # Serial (COM) ports device sio0 at isa? port IO_COM1 flags 0x10 irq 4 |
