[src/trunk]: src/sys/dev/isa Adapt to ncr53c9x change.

[mycroft <mycroft%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6e448742e60e
branches:  trunk
changeset: 483852:6e448742e60e
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Sun Mar 19 21:27:01 2000 +0000

description:
Adapt to ncr53c9x change.

diffstat:

 sys/dev/isa/esp_isa.c    |  16 +++++++++-------
 sys/dev/isa/esp_isavar.h |   3 ++-
 2 files changed, 11 insertions(+), 8 deletions(-)

diffs (72 lines):

diff -r 2c38a6e52774 -r 6e448742e60e sys/dev/isa/esp_isa.c
--- a/sys/dev/isa/esp_isa.c     Sun Mar 19 21:25:49 2000 +0000
+++ b/sys/dev/isa/esp_isa.c     Sun Mar 19 21:27:01 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: esp_isa.c,v 1.18 2000/03/18 21:50:20 mycroft Exp $     */
+/*     $NetBSD: esp_isa.c,v 1.19 2000/03/19 21:27:01 mycroft Exp $     */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -193,12 +193,14 @@
 
        /* reset card before we probe? */
 
+       epd->sc_cfg4 = NCRCFG4_ACTNEG;
+       epd->sc_cfg5 = NCRCFG5_CRS1 | NCRCFG5_AADDR | NCRCFG5_PTRINC;
+
        /*
         * Switch to the PIO regs and look for the bit pattern
         * we expect...
         */
-       bus_space_write_1(iot, ioh, NCR_CFG4,
-               NCRCFG4_CRS1 | bus_space_read_1(iot, ioh, NCR_CFG4));
+       bus_space_write_1(iot, ioh, NCR_CFG5, epd->sc_cfg5);
 
 #define SIG_MASK 0x87
 #define REV_MASK 0x70
@@ -243,8 +245,7 @@
                        break;
        }
 
-       bus_space_write_1(iot, ioh, NCR_CFG4,
-               ~NCRCFG4_CRS1 & bus_space_read_1(iot, ioh, NCR_CFG4));
+       bus_space_write_1(iot, ioh, NCR_CFG5, epd->sc_cfg5);
 
        /* Try to set NCRESPCFG3_FCLK, some FAS408's don't support
         * NCRESPCFG3_FCLK even though it is documented.  A bad
@@ -280,8 +281,7 @@
        if ((epd->sc_rev == NCR_VARIANT_FAS408) && epd->sc_isfast) {
                sc->sc_freq = 40;
                sc->sc_cfg3 |= NCRESPCFG3_FCLK;
-       }
-       else
+       } else
                sc->sc_freq = 24;
 
        /* Setup the register defaults */
@@ -290,6 +290,8 @@
                sc->sc_cfg1 |= NCRCFG1_PARENB;
        sc->sc_cfg2 = NCRCFG2_SCSI2;
        sc->sc_cfg3 |= NCRESPCFG3_IDM | NCRESPCFG3_FSCSI;
+       sc->sc_cfg4 = epd->sc_cfg4;
+       sc->sc_cfg5 = epd->sc_cfg5;
 
        /*
         * This is the value used to start sync negotiations
diff -r 2c38a6e52774 -r 6e448742e60e sys/dev/isa/esp_isavar.h
--- a/sys/dev/isa/esp_isavar.h  Sun Mar 19 21:25:49 2000 +0000
+++ b/sys/dev/isa/esp_isavar.h  Sun Mar 19 21:27:01 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: esp_isavar.h,v 1.1 2000/03/18 21:49:33 mycroft Exp $   */
+/*     $NetBSD: esp_isavar.h,v 1.2 2000/03/19 21:27:01 mycroft Exp $   */
 
 /*
  * Copyright (c) 1997 Allen Briggs.
@@ -91,6 +91,7 @@
        int sc_parity;
        int sc_sync;
        int sc_id;
+       u_char sc_cfg4, sc_cfg5;
 };
 
 #define ESP_ISA_IOSIZE  16