[src/netbsd-1-4]: src/sys/dev/pci pull up rev 1.82 (tron):

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

details:   https://anonhg.NetBSD.org/src/rev/454f43ba26db
branches:  netbsd-1-4
changeset: 469408:454f43ba26db
user:      cgd <cgd%NetBSD.org@localhost>
date:      Sat Sep 18 01:07:15 1999 +0000

description:
pull up rev 1.82 (tron):
        Make driver build with Tekram EEPROM support enabled.
        Fixes PR#8141.  (tron)

diffstat:

 sys/dev/pci/ncr.c |  70 +++++++++++++++++++++++++++++-------------------------
 1 files changed, 38 insertions(+), 32 deletions(-)

diffs (105 lines):

diff -r 1c77d69b310e -r 454f43ba26db sys/dev/pci/ncr.c
--- a/sys/dev/pci/ncr.c Sat Sep 18 01:04:43 1999 +0000
+++ b/sys/dev/pci/ncr.c Sat Sep 18 01:07:15 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ncr.c,v 1.80.2.1 1999/09/18 01:04:43 cgd Exp $ */
+/*     $NetBSD: ncr.c,v 1.80.2.2 1999/09/18 01:07:15 cgd Exp $ */
 
 /**************************************************************************
 **
@@ -1404,6 +1404,37 @@
        ncrcmd  snoopend        [  2];
 };
 
+#ifdef NCR_TEKRAM_EEPROM
+struct tekram_eeprom_dev {
+  u_char       devmode;
+#define        TKR_PARCHK      0x01
+#define        TKR_TRYSYNC     0x02
+#define        TKR_ENDISC      0x04
+#define        TKR_STARTUNIT   0x08
+#define        TKR_USETAGS     0x10
+#define        TKR_TRYWIDE     0x20
+  u_char       syncparam;      /* max. sync transfer rate (table ?) */
+  u_char       filler1;
+  u_char       filler2;
+};
+
+struct tekram_eeprom {
+  struct tekram_eeprom_dev 
+               dev[16];
+  u_char       adaptid;
+  u_char       adaptmode;
+#define        TKR_ADPT_GT2DRV 0x01
+#define        TKR_ADPT_GT1GB  0x02
+#define        TKR_ADPT_RSTBUS 0x04
+#define        TKR_ADPT_ACTNEG 0x08
+#define        TKR_ADPT_NOSEEK 0x10
+#define        TKR_ADPT_MORLUN 0x20
+  u_char       delay;          /* unit ? (table ???) */
+  u_char       tags;           /* use 4 times as many ... */
+  u_char       filler[60];
+};
+#endif
+
 /*==========================================================
 **
 **
@@ -1468,6 +1499,11 @@
 static void    ncr_attach      (pcici_t tag, int unit);
 #endif /* __NetBSD__ */
 
+#ifdef NCR_TEKRAM_EEPROM
+static int     read_tekram_eeprom
+                               (ncb_p np, struct tekram_eeprom *buffer);
+#endif
+
 #endif /* KERNEL */
 
 /*==========================================================
@@ -1482,7 +1518,7 @@
 
 #if 0
 static char ident[] =
-       "\n$NetBSD: ncr.c,v 1.80.2.1 1999/09/18 01:04:43 cgd Exp $\n";
+       "\n$NetBSD: ncr.c,v 1.80.2.2 1999/09/18 01:07:15 cgd Exp $\n";
 #endif
 
 static const u_long    ncr_version = NCR_VERSION       * 11
@@ -8083,36 +8119,6 @@
 
 #ifdef NCR_TEKRAM_EEPROM
 
-struct tekram_eeprom_dev {
-  u_char       devmode;
-#define        TKR_PARCHK      0x01
-#define        TKR_TRYSYNC     0x02
-#define        TKR_ENDISC      0x04
-#define        TKR_STARTUNIT   0x08
-#define        TKR_USETAGS     0x10
-#define        TKR_TRYWIDE     0x20
-  u_char       syncparam;      /* max. sync transfer rate (table ?) */
-  u_char       filler1;
-  u_char       filler2;
-};
-
-
-struct tekram_eeprom {
-  struct tekram_eeprom_dev 
-               dev[16];
-  u_char       adaptid;
-  u_char       adaptmode;
-#define        TKR_ADPT_GT2DRV 0x01
-#define        TKR_ADPT_GT1GB  0x02
-#define        TKR_ADPT_RSTBUS 0x04
-#define        TKR_ADPT_ACTNEG 0x08
-#define        TKR_ADPT_NOSEEK 0x10
-#define        TKR_ADPT_MORLUN 0x20
-  u_char       delay;          /* unit ? (table ???) */
-  u_char       tags;           /* use 4 times as many ... */
-  u_char       filler[60];
-};
-
 static void
 tekram_write_bit (ncb_p np, int bit)
 {