BSD 4_4 release

[unix-history] / usr / src / sys / hp300 / dev / nhpib.c

diff --git a/usr/src/sys/hp300/dev/nhpib.c b/usr/src/sys/hp300/dev/nhpib.c
index 74c0ca2..2ccd0aa 100644 (file)
--- a/usr/src/sys/hp300/dev/nhpib.c
+++ b/usr/src/sys/hp300/dev/nhpib.c
@@ -1,10 +1,36 @@
 /*
 /*

- * Copyright (c) 1982, 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1982, 1990, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- *     @(#)nhpib.c     7.4 (Berkeley) %G%
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)nhpib.c     8.1 (Berkeley) 6/10/93

  */
 
 /*
  */
 
 /*


@@ -13,14 +39,14 @@
 #include "hpib.h"
 #if NHPIB > 0
 
 #include "hpib.h"
 #if NHPIB > 0
 

-#include "sys/param.h"
-#include "sys/systm.h"
-#include "sys/buf.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/buf.h>

 
 

-#include "device.h"
-#include "nhpibreg.h"
-#include "hpibvar.h"
-#include "dmavar.h"
+#include <hp/dev/device.h>
+#include <hp300/dev/nhpibreg.h>
+#include <hp300/dev/hpibvar.h>
+#include <hp300/dev/dmavar.h>

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


@@ -307,16 +333,25 @@ nhpibwait(hd, x)
        return(0);
 }
 
        return(0);
 }
 

-nhpibppwatch(unit)
-       register int unit;
+void
+nhpibppwatch(arg)
+       void *arg;

 {
 {

-       register struct hpib_softc *hs = &hpib_softc[unit];
+       register struct hpib_softc *hs;
+       register int unit;
+       extern int cold;

 
 

+       unit = (int)arg;
+       hs = &hpib_softc[unit];

        if ((hs->sc_flags & HPIBF_PPOLL) == 0)
                return;
        if ((hs->sc_flags & HPIBF_PPOLL) == 0)
                return;

+again:

        if (nhpibppoll(unit) & (0x80 >> hs->sc_sq.dq_forw->dq_slave))
                        ((struct nhpibdevice *)hs->sc_hc->hp_addr)->hpib_mim = MIS_BO;
        if (nhpibppoll(unit) & (0x80 >> hs->sc_sq.dq_forw->dq_slave))
                        ((struct nhpibdevice *)hs->sc_hc->hp_addr)->hpib_mim = MIS_BO;

+       else if (cold)
+               /* timeouts not working yet */
+               goto again;

        else
        else

-               timeout(nhpibppwatch, unit, 1);
+               timeout(nhpibppwatch, (void *)unit, 1);

 }
 #endif
 }
 #endif