[src/netbsd-1-4]: src/sys/dev/pci Pull up revisions 1.87 and 1.96-1.97 (reque...

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

details:   https://anonhg.NetBSD.org/src/rev/3aef525b5663
branches:  netbsd-1-4
changeset: 470491:3aef525b5663
user:      he <he%NetBSD.org@localhost>
date:      Sun Apr 02 19:21:54 2000 +0000

description:
Pull up revisions 1.87 and 1.96-1.97 (requested by cgd):
  Fix script bug in processing QUEUE FULL response (would always
  trigger an assertion failure), and add Quantum Atlas IV drives
  to the quirk table so that they don't use tagged queueing.
  Fixes problems reported in PR#7694.

diffstat:

 sys/dev/pci/ncr.c |  42 +++++++++++++++++++++++-------------------
 1 files changed, 23 insertions(+), 19 deletions(-)

diffs (86 lines):

diff -r 6b878291876f -r 3aef525b5663 sys/dev/pci/ncr.c
--- a/sys/dev/pci/ncr.c Sun Apr 02 19:16:51 2000 +0000
+++ b/sys/dev/pci/ncr.c Sun Apr 02 19:21:54 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ncr.c,v 1.80.2.5 1999/11/08 07:56:52 cgd Exp $ */
+/*     $NetBSD: ncr.c,v 1.80.2.6 2000/04/02 19:21:54 he Exp $  */
 
 /**************************************************************************
 **
@@ -1356,8 +1356,8 @@
        ncrcmd  msg_bad         [  6];
        ncrcmd  complete        [ 13];
        ncrcmd  cleanup         [ 12];
-       ncrcmd  cleanup0        [ 11];
-       ncrcmd  signal          [ 10];
+       ncrcmd  cleanup0        [ 9];
+       ncrcmd  signal          [ 12];
        ncrcmd  save_dp         [  5];
        ncrcmd  restore_dp      [  5];
        ncrcmd  disconnect      [ 12];
@@ -1518,7 +1518,7 @@
 
 #if 0
 static char ident[] =
-       "\n$NetBSD: ncr.c,v 1.80.2.5 1999/11/08 07:56:52 cgd Exp $\n";
+       "\n$NetBSD: ncr.c,v 1.80.2.6 2000/04/02 19:21:54 he Exp $\n";
 #endif
 
 static const u_long    ncr_version = NCR_VERSION       * 11
@@ -2287,21 +2287,21 @@
                0,
        SCR_JUMP ^ IFTRUE (DATA (S_CHECK_COND)),
                PADDRH(getcc2),
-       /*
-       **      And make the DSA register invalid.
-       */
-/*>>>*/        SCR_LOAD_REG (dsa, 0xff), /* invalid */
-               0,
 }/*-------------------------< SIGNAL >----------------------*/,{
        /*
        **      if status = queue full,
        **      reinsert in startqueue and stall queue.
        */
-       SCR_FROM_REG (SS_REG),
+/*>>>*/        SCR_FROM_REG (SS_REG),
                0,
        SCR_INT ^ IFTRUE (DATA (S_QUEUE_FULL)),
                SIR_STALL_QUEUE,
        /*
+       **      And make the DSA register invalid.
+       */
+       SCR_LOAD_REG (dsa, 0xff), /* invalid */
+               0,
+       /*
        **      if job completed ...
        */
        SCR_FROM_REG (HS_REG),
@@ -7945,15 +7945,19 @@
 
 static struct table_entry device_tab[] =
 {
-#ifdef NCR_GETCC_WITHMSG
-       {"HP      ", "C372", "", QUIRK_NOTAGS|QUIRK_NOMSG},
-       {"", "", "", QUIRK_NOMSG},
-       {"SONY", "SDT-5000", "3.17", QUIRK_NOMSG},
-       {"WangDAT", "Model 2600", "01.7", QUIRK_NOMSG},
-       {"WangDAT", "Model 3200", "02.2", QUIRK_NOMSG},
-       {"WangDAT", "Model 1300", "02.4", QUIRK_NOMSG},
-#endif
-       {"", "", "", 0} /* catch all: must be last entry. */
+       /* XXX maybe doesn't need QUIRK_NOMSG? */
+       {"HP      ",    "C372",         "",     QUIRK_NOTAGS|QUIRK_NOMSG},
+
+       /* XXX maybe doesn't need QUIRK_NOMSG? */
+       {"QUANTUM",     "ATLAS IV",     "",     QUIRK_NOTAGS|QUIRK_NOMSG},
+
+       /*
+        * XXX not clear what the value of NCR_GETCC_WITHMSG is if
+        * XXX QUIRK_NOMSG is always turned on, but I am just an
+        * XXX egg.  --cgd
+        */
+       /* catch all: must be the last entry. */
+       {"",            "",             "",     QUIRK_NOMSG},
 };
 
 static u_long ncr_lookup(char * id)