diff options
author | peter <peter@FreeBSD.org> | 2001-01-25 01:56:27 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2001-01-25 01:56:27 +0000 |
commit | 98efcc620b24da93db9a6d86faeb2c7da55aac9d (patch) | |
tree | f5dc33770aa28e6555b70be2343013158e059c2f | |
parent | ef07536d233ec236c198cf6e4d2fe450a02b3847 (diff) | |
download | FreeBSD-src-98efcc620b24da93db9a6d86faeb2c7da55aac9d.zip FreeBSD-src-98efcc620b24da93db9a6d86faeb2c7da55aac9d.tar.gz |
Disable cy - it is now completely broken and needs non-trivial work.
-rw-r--r-- | sys/conf/NOTES | 14 | ||||
-rw-r--r-- | sys/dev/cy/cy_pci.c | 5 | ||||
-rw-r--r-- | sys/i386/conf/NOTES | 14 | ||||
-rw-r--r-- | sys/pci/cy_pci.c | 5 |
4 files changed, 14 insertions, 24 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 1067d0f..187ca268b 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1910,7 +1910,7 @@ hint.pca.0.port="0x040" # spigot: The Creative Labs Video Spigot video-acquisition board # meteor: Matrox Meteor video capture board # bktr: Brooktree bt848/848a/849a/878/879 video capture and TV Tuner board -# cy: Cyclades serial driver +# cy: Cyclades serial driver (Currently completely broken) # dgb: Digiboard PC/Xi and PC/Xe series driver (ALPHA QUALITY!) # dgm: Digiboard PC/Xem driver # gp: National Instruments AT-GPIB and AT-GPIB/TNT board, PCMCIA-GPIB @@ -2054,12 +2054,12 @@ hint.gsc.0.drq="3" device joy # PnP aware, hints for nonpnp only hint.joy.0.at="isa" hint.joy.0.port="0x201" -device cy 1 -options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared -hint.cy.0.at="isa" -hint.cy.0.irq="10" -hint.cy.0.maddr="0xd4000" -hint.cy.0.msize="0x2000" +#device cy 1 +#options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared +#hint.cy.0.at="isa" +#hint.cy.0.irq="10" +#hint.cy.0.maddr="0xd4000" +#hint.cy.0.msize="0x2000" device dgb 1 options NDGBPORTS=16 # Defaults to 16*NDGB hint.dgb.0.at="isa" diff --git a/sys/dev/cy/cy_pci.c b/sys/dev/cy/cy_pci.c index fddea78..f7e2414 100644 --- a/sys/dev/cy/cy_pci.c +++ b/sys/dev/cy/cy_pci.c @@ -27,10 +27,6 @@ * $FreeBSD$ */ -#ifdef COMPILING_LINT -#warning "The cy pci driver is broken and is not compiled with LINT" -#else - /* * Cyclades Y PCI serial interface driver */ @@ -161,4 +157,3 @@ fail: /* XXX should release any allocated virtual memory */ return; } -#endif diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 1067d0f..187ca268b 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -1910,7 +1910,7 @@ hint.pca.0.port="0x040" # spigot: The Creative Labs Video Spigot video-acquisition board # meteor: Matrox Meteor video capture board # bktr: Brooktree bt848/848a/849a/878/879 video capture and TV Tuner board -# cy: Cyclades serial driver +# cy: Cyclades serial driver (Currently completely broken) # dgb: Digiboard PC/Xi and PC/Xe series driver (ALPHA QUALITY!) # dgm: Digiboard PC/Xem driver # gp: National Instruments AT-GPIB and AT-GPIB/TNT board, PCMCIA-GPIB @@ -2054,12 +2054,12 @@ hint.gsc.0.drq="3" device joy # PnP aware, hints for nonpnp only hint.joy.0.at="isa" hint.joy.0.port="0x201" -device cy 1 -options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared -hint.cy.0.at="isa" -hint.cy.0.irq="10" -hint.cy.0.maddr="0xd4000" -hint.cy.0.msize="0x2000" +#device cy 1 +#options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared +#hint.cy.0.at="isa" +#hint.cy.0.irq="10" +#hint.cy.0.maddr="0xd4000" +#hint.cy.0.msize="0x2000" device dgb 1 options NDGBPORTS=16 # Defaults to 16*NDGB hint.dgb.0.at="isa" diff --git a/sys/pci/cy_pci.c b/sys/pci/cy_pci.c index fddea78..f7e2414 100644 --- a/sys/pci/cy_pci.c +++ b/sys/pci/cy_pci.c @@ -27,10 +27,6 @@ * $FreeBSD$ */ -#ifdef COMPILING_LINT -#warning "The cy pci driver is broken and is not compiled with LINT" -#else - /* * Cyclades Y PCI serial interface driver */ @@ -161,4 +157,3 @@ fail: /* XXX should release any allocated virtual memory */ return; } -#endif |