From acfb47d41cfb4df742a37277d3a6aa0ee94e2faa Mon Sep 17 00:00:00 2001 From: Hellmuth Michaelis Date: Tue, 14 Dec 1999 20:48:35 +0000 Subject: update to isdn4bsd beta release 0.90 --- sys/i4b/layer3/i4b_l2if.c | 10 +++++++--- sys/i4b/layer3/i4b_l3.h | 6 ++++-- sys/i4b/layer3/i4b_l3fsm.c | 11 ++++++++--- sys/i4b/layer3/i4b_l3fsm.h | 6 ++++-- sys/i4b/layer3/i4b_l3timer.c | 34 +++++++++++++++++++--------------- sys/i4b/layer3/i4b_l4if.c | 14 +++++++++++--- sys/i4b/layer3/i4b_q931.c | 10 +++++++--- sys/i4b/layer3/i4b_q931.h | 8 ++++++-- sys/i4b/layer3/i4b_q932fac.c | 10 +++++++--- sys/i4b/layer3/i4b_q932fac.h | 6 ++++-- 10 files changed, 77 insertions(+), 38 deletions(-) (limited to 'sys/i4b/layer3') diff --git a/sys/i4b/layer3/i4b_l2if.c b/sys/i4b/layer3/i4b_l2if.c index f5e3d320e79d..dfebbca5d07d 100644 --- a/sys/i4b/layer3/i4b_l2if.c +++ b/sys/i4b/layer3/i4b_l2if.c @@ -27,9 +27,11 @@ * i4b_l2if.c - Layer 3 interface to Layer 2 * ------------------------------------------- * - * $FreeBSD$ + * $Id: i4b_l2if.c,v 1.18 1999/12/13 21:25:27 hm Exp $ * - * last edit-date: [Tue May 25 11:55:15 1999] + * $FreeBSD$ + * + * last edit-date: [Mon Dec 13 22:04:48 1999] * *---------------------------------------------------------------------------*/ @@ -41,11 +43,13 @@ #if NI4BQ931 > 0 #include -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + +#if defined(__FreeBSD__) #include #else #include #endif + #include #include #include diff --git a/sys/i4b/layer3/i4b_l3.h b/sys/i4b/layer3/i4b_l3.h index 32e6d806b8e9..3badbd86c203 100644 --- a/sys/i4b/layer3/i4b_l3.h +++ b/sys/i4b/layer3/i4b_l3.h @@ -27,9 +27,11 @@ * i4b_l3.h - layer 3 header file * ------------------------------ * - * $FreeBSD$ + * $Id: i4b_l3.h,v 1.10 1999/12/13 21:25:27 hm Exp $ * - * last edit-date: [Sun Feb 14 10:33:19 1999] + * $FreeBSD$ + * + * last edit-date: [Mon Dec 13 22:04:55 1999] * *---------------------------------------------------------------------------*/ diff --git a/sys/i4b/layer3/i4b_l3fsm.c b/sys/i4b/layer3/i4b_l3fsm.c index 6bc0e671458e..92de1ad52827 100644 --- a/sys/i4b/layer3/i4b_l3fsm.c +++ b/sys/i4b/layer3/i4b_l3fsm.c @@ -27,9 +27,11 @@ * i4b_l3fsm.c - layer 3 FSM * ------------------------- * - * $FreeBSD$ + * $Id: i4b_l3fsm.c,v 1.18 1999/12/13 21:25:27 hm Exp $ * - * last edit-date: [Wed Apr 21 09:42:26 1999] + * $FreeBSD$ + * + * last edit-date: [Mon Dec 13 22:05:02 1999] * *---------------------------------------------------------------------------*/ @@ -39,12 +41,15 @@ #define NI4BQ931 1 #endif #if NI4BQ931 > 0 + #include -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + +#if defined(__FreeBSD__) #include #else #include #endif + #include #include #include diff --git a/sys/i4b/layer3/i4b_l3fsm.h b/sys/i4b/layer3/i4b_l3fsm.h index 3b46875e8ae4..1980ae05c74a 100644 --- a/sys/i4b/layer3/i4b_l3fsm.h +++ b/sys/i4b/layer3/i4b_l3fsm.h @@ -27,9 +27,11 @@ * i4b_l3fsm.c - layer 3 FSM * ------------------------- * - * $FreeBSD$ + * $Id: i4b_l3fsm.h,v 1.7 1999/12/13 21:25:27 hm Exp $ * - * last edit-date: [Sun Feb 14 10:33:31 1999] + * $FreeBSD$ + * + * last edit-date: [Mon Dec 13 22:05:09 1999] * *---------------------------------------------------------------------------*/ diff --git a/sys/i4b/layer3/i4b_l3timer.c b/sys/i4b/layer3/i4b_l3timer.c index 70c916d3a0aa..495d9f67c5de 100644 --- a/sys/i4b/layer3/i4b_l3timer.c +++ b/sys/i4b/layer3/i4b_l3timer.c @@ -27,9 +27,11 @@ * i4b_l3timer.c - timer and timeout handling for layer 3 * ------------------------------------------------------ * - * $FreeBSD$ + * $Id: i4b_l3timer.c,v 1.14 1999/12/13 21:25:27 hm Exp $ * - * last edit-date: [Wed Apr 21 09:46:59 1999] + * $FreeBSD$ + * + * last edit-date: [Mon Dec 13 22:05:18 1999] * *---------------------------------------------------------------------------*/ @@ -41,11 +43,13 @@ #if NI4BQ931 > 0 #include -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + +#if defined(__FreeBSD__) #include #else #include #endif + #include #include #include @@ -107,7 +111,7 @@ T303_start(call_desc_t *cd) DBGL3(L3_T_MSG, "T303_start", ("cr = %d\n", cd->cr)); cd->T303 = TIMER_ACTIVE; -#if defined(__FreeBSD_version) && __FreeBSD_version >= 300001 +#if defined(__FreeBSD__) cd->T303_callout = timeout((TIMEOUT_FUNC_T)T303_timeout, (void *)cd, T303VAL); #else timeout((TIMEOUT_FUNC_T)T303_timeout, (void *)cd, T303VAL); @@ -125,7 +129,7 @@ T303_stop(call_desc_t *cd) if(cd->T303 != TIMER_IDLE) { -#if defined(__FreeBSD_version) && __FreeBSD_version >= 300001 +#if defined(__FreeBSD__) untimeout((TIMEOUT_FUNC_T)T303_timeout, (void *)cd, cd->T303_callout); #else untimeout((TIMEOUT_FUNC_T)T303_timeout, (void *)cd); @@ -158,7 +162,7 @@ T305_start(call_desc_t *cd) DBGL3(L3_T_MSG, "T305_start", ("cr = %d\n", cd->cr)); cd->T305 = TIMER_ACTIVE; -#if defined(__FreeBSD_version) && __FreeBSD_version >= 300001 +#if defined(__FreeBSD__) cd->T305_callout = timeout((TIMEOUT_FUNC_T)T305_timeout, (void *)cd, T305VAL); #else timeout((TIMEOUT_FUNC_T)T305_timeout, (void *)cd, T305VAL); @@ -176,7 +180,7 @@ T305_stop(call_desc_t *cd) if(cd->T305 != TIMER_IDLE) { -#if defined(__FreeBSD_version) && __FreeBSD_version >= 300001 +#if defined(__FreeBSD__) untimeout((TIMEOUT_FUNC_T)T305_timeout, (void *)cd, cd->T305_callout); #else untimeout((TIMEOUT_FUNC_T)T305_timeout, (void *)cd); @@ -210,7 +214,7 @@ T308_start(call_desc_t *cd) DBGL3(L3_T_MSG, "T308_start", ("cr = %d\n", cd->cr)); cd->T308 = TIMER_ACTIVE; -#if defined(__FreeBSD_version) && __FreeBSD_version >= 300001 +#if defined(__FreeBSD__) cd->T308_callout = timeout((TIMEOUT_FUNC_T)T308_timeout, (void *)cd, T308VAL); #else timeout((TIMEOUT_FUNC_T)T308_timeout, (void *)cd, T308VAL); @@ -228,7 +232,7 @@ T308_stop(call_desc_t *cd) if(cd->T308 != TIMER_IDLE) { -#if defined(__FreeBSD_version) && __FreeBSD_version >= 300001 +#if defined(__FreeBSD__) untimeout((TIMEOUT_FUNC_T)T308_timeout, (void *)cd, cd->T308_callout); #else untimeout((TIMEOUT_FUNC_T)T308_timeout, (void *)cd); @@ -262,7 +266,7 @@ T309_start(call_desc_t *cd) DBGL3(L3_T_MSG, "T309_start", ("cr = %d\n", cd->cr)); cd->T309 = TIMER_ACTIVE; -#if defined(__FreeBSD_version) && __FreeBSD_version >= 300001 +#if defined(__FreeBSD__) cd->T309_callout = timeout((TIMEOUT_FUNC_T)T309_timeout, (void *)cd, T309VAL); #else timeout((TIMEOUT_FUNC_T)T309_timeout, (void *)cd, T309VAL); @@ -280,7 +284,7 @@ T309_stop(call_desc_t *cd) if(cd->T309 != TIMER_IDLE) { -#if defined(__FreeBSD_version) && __FreeBSD_version >= 300001 +#if defined(__FreeBSD__) untimeout((TIMEOUT_FUNC_T)T309_timeout, (void *)cd, cd->T309_callout); #else untimeout((TIMEOUT_FUNC_T)T309_timeout, (void *)cd); @@ -314,7 +318,7 @@ T310_start(call_desc_t *cd) DBGL3(L3_T_MSG, "T310_start", ("cr = %d\n", cd->cr)); cd->T310 = TIMER_ACTIVE; -#if defined(__FreeBSD_version) && __FreeBSD_version >= 300001 +#if defined(__FreeBSD__) cd->T310_callout = timeout((TIMEOUT_FUNC_T)T310_timeout, (void *)cd, T310VAL); #else timeout((TIMEOUT_FUNC_T)T310_timeout, (void *)cd, T310VAL); @@ -332,7 +336,7 @@ T310_stop(call_desc_t *cd) if(cd->T310 != TIMER_IDLE) { -#if defined(__FreeBSD_version) && __FreeBSD_version >= 300001 +#if defined(__FreeBSD__) untimeout((TIMEOUT_FUNC_T)T310_timeout, (void *)cd, cd->T310_callout); #else untimeout((TIMEOUT_FUNC_T)T310_timeout, (void *)cd); @@ -366,7 +370,7 @@ T313_start(call_desc_t *cd) DBGL3(L3_T_MSG, "T313_start", ("cr = %d\n", cd->cr)); cd->T313 = TIMER_ACTIVE; -#if defined(__FreeBSD_version) && __FreeBSD_version >= 300001 +#if defined(__FreeBSD__) cd->T313_callout = timeout((TIMEOUT_FUNC_T)T313_timeout, (void *)cd, T313VAL); #else timeout((TIMEOUT_FUNC_T)T313_timeout, (void *)cd, T313VAL); @@ -385,7 +389,7 @@ T313_stop(call_desc_t *cd) if(cd->T313 != TIMER_IDLE) { cd->T313 = TIMER_IDLE; -#if defined(__FreeBSD_version) && __FreeBSD_version >= 300001 +#if defined(__FreeBSD__) untimeout((TIMEOUT_FUNC_T)T313_timeout, (void *)cd, cd->T313_callout); #else untimeout((TIMEOUT_FUNC_T)T313_timeout, (void *)cd); diff --git a/sys/i4b/layer3/i4b_l4if.c b/sys/i4b/layer3/i4b_l4if.c index fa6ea162b650..da11b63e115e 100644 --- a/sys/i4b/layer3/i4b_l4if.c +++ b/sys/i4b/layer3/i4b_l4if.c @@ -27,9 +27,11 @@ * i4b_l4if.c - Layer 3 interface to Layer 4 * ------------------------------------------- * - * $FreeBSD$ + * $Id: i4b_l4if.c,v 1.22 1999/12/13 21:25:27 hm Exp $ * - * last edit-date: [Tue Apr 27 16:46:51 1999] + * $FreeBSD$ + * + * last edit-date: [Mon Dec 13 22:05:25 1999] * *---------------------------------------------------------------------------*/ @@ -41,11 +43,13 @@ #if NI4BQ931 > 0 #include -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + +#if defined(__FreeBSD__) #include #else #include #endif + #include #include #include @@ -160,6 +164,7 @@ i4b_mdl_status_ind(int unit, int status, int parm) if( (ctrl_desc[call_desc[i].controller].ctrl_type == CTRL_PASSIVE) && (ctrl_desc[call_desc[i].controller].unit == unit)) { + i4b_l3_stop_all_timers(&(call_desc[i])); if(call_desc[i].cdid != CDID_UNUSED) sendup++; } @@ -171,7 +176,10 @@ i4b_mdl_status_ind(int unit, int status, int parm) ctrl_desc[utoc_tab[unit]].tei = -1; if(sendup) + { i4b_l4_pdeact(unit, sendup); + call_desc[i].cdid = CDID_UNUSED; + } break; case STI_NOL1ACC: /* no outgoing access to S0 */ diff --git a/sys/i4b/layer3/i4b_q931.c b/sys/i4b/layer3/i4b_q931.c index cc6d9040c58c..e2fa689d0605 100644 --- a/sys/i4b/layer3/i4b_q931.c +++ b/sys/i4b/layer3/i4b_q931.c @@ -27,9 +27,11 @@ * i4b_q931.c - Q931 received messages handling * -------------------------------------------- * - * $FreeBSD$ + * $Id: i4b_q931.c,v 1.23 1999/12/13 21:25:27 hm Exp $ * - * last edit-date: [Tue Apr 27 12:04:35 1999] + * $FreeBSD$ + * + * last edit-date: [Mon Dec 13 22:05:33 1999] * *---------------------------------------------------------------------------*/ @@ -42,11 +44,13 @@ #if NI4BQ931 > 0 #include -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + +#if defined(__FreeBSD__) #include #else #include #endif + #include #include #include diff --git a/sys/i4b/layer3/i4b_q931.h b/sys/i4b/layer3/i4b_q931.h index 376d5ffb91ef..bbfc9b6483c4 100644 --- a/sys/i4b/layer3/i4b_q931.h +++ b/sys/i4b/layer3/i4b_q931.h @@ -27,9 +27,11 @@ * i4b_q931.h - Q931 handling header file * -------------------------------------- * - * $FreeBSD$ + * $Id: i4b_q931.h,v 1.8 1999/12/13 21:25:27 hm Exp $ * - * last edit-date: [Sun Feb 14 10:33:56 1999] + * $FreeBSD$ + * + * last edit-date: [Mon Dec 13 22:05:44 1999] * *---------------------------------------------------------------------------*/ @@ -114,3 +116,5 @@ #define MSG_ALERT_LEN 4 /* length of a alert message */ #endif /* _I4B_Q931_H_ */ + +/* EOF */ diff --git a/sys/i4b/layer3/i4b_q932fac.c b/sys/i4b/layer3/i4b_q932fac.c index e180b9d24970..1162144eee76 100644 --- a/sys/i4b/layer3/i4b_q932fac.c +++ b/sys/i4b/layer3/i4b_q932fac.c @@ -27,9 +27,11 @@ * i4b_q932fac.c - Q932 facility handling * -------------------------------------- * - * $FreeBSD$ + * $Id: i4b_q932fac.c,v 1.8 1999/12/13 21:25:27 hm Exp $ * - * last edit-date: [Sun Feb 14 10:34:02 1999] + * $FreeBSD$ + * + * last edit-date: [Mon Dec 13 22:05:51 1999] * *---------------------------------------------------------------------------*/ @@ -41,11 +43,13 @@ #if NI4BQ931 > 0 #include -#if defined(__FreeBSD__) && __FreeBSD__ >= 3 + +#if defined(__FreeBSD__) #include #else #include #endif + #include #include #include diff --git a/sys/i4b/layer3/i4b_q932fac.h b/sys/i4b/layer3/i4b_q932fac.h index 4e745ea4a733..d878c2e62199 100644 --- a/sys/i4b/layer3/i4b_q932fac.h +++ b/sys/i4b/layer3/i4b_q932fac.h @@ -27,9 +27,11 @@ * i4b_q932fac.h - Q932 facility handling header file * -------------------------------------------------- * - * $FreeBSD$ + * $Id: i4b_q932fac.h,v 1.7 1999/12/13 21:25:28 hm Exp $ * - * last edit-date: [Sun Feb 14 10:34:08 1999] + * $FreeBSD$ + * + * last edit-date: [Mon Dec 13 22:06:00 1999] * *--------------------------------------------------------------------------- * -- cgit v1.2.3