From a309908dc3debae12157f5fa8b7657fb927467b7 Mon Sep 17 00:00:00 2001
From: David Greenman <dg@FreeBSD.org>
Date: Mon, 14 Oct 1996 16:43:11 +0000
Subject: [PATCH] Fixed a bug that got introduced when I changed the CY16_RESET
 and CY_CLEAR_INTR definitions. This might have affected probing of ISA
 versions of the Cyclom 16/32-Y.

---
 sys/dev/cy/cy.c     | 6 +++---
 sys/dev/cy/cy_isa.c | 6 +++---
 sys/i386/isa/cy.c   | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 53424ee523e0..0c84e33adeae 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.39 1996/10/13 01:30:32 davidg Exp $
+ *	$Id: cy.c,v 1.40 1996/10/14 16:10:00 davidg Exp $
  */
 
 #include "cy.h"
@@ -426,11 +426,11 @@ sioprobe(dev)
 	iobase = (cy_addr)dev->id_maddr;
 
 	/* Cyclom-16Y hardware reset (Cyclom-8Ys don't care) */
-	cy_inb(iobase, CY16_RESET);	/* XXX? */
+	cd_inb(iobase, CY16_RESET, 0);	/* XXX? */
 	DELAY(500);	/* wait for the board to get its act together */
 
 	/* this is needed to get the board out of reset */
-	cy_outb(iobase, CY_CLEAR_INTR, 0);
+	cd_outb(iobase, CY_CLEAR_INTR, 0, 0);
 	DELAY(500);
 
 	return (cy_units(iobase, 0) == 0 ? 0 : -1);
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 53424ee523e0..0c84e33adeae 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.39 1996/10/13 01:30:32 davidg Exp $
+ *	$Id: cy.c,v 1.40 1996/10/14 16:10:00 davidg Exp $
  */
 
 #include "cy.h"
@@ -426,11 +426,11 @@ sioprobe(dev)
 	iobase = (cy_addr)dev->id_maddr;
 
 	/* Cyclom-16Y hardware reset (Cyclom-8Ys don't care) */
-	cy_inb(iobase, CY16_RESET);	/* XXX? */
+	cd_inb(iobase, CY16_RESET, 0);	/* XXX? */
 	DELAY(500);	/* wait for the board to get its act together */
 
 	/* this is needed to get the board out of reset */
-	cy_outb(iobase, CY_CLEAR_INTR, 0);
+	cd_outb(iobase, CY_CLEAR_INTR, 0, 0);
 	DELAY(500);
 
 	return (cy_units(iobase, 0) == 0 ? 0 : -1);
diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index 53424ee523e0..0c84e33adeae 100644
--- a/sys/i386/isa/cy.c
+++ b/sys/i386/isa/cy.c
@@ -27,7 +27,7 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: cy.c,v 1.39 1996/10/13 01:30:32 davidg Exp $
+ *	$Id: cy.c,v 1.40 1996/10/14 16:10:00 davidg Exp $
  */
 
 #include "cy.h"
@@ -426,11 +426,11 @@ sioprobe(dev)
 	iobase = (cy_addr)dev->id_maddr;
 
 	/* Cyclom-16Y hardware reset (Cyclom-8Ys don't care) */
-	cy_inb(iobase, CY16_RESET);	/* XXX? */
+	cd_inb(iobase, CY16_RESET, 0);	/* XXX? */
 	DELAY(500);	/* wait for the board to get its act together */
 
 	/* this is needed to get the board out of reset */
-	cy_outb(iobase, CY_CLEAR_INTR, 0);
+	cd_outb(iobase, CY_CLEAR_INTR, 0, 0);
 	DELAY(500);
 
 	return (cy_units(iobase, 0) == 0 ? 0 : -1);