Source-Changes-HG archive

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

[src/trunk]: src/sys/dev/pci * rework the quirk table ('device_tab'):



details:   https://anonhg.NetBSD.org/src/rev/4c4bd9931ff6
branches:  trunk
changeset: 483771:4c4bd9931ff6
user:      cgd <cgd%NetBSD.org@localhost>
date:      Sat Mar 18 06:59:02 2000 +0000

description:
* rework the quirk table ('device_tab'):
    * QUIRK_NOMSG only has any meaning when NCR_GETCC_WITHMSG
      is defined.  Therefore, there's no harm in using it when
      NCR_GETCC_WITHMSG is not defined.  so, simplify the table
      by removing the #ifdef.
    * there's really no point in having table entries after
      an entry which will match everything.
    * add some comments, clean up spacing.

* add an entry for "QUANTUM"/"ATLAS IV" drives with flags
  QUIRK_NOTAGS|QUIRK_NOMSG.  (I included the latter flag only
  because everything else had it before! ... which means that
  all the functionality added with the NCR_GETCC_WITHMSG define
  would never get used! *sigh*)  The latter fixes the problems
  I was having on an Atlas, and should fix the problems mentioned
  by Hans Hoppe <hopha%casema.net@localhost> in comments on PR#7694.

diffstat:

 sys/dev/pci/ncr.c |  26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)

diffs (47 lines):

diff -r b21b8fd8f0c0 -r 4c4bd9931ff6 sys/dev/pci/ncr.c
--- a/sys/dev/pci/ncr.c Sat Mar 18 06:47:28 2000 +0000
+++ b/sys/dev/pci/ncr.c Sat Mar 18 06:59:02 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ncr.c,v 1.96 2000/03/18 06:47:28 cgd Exp $     */
+/*     $NetBSD: ncr.c,v 1.97 2000/03/18 06:59:02 cgd Exp $     */
 
 /**************************************************************************
 **
@@ -1532,7 +1532,7 @@
 
 #if 0
 static char ident[] =
-       "\n$NetBSD: ncr.c,v 1.96 2000/03/18 06:47:28 cgd Exp $\n";
+       "\n$NetBSD: ncr.c,v 1.97 2000/03/18 06:59:02 cgd Exp $\n";
 #endif
 
 static const u_long    ncr_version = NCR_VERSION       * 11
@@ -7951,15 +7951,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)



Home | Main Index | Thread Index | Old Index