From e5044a69c99727fc68f6b7f09689aeb5244d9549 Mon Sep 17 00:00:00 2001 From: hm Date: Tue, 14 Dec 1999 20:54:38 +0000 Subject: update to isdn4bsd beta release 0.90 --- sys/i4b/include/i4b_cause.h | 10 +++++++--- sys/i4b/include/i4b_debug.h | 6 ++++-- sys/i4b/include/i4b_ioctl.h | 42 ++++++++++++++++++++++++++++++++++++---- sys/i4b/include/i4b_rbch_ioctl.h | 4 +++- sys/i4b/include/i4b_tel_ioctl.h | 6 ++++-- sys/i4b/include/i4b_trace.h | 6 ++++-- 6 files changed, 60 insertions(+), 14 deletions(-) (limited to 'sys/i4b/include') diff --git a/sys/i4b/include/i4b_cause.h b/sys/i4b/include/i4b_cause.h index f94df0f9..96589e5 100644 --- a/sys/i4b/include/i4b_cause.h +++ b/sys/i4b/include/i4b_cause.h @@ -27,9 +27,11 @@ * i4b_cause.h - causes and cause handling for i4b * ----------------------------------------------- * + * $Id: i4b_cause.h,v 1.11 1999/12/13 21:25:28 hm Exp $ + * * $FreeBSD$ * - * last edit-date: [Sun Feb 14 10:37:46 1999] + * last edit-date: [Mon Dec 13 22:06:51 1999] * *---------------------------------------------------------------------------*/ @@ -66,8 +68,10 @@ #define CAUSE_I4B_OOO 5 /* destination out of order */ #define CAUSE_I4B_TMPFAIL 6 /* temporary failure */ #define CAUSE_I4B_L1ERROR 7 /* L1 error / persistent deact */ -#define CAUSE_I4B_MAX 8 - +#define CAUSE_I4B_LLDIAL 8 /* no dialout on leased line */ +#define CAUSE_I4B_MAX 9 + /* NOTE: update isdnd/pcause.c when adding causes !!!!! */ + /* CAUSET_Q850 - causes defined in Q.850 */ #define CAUSE_Q850_SHUTDN 0x00 /* normal D-channel shutdown */ diff --git a/sys/i4b/include/i4b_debug.h b/sys/i4b/include/i4b_debug.h index e2f1ee1..aabc498 100644 --- a/sys/i4b/include/i4b_debug.h +++ b/sys/i4b/include/i4b_debug.h @@ -27,9 +27,11 @@ * i4b_debug.h - i4b debug header file * ----------------------------------- * - * $FreeBSD$ + * $Id: i4b_debug.h,v 1.20 1999/12/13 21:25:28 hm Exp $ * - * last edit-date: [Fri May 28 16:27:07 1999] + * $FreeBSD$ + * + * last edit-date: [Mon Dec 13 22:06:59 1999] * *---------------------------------------------------------------------------*/ diff --git a/sys/i4b/include/i4b_ioctl.h b/sys/i4b/include/i4b_ioctl.h index 785379f..c2a2460 100644 --- a/sys/i4b/include/i4b_ioctl.h +++ b/sys/i4b/include/i4b_ioctl.h @@ -27,9 +27,11 @@ * i4b_ioctl.h - messages kernel <--> userland * ------------------------------------------- * - * $FreeBSD$ + * $Id: i4b_ioctl.h,v 1.150 1999/12/13 21:25:28 hm Exp $ * - * last edit-date: [Fri Jul 30 08:53:47 1999] + * $FreeBSD$ + * + * last edit-date: [Mon Dec 13 22:12:16 1999] * *---------------------------------------------------------------------------*/ @@ -46,8 +48,8 @@ * version and release number for isdn4bsd package *---------------------------------------------------------------------------*/ #define VERSION 0 /* version number */ -#define REL 83 /* release number */ -#define STEP 0 /* release step */ +#define REL 90 /* release number */ +#define STEP 1 /* release step */ /*---------------------------------------------------------------------------* * date/time format in i4b log messages @@ -68,6 +70,12 @@ #define MAX_CONTROLLERS 8 /* max number of controllers */ /*---------------------------------------------------------------------------* + * ISDN D-channel protocols + *---------------------------------------------------------------------------*/ +#define PROTOCOL_DSS1 0 /* default, Euro-ISDN/DSS1 */ +#define PROTOCOL_D64S 1 /* 64k leased line, no protocol */ + +/*---------------------------------------------------------------------------* * controller types *---------------------------------------------------------------------------*/ #define CTRL_INVALID (-1) /* invalid, error */ @@ -278,6 +286,7 @@ typedef struct { #define MSG_NEGCOMP_IND 'n' #define MSG_IFSTATE_CHANGED_IND 'o' #define MSG_DIALOUTNUMBER_IND 'p' +#define MSG_PACKET_IND 'q' int cdid; /* call descriptor id */ } msg_hdr_t; @@ -430,6 +439,21 @@ typedef struct { } msg_drvrdisc_req_t; /*---------------------------------------------------------------------------* + * connect packet logging + *---------------------------------------------------------------------------*/ + +typedef struct { + msg_hdr_t header; /* common header */ + int driver; /* driver type */ + int driver_unit; /* driver unit number */ + int direction; /* 0=in 1=out */ +#define DIRECTION_IN 0 /* sending packet to remote */ +#define DIRECTION_OUT 1 /* received packet from remote */ +#define MAX_PACKET_LOG 40 /* space for IP and TCP header */ + u_int8_t pktdata[MAX_PACKET_LOG]; +} msg_packet_ind_t; + +/*---------------------------------------------------------------------------* * state of layer 1/2 *---------------------------------------------------------------------------*/ typedef struct { @@ -606,6 +630,16 @@ typedef struct { #define I4B_VR_REQ _IOR('4', 9, msg_vr_req_t) /*---------------------------------------------------------------------------* + * set ISDN protocol used by a controller + *---------------------------------------------------------------------------*/ +typedef struct { + int controller; /* controller number */ + int protocol; /* ISDN D-channel protocol type */ +} msg_prot_ind_t; + +#define I4B_PROT_IND _IOW('4', 10, msg_prot_ind_t) + +/*---------------------------------------------------------------------------* * Protocol download to active cards *---------------------------------------------------------------------------*/ struct isdn_dr_prot { diff --git a/sys/i4b/include/i4b_rbch_ioctl.h b/sys/i4b/include/i4b_rbch_ioctl.h index 62d2829..88142ad 100644 --- a/sys/i4b/include/i4b_rbch_ioctl.h +++ b/sys/i4b/include/i4b_rbch_ioctl.h @@ -27,9 +27,11 @@ * 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: [Fri Jul 9 08:35:07 1999] + * last edit-date: [Mon Dec 13 22:07:12 1999] * *---------------------------------------------------------------------------*/ diff --git a/sys/i4b/include/i4b_tel_ioctl.h b/sys/i4b/include/i4b_tel_ioctl.h index 0f1004a..2cc9e15 100644 --- a/sys/i4b/include/i4b_tel_ioctl.h +++ b/sys/i4b/include/i4b_tel_ioctl.h @@ -27,9 +27,11 @@ * i4b_tel_ioctl.h telephony interface ioctls * ------------------------------------------ * - * $FreeBSD$ + * $Id: i4b_tel_ioctl.h,v 1.11 1999/12/13 21:25:28 hm Exp $ * - * last edit-date: [Fri Jul 9 08:34:28 1999] + * $FreeBSD$ + * + * last edit-date: [Mon Dec 13 22:07:18 1999] * *---------------------------------------------------------------------------*/ diff --git a/sys/i4b/include/i4b_trace.h b/sys/i4b/include/i4b_trace.h index 3001e64..fa1a9a6 100644 --- a/sys/i4b/include/i4b_trace.h +++ b/sys/i4b/include/i4b_trace.h @@ -27,9 +27,11 @@ * i4b_trace.h - header file for trace data read device * ---------------------------------------------------- * - * $FreeBSD$ + * $Id: i4b_trace.h,v 1.7 1999/12/13 21:25:28 hm Exp $ * - * last edit-date: [Sun Feb 14 10:39:26 1999] + * $FreeBSD$ + * + * last edit-date: [Mon Dec 13 22:07:25 1999] * *---------------------------------------------------------------------------*/ -- cgit v1.1