Clean up the i4b kernel part: remove unmaintained #if(def)s for NetBSD,

OpenBSD and BSD/OS and respective code, remove pre $FreeBSD CVS id's,
remove #if(def)s and respective code for FreeBSD versions < 5 .

12 files changed, 27 insertions, 138 deletions

diff --git a/sys/i4b/include/i4b_cause.h b/sys/i4b/include/i4b_cause.h
index 36c6142..c98683a 100644
--- a/sys/i4b/include/i4b_cause.h
+++ b/sys/i4b/include/i4b_cause.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2000 Hellmuth Michaelis. All rights reserved.
+ * Copyright (c) 1997, 2002 Hellmuth Michaelis. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,11 +27,9 @@
  *	i4b_cause.h - causes and cause handling for i4b
  *	-----------------------------------------------
  *
- *	$Id: i4b_cause.h,v 1.13 2000/02/06 19:01:14 hm Exp $
- *
  * $FreeBSD$
  *
- *      last edit-date: [Sun Feb  6 19:46:41 2000]
+ *      last edit-date: [Sun Mar 17 10:08:21 2002]
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i4b/include/i4b_debug.h b/sys/i4b/include/i4b_debug.h
index 084623a..ac8f6a8 100644
--- a/sys/i4b/include/i4b_debug.h
+++ b/sys/i4b/include/i4b_debug.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2001 Hellmuth Michaelis. All rights reserved.
+ * Copyright (c) 1997, 2002 Hellmuth Michaelis. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -29,7 +29,7 @@
  *
  * $FreeBSD$
  *
- *      last edit-date: [Mon May 21 10:05:34 2001]
+ *      last edit-date: [Sun Mar 17 10:08:41 2002]
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i4b/include/i4b_global.h b/sys/i4b/include/i4b_global.h
index f2e9bff..c245277 100644
--- a/sys/i4b/include/i4b_global.h
+++ b/sys/i4b/include/i4b_global.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2001 Hellmuth Michaelis. All rights reserved.
+ * Copyright (c) 1997, 2002 Hellmuth Michaelis. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -29,7 +29,7 @@
  *
  * $FreeBSD$
  *
- *	last edit-date: [Mon Jan 15 15:47:40 2001]
+ *	last edit-date: [Sun Mar 17 09:55:26 2002]
  *
  *---------------------------------------------------------------------------*/
 
@@ -40,25 +40,6 @@
  *	hiding OS differences in the kernel
  *---------------------------------------------------------------------------*/ 
 
-/*-------------------------------------------------*/
-/* hide SMP changes in FreeBSD 5.x-current for 4.x */
-/*-------------------------------------------------*/
-
-#if defined(__FreeBSD__) && __FreeBSD__ <= 4
-
-#define IF_LOCK(a)
-#define IF_UNLOCK(a)
-#define _IF_QFULL(a)		IF_QFULL((a))
-#define _IF_ENQUEUE(a, b)	IF_ENQUEUE((a), (b))
-#define _IF_DEQUEUE(a, b)	IF_DEQUEUE((a), (b))
-#define _IF_PREPEND(a, b)	IF_PREPEND((a), (b))
-
-/* get back DELAY() */
-
-#include <machine/clock.h>
-
-#endif
-
 #if defined(__FreeBSD__) && __FreeBSD__ >= 5
 /*
  * Deprecated LKM interface.
@@ -91,71 +72,18 @@
 /* time handling */
 /*---------------*/
 
-#ifdef __FreeBSD__
 #include <sys/param.h>
 
-#if defined(__FreeBSD_version) && __FreeBSD_version >= 400000 && __FreeBSD_version < 400011
-#error "Unsupported FreeBSD-current version,"
-#error "you need a FreeBSD-current >= 400011"
-#endif
-
-#if defined(__FreeBSD_version) && __FreeBSD_version >= 300001
-
 #define TIMEOUT_FUNC_T	timeout_t *
 #define SECOND		time_second
 #define MICROTIME(x)	getmicrotime(&(x))
 
-#else /* FreeBSD < 3 */
-
-#define TIMEOUT_FUNC_T  timeout_func_t
-#define SECOND		time.tv_sec
-#define MICROTIME(x)	microtime(&(x))
-
-#endif /* >= 3 */
-#endif /* __FreeBSD__ */
-
-#if defined(__NetBSD__) || defined (__OpenBSD__) || defined(__bsdi__)
-
-#define TIMEOUT_FUNC_T	void *
-#define SECOND		time.tv_sec
-#define MICROTIME(x)	(x) = time
-
-#endif /* __NetBSD__ */
-
 /*----------------*/
 /* timer handling */
 /*----------------*/
 
-#if defined(__NetBSD__)
-
-#if __NetBSD_Version__ >= 104230000
-#define START_TIMER(XHANDLE, XF, XSC, XTIME) callout_reset(&XHANDLE, XTIME, (TIMEOUT_FUNC_T)XF, (void*)XSC)
-#define STOP_TIMER(XHANDLE, XF, XSC) callout_stop(&XHANDLE)
-#else
-#define START_TIMER(XHANDLE, XF, XSC, XTIME) timeout((TIMEOUT_FUNC_T)XF, (void*)XSC, XTIME)
-#define STOP_TIMER(XHANDLE, XF, XSC)    untimeout((TIMEOUT_FUNC_T)XF, (void*)XSC)
-#endif
-
-#else
 #define START_TIMER(XHANDLE, XF, XSC, XTIME) XHANDLE = timeout((TIMEOUT_FUNC_T)XF, (void*)XSC, XTIME)
-#ifdef __FreeBSD__
 #define	STOP_TIMER(XHANDLE, XF, XSC)	untimeout((TIMEOUT_FUNC_T)XF, (void*)XSC, XHANDLE)
-#else
-#define STOP_TIMER(XHANDLE, XF, XSC)	untimeout((TIMEOUT_FUNC_T)XF, (void*)XSC)
-#endif
-#endif
-
-/*----------------------*/
-/* poll/select handling */
-/*----------------------*/
-
-#if (defined(__FreeBSD__) && \
-        (!defined(__FreeBSD_version) || (__FreeBSD_version < 300001))) \
-                || defined (__OpenBSD__) || defined(__bsdi__)
-#define OS_USES_SELECT
-#else
-#define OS_USES_POLL
-#endif
 
 /*---------------------------------------------------------------------------*
  *	misc globally used things in the kernel
diff --git a/sys/i4b/include/i4b_ioctl.h b/sys/i4b/include/i4b_ioctl.h
index 4d5b913..561a131 100644
--- a/sys/i4b/include/i4b_ioctl.h
+++ b/sys/i4b/include/i4b_ioctl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2001 Hellmuth Michaelis. All rights reserved.
+ * Copyright (c) 1997, 2002 Hellmuth Michaelis. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -29,18 +29,20 @@
  *
  * $FreeBSD$
  *
- *      last edit-date: [Sun Oct 21 11:00:31 2001]
+ *      last edit-date: [Sun Mar 17 10:09:55 2002]
  *
  *---------------------------------------------------------------------------*/
 
 #ifndef _I4B_IOCTL_H_
 #define _I4B_IOCTL_H_
 
+#if 0
 #if defined(__FreeBSD__) && __FreeBSD__ >= 3
 #ifndef _MACHINE_TYPES_H_
 #include <machine/types.h>
 #endif /* _MACHINE_TYPES_H_ */
 #endif /* __FreeBSD__ */
+#endif
 
 /*---------------------------------------------------------------------------*
  *	version and release number for isdn4bsd package
diff --git a/sys/i4b/include/i4b_isdnq931.h b/sys/i4b/include/i4b_isdnq931.h
index 19ef428..94f1291 100644
--- a/sys/i4b/include/i4b_isdnq931.h
+++ b/sys/i4b/include/i4b_isdnq931.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
+ * Copyright (c) 1997, 2002 Hellmuth Michaelis. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,11 +27,9 @@
  *	i4b_isdnq931.h - DSS1 layer 3 message types
  *	-------------------------------------------
  *
- *	$Id: i4b_isdnq931.h,v 1.7 2000/04/27 07:42:43 hm Exp $
- *
  * $FreeBSD$
  *
- *	last edit-date: [Thu Apr 27 09:46:13 2000]
+ *	last edit-date: [Sat Mar  9 15:53:49 2002]
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i4b/include/i4b_l1l2.h b/sys/i4b/include/i4b_l1l2.h
index 4a8ccba..be45c07 100644
--- a/sys/i4b/include/i4b_l1l2.h
+++ b/sys/i4b/include/i4b_l1l2.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
+ * Copyright (c) 1997, 2002 Hellmuth Michaelis. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,22 +27,16 @@
  *	i4b_l1l2.h - i4b layer 1 / layer 2 interactions
  *	---------------------------------------------------
  *
- *	$Id: i4b_l1l2.h,v 1.11 2000/06/02 16:14:35 hm Exp $
- *
  * $FreeBSD$
  *
- *	last edit-date: [Fri Jun  2 14:35:03 2000]
+ *	last edit-date: [Sat Mar  9 15:54:49 2002]
  *
  *---------------------------------------------------------------------------*/
 
 #ifndef _I4B_L1L2_H_
 #define _I4B_L1L2_H_
 
-#ifdef __FreeBSD__
 #include <machine/i4b_trace.h>
-#else
-#include <i4b/i4b_trace.h>
-#endif
 
 extern struct i4b_l1l2_func i4b_l1l2_func;
 
@@ -93,4 +87,3 @@ struct i4b_l1l2_func
 };
 	
 #endif /* _I4B_L1L2_H_ */
-
diff --git a/sys/i4b/include/i4b_l2l3.h b/sys/i4b/include/i4b_l2l3.h
index 6e0e197..19a6990 100644
--- a/sys/i4b/include/i4b_l2l3.h
+++ b/sys/i4b/include/i4b_l2l3.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
+ * Copyright (c) 1997, 2002 Hellmuth Michaelis. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,11 +27,9 @@
  *	i4b_l2l3.h - i4b layer 2 / layer 3 interactions
  *	-----------------------------------------------
  *
- *	$Id: i4b_l2l3.h,v 1.8 2000/06/02 16:14:35 hm Exp $
- *
  * $FreeBSD$
  *
- *	last edit-date: [Fri Jun  2 14:33:34 2000]
+ *	last edit-date: [Sat Mar  9 15:55:16 2002]
  *
  *---------------------------------------------------------------------------*/
 
@@ -115,4 +113,3 @@ struct i4b_l2l3_func
 };
 
 #endif /* _I4B_L2L3_H_ */
-
diff --git a/sys/i4b/include/i4b_l3l4.h b/sys/i4b/include/i4b_l3l4.h
index 64617a2..b4da38a 100644
--- a/sys/i4b/include/i4b_l3l4.h
+++ b/sys/i4b/include/i4b_l3l4.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2001 Hellmuth Michaelis. All rights reserved.
+ * Copyright (c) 1997, 2002 Hellmuth Michaelis. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -29,7 +29,7 @@
  *
  * $FreeBSD$
  *
- *	last edit-date: [Thu Oct 18 13:26:16 2001]
+ *	last edit-date: [Sat Mar  9 15:57:44 2002]
  *
  *---------------------------------------------------------------------------*/
 
@@ -113,13 +113,6 @@ void tel_set_linktab(int unit, isdn_link_t *ilt);
 drvr_link_t *i4bisppp_ret_linktab(int unit);
 void i4bisppp_set_linktab(int unit, isdn_link_t *ilt);
 
-#ifdef __bsdi__
-/* global linktab functions for IBC userland driver */
-
-drvr_link_t *ibc_ret_linktab(int unit);
-void ibc_set_linktab(int unit, isdn_link_t *ilt);
-#endif
-
 /* global linktab functions for ING network driver */
 
 drvr_link_t *ing_ret_linktab(int unit);
@@ -189,8 +182,7 @@ typedef struct
 
 	int	timeout_active;		/* idle timeout() active flag	*/
 
-#if (defined(__FreeBSD_version) && __FreeBSD_version >= 300001) || \
-	(!defined(__FreeBSD_version) && defined(__FreeBSD__) && __FreeBSD__ >= 3)
+	int	callouts_inited;	/* must init before use */
 	struct	callout_handle	idle_timeout_handle;
 	struct	callout_handle	T303_callout;
 	struct	callout_handle	T305_callout;
@@ -199,19 +191,6 @@ typedef struct
 	struct	callout_handle	T310_callout;
 	struct	callout_handle	T313_callout;
 	struct	callout_handle	T400_callout;
-	int	callouts_inited;		/* must init before use */
-#endif
-#if defined(__NetBSD__) && __NetBSD_Version__ >= 104230000
-	struct	callout	idle_timeout_handle;
-	struct	callout	T303_callout;
-	struct	callout	T305_callout;
-	struct	callout	T308_callout;
-	struct	callout	T309_callout;
-	struct	callout	T310_callout;
-	struct	callout	T313_callout;
-	struct	callout	T400_callout;
-	int	callouts_inited;		/* must init before use */
-#endif
 
 	int	idletime_state;		/* wait for idle_time begin	*/
 #define IST_IDLE	0	/* shorthold mode disabled 	*/
diff --git a/sys/i4b/include/i4b_mbuf.h b/sys/i4b/include/i4b_mbuf.h
index b1b46c0..0b74044 100644
--- a/sys/i4b/include/i4b_mbuf.h
+++ b/sys/i4b/include/i4b_mbuf.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 1999 Hellmuth Michaelis. All rights reserved.
+ * Copyright (c) 1997, 2002 Hellmuth Michaelis. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,11 +27,9 @@
  *	i4b - mbuf handling support routines
  *	--------------------------------------
  *
- *	$Id: i4b_mbuf.h,v 1.9 2000/03/07 14:21:18 hm Exp $
- *
  * $FreeBSD$
  *
- *	last edit-date: [Fri Mar  3 14:30:09 2000]
+ *	last edit-date: [Sat Mar  9 15:58:11 2002]
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i4b/include/i4b_rbch_ioctl.h b/sys/i4b/include/i4b_rbch_ioctl.h
index 88142ad..dbaceed 100644
--- a/sys/i4b/include/i4b_rbch_ioctl.h
+++ b/sys/i4b/include/i4b_rbch_ioctl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999 Hellmuth Michaelis. All rights reserved.
+ * Copyright (c) 1999, 2002 Hellmuth Michaelis. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,11 +27,9 @@
  *	i4b_rbch_ioctl.h raw B-channel driver interface ioctls
  *	------------------------------------------------------
  *
- *	$Id: i4b_rbch_ioctl.h,v 1.2 1999/12/13 21:25:28 hm Exp $
- *
  * $FreeBSD$
  *
- *      last edit-date: [Mon Dec 13 22:07:12 1999]
+ *      last edit-date: [Sun Mar 17 10:10:25 2002]
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i4b/include/i4b_tel_ioctl.h b/sys/i4b/include/i4b_tel_ioctl.h
index 3b92922..2f0bb2b 100644
--- a/sys/i4b/include/i4b_tel_ioctl.h
+++ b/sys/i4b/include/i4b_tel_ioctl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2001  Hellmuth Michaelis. All rights reserved.
+ * Copyright (c) 1997, 2002  Hellmuth Michaelis. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -29,7 +29,7 @@
  *
  * $FreeBSD$
  *
- *      last edit-date: [Wed Oct 17 13:47:03 2001]
+ *      last edit-date: [Sun Mar 17 10:10:39 2002]
  *
  *---------------------------------------------------------------------------*/
 
diff --git a/sys/i4b/include/i4b_trace.h b/sys/i4b/include/i4b_trace.h
index 24229ec..ee05bfd 100644
--- a/sys/i4b/include/i4b_trace.h
+++ b/sys/i4b/include/i4b_trace.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2000 Hellmuth Michaelis. All rights reserved.
+ * Copyright (c) 1997, 2002 Hellmuth Michaelis. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,11 +27,9 @@
  *	i4b_trace.h - header file for trace data read device
  *	----------------------------------------------------
  *
- *	$Id: i4b_trace.h,v 1.8 2000/03/08 16:08:18 hm Exp $ 
- *
  * $FreeBSD$
  *
- *      last edit-date: [Wed Mar  8 16:41:43 2000]
+ *      last edit-date: [Sun Mar 17 10:10:52 2002]
  *
  *---------------------------------------------------------------------------*/