Fix up include paths, nuke some warnings.

6 files changed, 87 insertions, 19 deletions

diff --git a/sys/gnu/i386/isa/nic3009.c b/sys/gnu/i386/isa/nic3009.c
index 8062586..4f09407 100644
--- a/sys/gnu/i386/isa/nic3009.c
+++ b/sys/gnu/i386/isa/nic3009.c
@@ -1,4 +1,4 @@
-static char     nic39_id[] = "@(#)$Id: nic3009.c,v 1.1 1995/01/25 14:06:18 jkr Exp jkr $";
+static char     nic39_id[] = "@(#)$Id: nic3009.c,v 1.1 1995/02/14 15:00:14 jkh Exp $";
 /*******************************************************************************
  *  II - Version 0.1 $Revision: 1.1 $   $State: Exp $
  *
@@ -10,6 +10,15 @@ static char     nic39_id[] = "@(#)$Id: nic3009.c,v 1.1 1995/01/25 14:06:18 jkr E
  *
  *******************************************************************************
  * $Log: nic3009.c,v $
+ * 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.
+ * 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.
+ *
  *
  ******************************************************************************/
 
@@ -29,10 +38,10 @@ static char     nic39_id[] = "@(#)$Id: nic3009.c,v 1.1 1995/01/25 14:06:18 jkr E
 #include "kernel.h"
 #include "systm.h"
 
-#include "i386/isa/isa_device.h"
-#include "i386/isa/nic3009.h"
-#include "i386/isa/niccyreg.h"
-#include "isdn/isdn_ioctl.h"
+#include "gnu/i386/isa/isa_device.h"
+#include "gnu/i386/isa/nic3009.h"
+#include "gnu/i386/isa/niccyreg.h"
+#include "gnu/isdn/isdn_ioctl.h"
 
 #define OPEN		1
 #define LOAD_HEAD	3
diff --git a/sys/gnu/isdn/if_ii.c b/sys/gnu/isdn/if_ii.c
index c02657e..bdb3ebd 100644
--- a/sys/gnu/isdn/if_ii.c
+++ b/sys/gnu/isdn/if_ii.c
@@ -1,4 +1,4 @@
-static char     _if_iiid[] = "@(#)$Id: if_ii.c,v 1.1 1995/01/25 14:06:18 jkr Exp jkr $";
+static char     _if_iiid[] = "@(#)$Id: if_ii.c,v 1.1 1995/02/14 15:00:27 jkh Exp $";
 /*******************************************************************************
  *  II - Version 0.1 $Revision: 1.1 $   $State: Exp $
  *
@@ -10,6 +10,15 @@ static char     _if_iiid[] = "@(#)$Id: if_ii.c,v 1.1 1995/01/25 14:06:18 jkr Exp
  *
  *******************************************************************************
  * $Log: if_ii.c,v $
+ * Revision 1.1  1995/02/14  15:00:27  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.
+ *
  *
  ******************************************************************************/
 
@@ -43,7 +52,7 @@ static char     _if_iiid[] = "@(#)$Id: if_ii.c,v 1.1 1995/01/25 14:06:18 jkr Exp
 #endif
 
 #include "ii.h"
-#include "isdn/isdn_ioctl.h"
+#include "gnu/isdn/isdn_ioctl.h"
 
 #define	IIMTU	1500
 
@@ -154,14 +163,14 @@ ii_input(int no, int len, char *buf)
 	return(len);
 }
 
-int
+void
 ii_connect(int no)
 {
 	struct ifnet   *ifp = &ii_if[no];
 	ifp->if_flags |= IFF_RUNNING;
 }
 
-int
+void
 ii_disconnect(int no)
 {
 	struct ifnet   *ifp = &ii_if[no];
diff --git a/sys/gnu/isdn/iispy.c b/sys/gnu/isdn/iispy.c
index e426f1d..a88159b 100644
--- a/sys/gnu/isdn/iispy.c
+++ b/sys/gnu/isdn/iispy.c
@@ -1,4 +1,4 @@
-static char     _ispyid[] = "@(#)$Id: iispy.c,v 1.1 1995/01/25 14:06:18 jkr Exp jkr $";
+static char     _ispyid[] = "@(#)$Id: iispy.c,v 1.1 1995/02/14 15:00:29 jkh Exp $";
 /*******************************************************************************
  *  II - Version 0.1 $Revision: 1.1 $   $State: Exp $
  *
@@ -10,6 +10,15 @@ static char     _ispyid[] = "@(#)$Id: iispy.c,v 1.1 1995/01/25 14:06:18 jkr Exp
  *
  *******************************************************************************
  * $Log: iispy.c,v $
+ * Revision 1.1  1995/02/14  15:00:29  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.
+ *
  *
  ******************************************************************************/
 
@@ -27,7 +36,7 @@ static char     _ispyid[] = "@(#)$Id: iispy.c,v 1.1 1995/01/25 14:06:18 jkr Exp
 #include "kernel.h"
 /*#include "malloc.h"*/
 
-#include "isdn/isdn_ioctl.h"
+#include "gnu/isdn/isdn_ioctl.h"
 
 int             ispyattach();
 
diff --git a/sys/gnu/isdn/iitel.c b/sys/gnu/isdn/iitel.c
index bf2b72a..1d801e1 100644
--- a/sys/gnu/isdn/iitel.c
+++ b/sys/gnu/isdn/iitel.c
@@ -1,4 +1,4 @@
-static char     _itelid[] = "@(#)$Id: iitel.c,v 1.1 1995/01/25 14:06:18 jkr Exp jkr $";
+static char     _itelid[] = "@(#)$Id: iitel.c,v 1.1 1995/02/14 15:00:30 jkh Exp $";
 /*******************************************************************************
  *  II - Version 0.1 $Revision: 1.1 $   $State: Exp $
  *
@@ -10,6 +10,15 @@ static char     _itelid[] = "@(#)$Id: iitel.c,v 1.1 1995/01/25 14:06:18 jkr Exp
  *
  *******************************************************************************
  * $Log: iitel.c,v $
+ * Revision 1.1  1995/02/14  15:00:30  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.
+ *
  *
  ******************************************************************************/
 
@@ -27,7 +36,7 @@ static char     _itelid[] = "@(#)$Id: iitel.c,v 1.1 1995/01/25 14:06:18 jkr Exp
 #include "kernel.h"
 #include "malloc.h"
 
-#include "isdn/isdn_ioctl.h"
+#include "gnu/isdn/isdn_ioctl.h"
 
 int             itelattach();
 
diff --git a/sys/gnu/isdn/iitty.c b/sys/gnu/isdn/iitty.c
index 815da76..bb3ac06 100644
--- a/sys/gnu/isdn/iitty.c
+++ b/sys/gnu/isdn/iitty.c
@@ -1,4 +1,4 @@
-static char     _ittyid[] = "@(#)$Id: iitty.c,v 1.1 1995/01/25 14:06:18 jkr Exp jkr $";
+static char     _ittyid[] = "@(#)$Id: iitty.c,v 1.1 1995/02/14 15:00:32 jkh Exp $";
 /*******************************************************************************
  *  II - Version 0.1 $Revision: 1.1 $   $State: Exp $
  *
@@ -10,6 +10,15 @@ static char     _ittyid[] = "@(#)$Id: iitty.c,v 1.1 1995/01/25 14:06:18 jkr Exp
  *
  *******************************************************************************
  * $Log: iitty.c,v $
+ * Revision 1.1  1995/02/14  15:00:32  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,10 @@ static char     _ittyid[] = "@(#)$Id: iitty.c,v 1.1 1995/01/25 14:06:18 jkr Exp
 #include "syslog.h"
 #include "types.h"
 
-#include "isdn/isdn_ioctl.h"
+#include "gnu/isdn/isdn_ioctl.h"
 
-int             ityattach(), itystart(), ityparam();
+int             ityattach(), ityparam();
+void		itystart();
 
 int             nity = NITY;
 int             itydefaultrate = 64000;
@@ -55,6 +65,7 @@ ityattach(int ap)
 }
 
 /* ARGSUSED */
+int
 ityopen(dev_t dev, int flag, int mode, struct proc * p)
 {
 	register struct tty *tp;
@@ -104,6 +115,7 @@ ityopen(dev_t dev, int flag, int mode, struct proc * p)
 }
 
 /* ARGSUSED */
+int
 ityclose(dev, flag, mode, p)
 	dev_t           dev;
 	int             flag, mode;
@@ -122,18 +134,22 @@ ityclose(dev, flag, mode, p)
 	return (0);
 }
 
+int
 ityread(dev, uio, flag)
 	dev_t           dev;
 	struct uio     *uio;
+	int flag;
 {
 	register struct tty *tp = &ity_tty[UNIT(dev)];
 
 	return ((*linesw[tp->t_line].l_read) (tp, uio, flag));
 }
 
+int
 itywrite(dev, uio, flag)
 	dev_t           dev;
 	struct uio     *uio;
+	int flag;
 {
 	int             unit = UNIT(dev);
 	register struct tty *tp = &ity_tty[unit];
@@ -141,6 +157,7 @@ itywrite(dev, uio, flag)
 	return ((*linesw[tp->t_line].l_write) (tp, uio, flag));
 }
 
+int
 ity_input(int no, int len, char *buf)
 {
 	register struct tty *tp = &ity_tty[no];
@@ -153,6 +170,7 @@ ity_input(int no, int len, char *buf)
 	return(len);
 }
 
+void
 itystart(struct tty *tp)
 {
 	int             s, unit;
@@ -185,6 +203,7 @@ itystart(struct tty *tp)
 	splx(s);
 }
 
+int
 ity_out(int no, char *buf, int len)
 {
 	struct tty *tp = &ity_tty[no];
@@ -206,6 +225,7 @@ ity_out(int no, char *buf, int len)
 	return(0);
 }
 
+void
 ity_connect(int no)
 {
 	struct tty *tp = &ity_tty[no];
@@ -222,12 +242,14 @@ ity_connect(int no)
 		itystart(tp);
 }
 
+void
 ity_disconnect(int no)
 {
 	struct tty *tp = &ity_tty[no];
 	if(tp) (*linesw[tp->t_line].l_modem) (tp, 0);
 }
 
+int
 ityioctl(dev, cmd, data, flag,p)
 	dev_t           dev;
         int             cmd;
@@ -255,6 +277,7 @@ ityioctl(dev, cmd, data, flag,p)
 	return (0);
 }
 
+int
 ityparam(tp, t)
 	register struct tty *tp;
 	register struct termios *t;
@@ -284,6 +307,7 @@ ityparam(tp, t)
  * Stop output on a line.
  */
 /* ARGSUSED */
+void
 itystop(struct tty *tp, int flag)
 {
 	register int    s;
diff --git a/sys/gnu/isdn/isdn.c b/sys/gnu/isdn/isdn.c
index ddf59ed..e71c91b 100644
--- a/sys/gnu/isdn/isdn.c
+++ b/sys/gnu/isdn/isdn.c
@@ -1,4 +1,4 @@
-static char     _isdnid[] = "@(#)$Id: isdn.c,v 1.1 1995/01/25 14:06:18 jkr Exp jkr $";
+static char     _isdnid[] = "@(#)$Id: isdn.c,v 1.1 1995/02/14 15:00:33 jkh Exp $";
 /*******************************************************************************
  *  II - Version 0.1 $Revision: 1.1 $   $State: Exp $
  *
@@ -10,6 +10,15 @@ static char     _isdnid[] = "@(#)$Id: isdn.c,v 1.1 1995/01/25 14:06:18 jkr Exp j
  *
  *******************************************************************************
  * $Log: isdn.c,v $
+ * Revision 1.1  1995/02/14  15:00:33  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.
+ *
  *
  ******************************************************************************/
 
@@ -36,7 +45,7 @@ static char     _isdnid[] = "@(#)$Id: isdn.c,v 1.1 1995/01/25 14:06:18 jkr Exp j
 #include "kernel.h"
 #include "systm.h"
 
-#include "isdn/isdn_ioctl.h"
+#include "gnu/isdn/isdn_ioctl.h"
 
 isdn_appl_t     isdn_appl[N_ISDN_APPL];
 isdn_ctrl_t     isdn_ctrl[N_ISDN_CTRL];
@@ -62,7 +71,6 @@ static void passout();
 
 u_short isdn_state= 0;
 static isdn_timeout= 0;
-extern     int hz;
 
 int
 isdn_get_prot_size(int ap)