default ncylinders to 1 for disklabel

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

diff --git a/usr/src/sys/hp300/dev/fhpib.c b/usr/src/sys/hp300/dev/fhpib.c
index 405e714..4a89276 100644 (file)
--- a/usr/src/sys/hp300/dev/fhpib.c
+++ b/usr/src/sys/hp300/dev/fhpib.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)fhpib.c     7.4 (Berkeley) %G%
+ *     @(#)fhpib.c     7.6 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -13,13 +13,15 @@
 #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 "hp/dev/device.h"
-#include "fhpibreg.h"
-#include "hpibvar.h"
-#include "dmavar.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/buf.h>
+
+#include <hp/dev/device.h>
+
+#include <hp300/dev/fhpibreg.h>
+#include <hp300/dev/hpibvar.h>
+#include <hp300/dev/dmavar.h>

 
 /*
  * Inline version of fhpibwait to be used in places where
 
 /*
  * Inline version of fhpibwait to be used in places where


@@ -454,15 +456,20 @@ fhpibwait(hd, x)
 }
 
 /*
 }
 
 /*

- * XXX: this will have to change if we every allow more than one
+ * XXX: this will have to change if we ever allow more than one

  * pending operation per HP-IB.
  */
  * pending operation per HP-IB.
  */

-fhpibppwatch(unit)
+void
+fhpibppwatch(arg)
+       void *arg;

 {
 {

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

        register struct fhpibdevice *hd;
        register int slave;
 
        register struct fhpibdevice *hd;
        register int slave;
 

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

        if ((hs->sc_flags & HPIBF_PPOLL) == 0)
                return;
        hd = (struct fhpibdevice *)hs->sc_hc->hp_addr;
        if ((hs->sc_flags & HPIBF_PPOLL) == 0)
                return;
        hd = (struct fhpibdevice *)hs->sc_hc->hp_addr;


@@ -473,7 +480,7 @@ fhpibppwatch(unit)
                        hd->hpib_stat = ST_IENAB;
                        hd->hpib_imask = IM_IDLE | IM_ROOM;
                } else
                        hd->hpib_stat = ST_IENAB;
                        hd->hpib_imask = IM_IDLE | IM_ROOM;
                } else

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

                return;
        }
        if ((fhpibdebug & FDB_PPOLL) && unit == fhpibdebugunit)
                return;
        }
        if ((fhpibdebug & FDB_PPOLL) && unit == fhpibdebugunit)