summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>2004-05-02 05:21:29 +0000
committerbde <bde@FreeBSD.org>2004-05-02 05:21:29 +0000
commita69d916659ee3e0795a821b8573d148d5be36bac (patch)
treef6fea1b58fbb70db325f2f8fcbbced228c1745c3 /sys
parentda1d089bd29e9efb22223c1220abd3e5310e00c6 (diff)
downloadFreeBSD-src-a69d916659ee3e0795a821b8573d148d5be36bac.zip
FreeBSD-src-a69d916659ee3e0795a821b8573d148d5be36bac.tar.gz
Switch to using the moved cy driver (adjust pathnames and remove "count"
parameter). Keep using it only in the i386 NOTES for now. It is fairly MI, but it doesn't use bus-space and has a couple of i386 i/o instructions in pci intitialization.
Diffstat (limited to 'sys')
-rw-r--r--sys/conf/files3
-rw-r--r--sys/conf/files.i3862
-rw-r--r--sys/i386/conf/NOTES2
3 files changed, 4 insertions, 3 deletions
diff --git a/sys/conf/files b/sys/conf/files
index b33ecf8..6336df5 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -364,6 +364,9 @@ dev/cs/if_cs.c optional cs
dev/cs/if_cs_isa.c optional cs isa
dev/cs/if_cs_pccard.c optional cs card
dev/cs/if_cs_pccard.c optional cs pccard
+dev/cy/cy.c optional cy
+dev/cy/cy_isa.c optional cy isa
+dev/cy/cy_pci.c optional cy pci
dev/dcons/dcons.c optional dcons
dev/dcons/dcons_crom.c optional dcons_crom
dev/digi/digi.c optional digi
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 1074271..9ca2a1d 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -267,7 +267,6 @@ i386/ibcs2/imgact_coff.c optional ibcs2
i386/isa/atpic.c standard
i386/isa/atpic_vector.s standard
i386/isa/clock.c standard
-i386/isa/cy.c count cy
i386/isa/elink.c optional ep
i386/isa/elink.c optional ie
i386/isa/if_el.c count el
@@ -413,4 +412,3 @@ pci/agp_ali.c optional agp
pci/agp_amd.c optional agp
pci/agp_i810.c optional agp
pci/agp_nvidia.c optional agp
-pci/cy_pci.c optional cy pci
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 1669b89..82e5d7b 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -663,7 +663,7 @@ options SAFE_RNDTEST # enable rndtest support
device apm
hint.apm.0.flags="0x20"
device pmtimer # Adjust system timer at wakeup time
-device cy 1
+device cy
options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared
hint.cy.0.at="isa"
hint.cy.0.irq="10"
OpenPOWER on IntegriCloud