diff options
| author | dg <dg@FreeBSD.org> | 1996-10-14 16:43:11 +0000 |
|---|---|---|
| committer | dg <dg@FreeBSD.org> | 1996-10-14 16:43:11 +0000 |
| commit | 8882da7174e91ee617637316f18a49cee0dd56d9 (patch) | |
| tree | cdeaa66639f7f3632eca123a471a86679f22d0fb /sys/dev/cy | |
| parent | 3499ced4da32437fdeb769ae8682c21f88987646 (diff) | |
| download | FreeBSD-src-8882da7174e91ee617637316f18a49cee0dd56d9.zip FreeBSD-src-8882da7174e91ee617637316f18a49cee0dd56d9.tar.gz | |
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.
Diffstat (limited to 'sys/dev/cy')
| -rw-r--r-- | sys/dev/cy/cy.c | 6 | ||||
| -rw-r--r-- | sys/dev/cy/cy_isa.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c index 53424ee..0c84e33 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 53424ee..0c84e33 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); |
