Fix a few more nits. Should compile better now! :_)

2 files changed, 30 insertions, 17 deletions

diff --git a/sys/gnu/i386/isa/nic3008.c b/sys/gnu/i386/isa/nic3008.c
index a581408..8c46434 100644
--- a/sys/gnu/i386/isa/nic3008.c
+++ b/sys/gnu/i386/isa/nic3008.c
@@ -1,4 +1,4 @@
-static char     nic38_id[] = "@(#)$Id: nic3008.c,v 1.1 1995/01/25 14:06:18 jkr Exp jkr $";
+static char     nic38_id[] = "@(#)$Id: nic3008.c,v 1.1 1995/02/14 15:00:10 jkh Exp $";
 /*******************************************************************************
  *  II - Version 0.1 $Revision: 1.1 $   $State: Exp $
  *
@@ -10,6 +10,15 @@ static char     nic38_id[] = "@(#)$Id: nic3008.c,v 1.1 1995/01/25 14:06:18 jkr E
  *
  *******************************************************************************
  * $Log: nic3008.c,v $
+ * Revision 1.1  1995/02/14  15:00:10  jkh
+ * An ISDN driver that supports the EDSS1 and the 1TR6 ISDN interfaces.
+ * EDSS1 is the "Euro-ISDN", 1TR6 is the soon obsolete german ISDN Interface.
+ * Obtained from: Dietmar Friede <dfriede@drnhh.neuhaus.de> and
+ * 	Juergen Krause <jkr@saarlink.de>
+ *
+ * This is only one part - the rest to follow in a couple of hours.
+ * This part is a benign import, since it doesn't affect anything else.
+ *
  *
  ******************************************************************************/
 
@@ -30,9 +39,9 @@ static char     nic38_id[] = "@(#)$Id: nic3008.c,v 1.1 1995/01/25 14:06:18 jkr E
 #include "systm.h"
 
 #include "i386/isa/isa_device.h"
-#include "i386/isa/nic3008.h"
-#include "i386/isa/niccyreg.h"
-#include "isdn/isdn_ioctl.h"
+#include "gnu/i386/isa/nic3008.h"
+#include "gnu/i386/isa/niccyreg.h"
+#include "gnu/isdn/isdn_ioctl.h"
 
 #define OPEN		1
 #define LOAD_HEAD	3
@@ -57,14 +66,13 @@ extern u_short isdn_state;
 extern isdn_ctrl_t isdn_ctrl[];
 extern int     ispy_applnr;
 extern int Isdn_Appl, Isdn_Ctrl, Isdn_Typ;
-extern int hz;
 
 static old_spy= 0;
 
 int             nicprobe(), nicattach();
 int             nic_connect(), nic_listen(), nic_disconnect(), nic_accept();
 int             nic_output();
-extern isdn_start_out();
+extern void isdn_start_out();
 
 static void     s_intr(), reset_req(), reset_card(); 
 static int      cstrcmp(), discon_req(), reset_plci(), sel_b2_prot_req();
@@ -806,7 +814,8 @@ b_intr(int mb, int c, struct nic_softc * sc)
 			{
 				chan->state = IDLE;
 				ctrl->o_len = 0;
-				timeout(isdn_start_out,chan->ctrl,hz/5);
+				timeout(isdn_start_out, (void *)chan->ctrl,
+					hz/5);
 				break;
 			}
 			break;
diff --git a/sys/gnu/i386/isa/nic3009.c b/sys/gnu/i386/isa/nic3009.c
index 4f09407..3b0dc97 100644
--- a/sys/gnu/i386/isa/nic3009.c
+++ b/sys/gnu/i386/isa/nic3009.c
@@ -1,6 +1,6 @@
-static char     nic39_id[] = "@(#)$Id: nic3009.c,v 1.1 1995/02/14 15:00:14 jkh Exp $";
+static char     nic39_id[] = "@(#)$Id: nic3009.c,v 1.2 1995/02/15 06:28:20 jkh Exp $";
 /*******************************************************************************
- *  II - Version 0.1 $Revision: 1.1 $   $State: Exp $
+ *  II - Version 0.1 $Revision: 1.2 $   $State: Exp $
  *
  * Copyright 1994 Dietmar Friede
  *******************************************************************************
@@ -10,6 +10,9 @@ static char     nic39_id[] = "@(#)$Id: nic3009.c,v 1.1 1995/02/14 15:00:14 jkh E
  *
  *******************************************************************************
  * $Log: nic3009.c,v $
+ * Revision 1.2  1995/02/15  06:28:20  jkh
+ * Fix up include paths, nuke some warnings.
+ *
  * Revision 1.1  1995/02/14  15:00:14  jkh
  * An ISDN driver that supports the EDSS1 and the 1TR6 ISDN interfaces.
  * EDSS1 is the "Euro-ISDN", 1TR6 is the soon obsolete german ISDN Interface.
@@ -38,7 +41,7 @@ static char     nic39_id[] = "@(#)$Id: nic3009.c,v 1.1 1995/02/14 15:00:14 jkh E
 #include "kernel.h"
 #include "systm.h"
 
-#include "gnu/i386/isa/isa_device.h"
+#include "i386/isa/isa_device.h"
 #include "gnu/i386/isa/nic3009.h"
 #include "gnu/i386/isa/niccyreg.h"
 #include "gnu/isdn/isdn_ioctl.h"
@@ -62,8 +65,7 @@ extern u_short isdn_state;
 extern isdn_ctrl_t isdn_ctrl[];
 extern int     ispy_applnr;
 extern int Isdn_Appl, Isdn_Ctrl, Isdn_Typ;
-extern int hz;
-extern isdn_start_out();
+extern void isdn_start_out();
 
 static old_spy= 0;
 
@@ -202,8 +204,9 @@ nnicattach(struct isa_device * is)
 
 /* If the Niccy card wants it: Interupt it. */
 static void
-make_intr(struct nnic_softc * sc)
+make_intr(void *gen)
 {
+	struct nnic_softc * sc = (struct nnic_softc *)gen;
 	dpr_type       *dpr = sc->sc_dpr;
 
 	dpr->watchdog_cnt = 0xFF;
@@ -1110,7 +1113,7 @@ up_intr(unsigned unit, struct nnic_softc * sc)
 		{
 			chan->state = IDLE;
 			ctrl->o_len = 0;
-			timeout(isdn_start_out,chan->ctrl,hz/5);
+			timeout(isdn_start_out,(void *)chan->ctrl,hz/5);
 		}
 		break;
 
@@ -1195,12 +1198,13 @@ printf("E?%x",error);
 		return;
 	}
 	msg->msg_flag= 0;
-	timeout(make_intr,sc,1);
+	timeout(make_intr, (void *)sc,1);
 }
 
 static void
-nnnicintr(unsigned unit)
+nnnicintr(void *gen)
 {
+	unsigned int unit = (int)gen;
 	register struct nnic_softc *sc = &nnic_sc[unit];
 	dpr_type       *dpr = sc->sc_dpr;
 
@@ -1212,7 +1216,7 @@ nnnicintr(unsigned unit)
 void
 nnicintr(unsigned unit)
 {
-        timeout(nnnicintr,unit,1);
+        timeout(nnnicintr, (void *)unit,1);
 }
 
 #endif				/* NNNIC > 0 */