retronetworking
/
isdn4linux
13
0
Fork 0
Code Pull Requests Releases Activity

cleanup the headers

This commit is contained in:
Kai Germaschewski 2001-04-27 22:45:56 +00:00
parent 36c96b77ee
commit 3e9a5114aa
3 changed files with 119 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

211
include/linux/isdn.h
View File

@ -25,108 +25,8 @@
#ifndef isdn_h
#define isdn_h
#ifdef __KERNEL__
#include <linux/isdn_compat.h>
#include <linux/config.h>
#endif
#include <linux/ioctl.h>
#define ISDN_TTY_MAJOR 43
#define ISDN_TTYAUX_MAJOR 44
#define ISDN_MAJOR 45
/* The minor-devicenumbers for Channel 0 and 1 are used as arguments for
* physical Channel-Mapping, so they MUST NOT be changed without changing
* the correspondent code in isdn.c
*/
#ifdef CONFIG_COBALT_MICRO_SERVER
/* Save memory */
#define ISDN_MAX_DRIVERS 2
#define ISDN_MAX_CHANNELS 8
#else
#define ISDN_MAX_DRIVERS 32
#define ISDN_MAX_CHANNELS 64
#endif
#define ISDN_MINOR_B 0
#define ISDN_MINOR_BMAX (ISDN_MAX_CHANNELS-1)
#define ISDN_MINOR_CTRL 64
#define ISDN_MINOR_CTRLMAX (64 + (ISDN_MAX_CHANNELS-1))
#define ISDN_MINOR_PPP 128
#define ISDN_MINOR_PPPMAX (128 + (ISDN_MAX_CHANNELS-1))
#define ISDN_MINOR_STATUS 255
#ifndef CONFIG_ISDN_WITH_ABC
#undef CONFIG_ISDN_WITH_ABC_CALLB
#undef CONFIG_ISDN_WITH_ABC_UDP_CHECK
#undef CONFIG_ISDN_WITH_ABC_UDP_CHECK_HANGUP
#undef CONFIG_ISDN_WITH_ABC_UDP_CHECK_DIAL
#undef CONFIG_ISDN_WITH_ABC_OUTGOING_EAZ
#undef CONFIG_ISDN_WITH_ABC_LCR_SUPPORT
#undef CONFIG_ISDN_WITH_ABC_IPV4_TCP_KEEPALIVE
#undef CONFIG_ISDN_WITH_ABC_IPV4_DYNADDR
#undef CONFIG_ISDN_WITH_ABC_RCV_NO_HUPTIMER
#undef CONFIG_ISDN_WITH_ABC_ICALL_BIND
#undef CONFIG_ISDN_WITH_ABC_CH_EXTINUSE
#undef CONFIG_ISDN_WITH_ABC_CONN_ERROR
#undef CONFIG_ISDN_WITH_ABC_RAWIPCOMPRESS
#undef CONFIG_ISDN_WITH_ABC_IPTABLES_NETFILTER
#else
#include <linux/isdn_dwabc.h>
#ifndef CONFIG_NETFILTER
#undef CONFIG_ISDN_WITH_ABC_IPTABLES_NETFILTER
#endif
#ifdef __KERNEL__
typedef struct DWABCJIFFIES {
u_long msec_1000;
u_long msec_500;
u_long msec_400;
u_long msec_200;
u_long msec_100;
} DWABCJIFFIES;
enum ISDN_SKB_BITS {
ISDN_SKB_BIT_NF_NO_RS_TX = 0, /* don't reset huptimer on tx */
ISDN_SKB_BIT_NF_S_UNREACH, /* send dest-unreach in offline case */
ISDN_SKB_BIT_NF_DIALLOOP, /* ISDNDIAL target deadloop detection */
};
#ifdef CONFIG_ISDN_WITH_ABC_NEED_DWSJIFFIES
DWABCJIFFIES isdn_dwabc_jiffies;
#else
extern DWABCJIFFIES isdn_dwabc_jiffies;
#endif
#define dwsjiffies (isdn_dwabc_jiffies.msec_1000)
#endif
#define ISDN_DW_ABC_FLAG_NO_TCP_KEEPALIVE 0x00000001L
#define ISDN_DW_ABC_FLAG_NO_UDP_CHECK 0x00000002L
#define ISDN_DW_ABC_FLAG_NO_UDP_HANGUP 0x00000004L
#define ISDN_DW_ABC_FLAG_NO_UDP_DIAL 0x00000008L
#define ISDN_DW_ABC_FLAG_DYNADDR 0x00000010L
#define ISDN_DW_ABC_FLAG_RCV_NO_HUPTIMER 0x00000020L
#define ISDN_DW_ABC_FLAG_NO_CH_EXTINUSE 0x00000040L
#define ISDN_DW_ABC_FLAG_NO_CONN_ERROR 0x00000080L
#define ISDN_DW_ABC_FLAG_BSD_COMPRESS 0x00000100L
#define ISDN_DW_ABC_FLAG_NO_LCR 0x00000200L
#define ISDN_DW_ABC_FLAG_LEASED_LINE 0x00001000L
#define ISDN_DW_ABC_IFFLAG_NODCHAN 0x00000001L
#define ISDN_DW_ABC_IFFLAG_BSDAKTIV 0x00000002L
#define ISDN_DW_ABC_BITLOCK_SEND 0
#define ISDN_DW_ABC_BITLOCK_RECEIVE 1
#define ISDN_DW_ABC_MAX_CH_P_RIVER (32)
#endif
/* New ioctl-codes */
#define IIOCNETAIF _IO('I',1)
#define IIOCNETDIF _IO('I',2)
@ -178,6 +78,7 @@ extern DWABCJIFFIES isdn_dwabc_jiffies;
#define ISDN_NET_ENCAP_CISCOHDLCK 6 /* With SLARP and keepalive */
#define ISDN_NET_ENCAP_X25IFACE 7 /* Documentation/networking/x25-iface.txt*/
#define ISDN_NET_ENCAP_MAX_ENCAP ISDN_NET_ENCAP_X25IFACE
/* Facility which currently uses an ISDN-channel */
#define ISDN_USAGE_NONE 0
#define ISDN_USAGE_RAW 1
@ -211,12 +112,6 @@ typedef struct {
unsigned long arg;
} isdn_ioctl_struct;
typedef struct {
unsigned long isdndev;
unsigned long atmodem[ISDN_MAX_CHANNELS];
unsigned long info[ISDN_MAX_CHANNELS];
} debugvar_addr;
typedef struct {
char name[10];
char phone[ISDN_MSNLEN];
@ -251,14 +146,15 @@ typedef struct {
int dialmode; /* Flag: off / on / auto */
} isdn_net_ioctl_cfg;
#define ISDN_NET_DIALMODE_MASK 0xC0 /* bits for status */
#define ISDN_NET_DM_OFF 0x00 /* this interface is stopped */
#define ISDN_NET_DM_MANUAL 0x40 /* this interface is on (manual) */
#define ISDN_NET_DM_AUTO 0x80 /* this interface is autodial */
#define ISDN_NET_DIALMODE_MASK 0xC0 /* bits for status */
#define ISDN_NET_DM_OFF 0x00 /* this interface is stopped */
#define ISDN_NET_DM_MANUAL 0x40 /* this interface is on (manual) */
#define ISDN_NET_DM_AUTO 0x80 /* this interface is autodial */
#define ISDN_NET_DIALMODE(x) ((&(x))->flags & ISDN_NET_DIALMODE_MASK)
#ifdef __KERNEL__
#include <linux/config.h>
#include <linux/errno.h>
#include <linux/fs.h>
#include <linux/major.h>
@ -281,6 +177,101 @@ typedef struct {
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
#include <linux/tcp.h>
#include <linux/isdn_compat.h>
#define ISDN_TTY_MAJOR 43
#define ISDN_TTYAUX_MAJOR 44
#define ISDN_MAJOR 45
/* The minor-devicenumbers for Channel 0 and 1 are used as arguments for
* physical Channel-Mapping, so they MUST NOT be changed without changing
* the correspondent code in isdn.c
*/
#ifdef CONFIG_COBALT_MICRO_SERVER
/* Save memory */
#define ISDN_MAX_DRIVERS 2
#define ISDN_MAX_CHANNELS 8
#else
#define ISDN_MAX_DRIVERS 32
#define ISDN_MAX_CHANNELS 64
#endif
#define ISDN_MINOR_B 0
#define ISDN_MINOR_BMAX (ISDN_MAX_CHANNELS-1)
#define ISDN_MINOR_CTRL 64
#define ISDN_MINOR_CTRLMAX (64 + (ISDN_MAX_CHANNELS-1))
#define ISDN_MINOR_PPP 128
#define ISDN_MINOR_PPPMAX (128 + (ISDN_MAX_CHANNELS-1))
#define ISDN_MINOR_STATUS 255
#ifndef CONFIG_ISDN_WITH_ABC
#undef CONFIG_ISDN_WITH_ABC_CALLB
#undef CONFIG_ISDN_WITH_ABC_UDP_CHECK
#undef CONFIG_ISDN_WITH_ABC_UDP_CHECK_HANGUP
#undef CONFIG_ISDN_WITH_ABC_UDP_CHECK_DIAL
#undef CONFIG_ISDN_WITH_ABC_OUTGOING_EAZ
#undef CONFIG_ISDN_WITH_ABC_LCR_SUPPORT
#undef CONFIG_ISDN_WITH_ABC_IPV4_TCP_KEEPALIVE
#undef CONFIG_ISDN_WITH_ABC_IPV4_DYNADDR
#undef CONFIG_ISDN_WITH_ABC_RCV_NO_HUPTIMER
#undef CONFIG_ISDN_WITH_ABC_ICALL_BIND
#undef CONFIG_ISDN_WITH_ABC_CH_EXTINUSE
#undef CONFIG_ISDN_WITH_ABC_CONN_ERROR
#undef CONFIG_ISDN_WITH_ABC_RAWIPCOMPRESS
#undef CONFIG_ISDN_WITH_ABC_IPTABLES_NETFILTER
#else /* CONFIG_ISDN_WITH_ABC */
#include <linux/isdn_dwabc.h>
#ifndef CONFIG_NETFILTER
#undef CONFIG_ISDN_WITH_ABC_IPTABLES_NETFILTER
#endif
typedef struct DWABCJIFFIES {
u_long msec_1000;
u_long msec_500;
u_long msec_400;
u_long msec_200;
u_long msec_100;
} DWABCJIFFIES;
enum ISDN_SKB_BITS {
ISDN_SKB_BIT_NF_NO_RS_TX = 0, /* don't reset huptimer on tx */
ISDN_SKB_BIT_NF_S_UNREACH, /* send dest-unreach in offline case */
ISDN_SKB_BIT_NF_DIALLOOP, /* ISDNDIAL target deadloop detection */
};
#ifdef CONFIG_ISDN_WITH_ABC_NEED_DWSJIFFIES
DWABCJIFFIES isdn_dwabc_jiffies;
#else
extern DWABCJIFFIES isdn_dwabc_jiffies;
#endif
#define dwsjiffies (isdn_dwabc_jiffies.msec_1000)
#define ISDN_DW_ABC_FLAG_NO_TCP_KEEPALIVE 0x00000001L
#define ISDN_DW_ABC_FLAG_NO_UDP_CHECK 0x00000002L
#define ISDN_DW_ABC_FLAG_NO_UDP_HANGUP 0x00000004L
#define ISDN_DW_ABC_FLAG_NO_UDP_DIAL 0x00000008L
#define ISDN_DW_ABC_FLAG_DYNADDR 0x00000010L
#define ISDN_DW_ABC_FLAG_RCV_NO_HUPTIMER 0x00000020L
#define ISDN_DW_ABC_FLAG_NO_CH_EXTINUSE 0x00000040L
#define ISDN_DW_ABC_FLAG_NO_CONN_ERROR 0x00000080L
#define ISDN_DW_ABC_FLAG_BSD_COMPRESS 0x00000100L
#define ISDN_DW_ABC_FLAG_NO_LCR 0x00000200L
#define ISDN_DW_ABC_FLAG_LEASED_LINE 0x00001000L
#define ISDN_DW_ABC_IFFLAG_NODCHAN 0x00000001L
#define ISDN_DW_ABC_IFFLAG_BSDAKTIV 0x00000002L
#define ISDN_DW_ABC_BITLOCK_SEND 0
#define ISDN_DW_ABC_BITLOCK_RECEIVE 1
#define ISDN_DW_ABC_MAX_CH_P_RIVER (32)
#endif /* CONFIG_ISDN_WITH_ABC */
#ifdef CONFIG_ISDN_PPP

34
include/linux/isdn_ppp.h
View File

@ -3,11 +3,6 @@
#ifndef _LINUX_ISDN_PPP_H
#define _LINUX_ISDN_PPP_H
#ifdef __KERNEL__
#include <linux/config.h>
#include <linux/isdn_compat.h>
#endif
#define CALLTYPE_INCOMING 0x1
#define CALLTYPE_OUTGOING 0x2
#define CALLTYPE_CALLBACK 0x4
@ -32,12 +27,6 @@ struct pppcallinfo
#define PPPIOCSCOMPRESSOR _IOW('t',135,int)
#define PPPIOCGIFNAME _IOR('t',136, char [IFNAMSIZ] )
#ifdef COMPAT_NEED_MPPP_DEFS
#define PPP_MP 0x003d
#define PPP_COMPFRAG 0x00fb
#define PPP_CCPFRAG 0x80fb
#endif
#define SC_MP_PROT 0x00000200
#define SC_REJ_MP_PROT 0x00000400
#define SC_OUT_SHORT_SEQ 0x00000800
@ -52,13 +41,6 @@ struct pppcallinfo
#define SC_LINK_DECOMP_DISCARD 0x40
#define SC_LINK_COMP_DISCARD 0x80
#define DECOMP_ERR_NOMEM (-10)
#define MP_END_FRAG 0x40
#define MP_BEGIN_FRAG 0x80
#define MP_MAX_QUEUE_LEN 16
#define ISDN_PPP_COMP_MAX_OPTIONS 16
#define IPPP_COMP_FLAG_XMIT 0x1
@ -73,6 +55,22 @@ struct isdn_ppp_comp_data {
#ifdef __KERNEL__
#include <linux/config.h>
#include <linux/isdn_compat.h>
#ifdef COMPAT_NEED_MPPP_DEFS
#define PPP_MP 0x003d
#define PPP_COMPFRAG 0x00fb
#define PPP_CCPFRAG 0x80fb
#endif
#define DECOMP_ERR_NOMEM (-10)
#define MP_END_FRAG 0x40
#define MP_BEGIN_FRAG 0x80
#define MP_MAX_QUEUE_LEN 16
/*
* We need a way for the decompressor to influence the generation of CCP
* Reset-Requests in a variety of ways. The decompressor is already returning

7
include/linux/isdnif.h
View File

@ -26,11 +26,6 @@
#ifndef isdnif_h
#define isdnif_h
#ifdef __KERNEL__
#include <linux/config.h>
#include <linux/isdn_compat.h>
#endif
/*
* Values for general protocol-selection
*/
@ -70,7 +65,9 @@
#ifdef __KERNEL__
#include <linux/config.h>
#include <linux/skbuff.h>
#include <linux/isdn_compat.h>
/***************************************************************************/
/* Extensions made by Werner Cornelius (werner@ikt.de) */