update from Mike Hibler

SCCS-vsn: sys/hp300/dev/hpib.c 7.2
SCCS-vsn: sys/hp300/dev/hpibvar.h 7.2

diff --git a/usr/src/sys/hp300/dev/hpib.c b/usr/src/sys/hp300/dev/hpib.c
index ca81d42..6e6bb72 100644 (file)
--- a/usr/src/sys/hp300/dev/hpib.c
+++ b/usr/src/sys/hp300/dev/hpib.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)hpib.c      7.1 (Berkeley) %G%
+ *     @(#)hpib.c      7.2 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -23,8 +23,6 @@
 #include "machine/cpu.h"
 #include "machine/isr.h"
 
 #include "machine/cpu.h"
 #include "machine/isr.h"
 

-int    internalhpib = IOV(0x478000);
-

 int    hpibinit(), hpibstart(), hpibgo(), hpibintr(), hpibdone();
 struct driver hpibdriver = {
        hpibinit, "hpib", hpibstart, hpibgo, hpibintr, hpibdone,
 int    hpibinit(), hpibstart(), hpibgo(), hpibintr(), hpibdone();
 struct driver hpibdriver = {
        hpibinit, "hpib", hpibstart, hpibgo, hpibintr, hpibdone,


@@ -36,6 +34,7 @@ int   nhpibppoll(), fhpibppoll();
 
 int    hpibtimeout = 100000;   /* # of status tests before we give up */
 int    hpibidtimeout = 20000;  /* # of status tests for hpibid() calls */
 
 int    hpibtimeout = 100000;   /* # of status tests before we give up */
 int    hpibidtimeout = 20000;  /* # of status tests for hpibid() calls */

+int    hpibdmathresh = 3;      /* byte count beyond which to attempt dma */

 
 hpibinit(hc)
        register struct hp_ctlr *hc;
 
 hpibinit(hc)
        register struct hp_ctlr *hc;

diff --git a/usr/src/sys/hp300/dev/hpibvar.h b/usr/src/sys/hp300/dev/hpibvar.h
index e657351..d76d625 100644 (file)
--- a/usr/src/sys/hp300/dev/hpibvar.h
+++ b/usr/src/sys/hp300/dev/hpibvar.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)hpibvar.h   7.1 (Berkeley) %G%
+ *     @(#)hpibvar.h   7.2 (Berkeley) %G%

  */
 
 #define        HPIB_IPL(x)     ((((x) >> 4) & 0x3) + 3)
  */
 
 #define        HPIB_IPL(x)     ((((x) >> 4) & 0x3) + 3)


@@ -54,4 +54,6 @@ struct        hpib_softc {
 #ifdef KERNEL
 extern struct hpib_softc hpib_softc[];
 extern int internalhpib;
 #ifdef KERNEL
 extern struct hpib_softc hpib_softc[];
 extern int internalhpib;

+extern int hpibtimeout;
+extern int hpibdmathresh;

 #endif
 #endif