Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/x68k/dev Revert 1.18 change.



details:   https://anonhg.NetBSD.org/src/rev/2d6b4ab56b49
branches:  trunk
changeset: 485535:2d6b4ab56b49
user:      minoura <minoura%NetBSD.org@localhost>
date:      Sun Apr 30 16:06:20 2000 +0000

description:
Revert 1.18 change.
Hopefully this is a temporary fix; something might be missing in
the SCSI negotiation.

diffstat:

 sys/arch/x68k/dev/mha.c |  18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diffs (46 lines):

diff -r 18d3eee27bdc -r 2d6b4ab56b49 sys/arch/x68k/dev/mha.c
--- a/sys/arch/x68k/dev/mha.c   Sun Apr 30 15:47:55 2000 +0000
+++ b/sys/arch/x68k/dev/mha.c   Sun Apr 30 16:06:20 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mha.c,v 1.19 2000/03/23 06:47:33 thorpej Exp $ */
+/*     $NetBSD: mha.c,v 1.20 2000/04/30 16:06:20 minoura Exp $ */
 
 /*-
  * Copyright (c) 1996-1999 The NetBSD Foundation, Inc.
@@ -240,6 +240,7 @@
 void   mhaattach       __P((struct device *, struct device *, void *));
 void   mhaselect       __P((struct mha_softc *,
                                     u_char, u_char, u_char *, u_char));
+void   mha_scsi_reset  __P((struct mha_softc *));
 void   mha_reset       __P((struct mha_softc *));
 void   mha_free_acb    __P((struct mha_softc *, struct acb *, int));
 void   mha_sense       __P((struct mha_softc *, struct acb *));
@@ -345,6 +346,8 @@
 
        mha_init(sc);   /* Init chip and driver */
 
+       mha_scsi_reset(sc);     /* XXX: some devices need this. */
+
        sc->sc_phase  = BUSFREE_PHASE;
 
        /*
@@ -430,6 +433,19 @@
 #endif
 
 /*
+ * Pull the SCSI RST line for 500us.
+ */
+void
+mha_scsi_reset(sc)     /* FINISH? */
+       struct mha_softc *sc;
+{
+
+       CMR = CMD_SCSI_RESET;   /* SCSI RESET */
+       while (!(SSR&SS_IREQUEST))
+         delay(10);
+}
+
+/*
  * Initialize mha SCSI driver.
  */
 void



Home | Main Index | Thread Index | Old Index