d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

I4B header files are now installed in include/i4b/ and no longer

Browse Source 
in include/machine/.

Adapt #include paths.

Approved by:	re (kensmith)
This commit is contained in:
Bjoern A. Zeeb 2007-07-06 07:21:56 +00:00
parent 9fa28ff687
commit ec8fa4cfd9
19 changed files with 29 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/examples/isdn/FAQ
View File

@ -450,7 +450,7 @@ IEEE488 and ISDN cards often belong in this category.
8) add the flag value and function prototypes to layer1/i4b_l1.h 8) add the flag value and function prototypes to layer1/i4b_l1.h
9) add support for NetBSD to layer1/isa_isic.c 9) add support for NetBSD to layer1/isa_isic.c
10) add support for attach/probe to layer1/i4b_isic.c 10) add support for attach/probe to layer1/i4b_isic.c
11) add card type to machine/i4b_ioctl.h and update CARD_TYPEP_MAX 11) add card type to i4b/i4b_ioctl.h and update CARD_TYPEP_MAX
12) add an entry to the man page man/isic.4 12) add an entry to the man page man/isic.4
Produce diffs (please use context diffs, flag "-c" for diff) and send them in. Produce diffs (please use context diffs, flag "-c" for diff) and send them in.

4
share/examples/isdn/Overview
View File

@ -252,7 +252,7 @@ Debugging control
(6) the device driver for /dev/i4bctl in conjunction with the userland (6) the device driver for /dev/i4bctl in conjunction with the userland
program isdndebug(8) is used to set the debug level for each of the program isdndebug(8) is used to set the debug level for each of the
layers and several other parts of the system, information how to use layers and several other parts of the system, information how to use
this is contained in machine/i4b_debug.h and all parts of the kernel this is contained in i4b/i4b_debug.h and all parts of the kernel
sources. It is only usable for passive cards. sources. It is only usable for passive cards.
@ -271,7 +271,7 @@ Layer 4
consisting of "messages" sent to userland and which are read(2) by the consisting of "messages" sent to userland and which are read(2) by the
isdnd. The isdnd in turn sends "messages" to the kernel by using the isdnd. The isdnd in turn sends "messages" to the kernel by using the
ioctl(2) call. This protocol and the required messages for both ioctl(2) call. This protocol and the required messages for both
directions are documented in the machine/i4b_ioctl.h file and are directions are documented in the i4b/i4b_ioctl.h file and are
implemented in files i4b_i4bdrv.c and i4b_l4.c, the latter also implemented in files i4b_i4bdrv.c and i4b_l4.c, the latter also
containing much of the Layer 4 interface to the lower layers. containing much of the Layer 4 interface to the lower layers.

2
share/examples/isdn/contrib/hplay.c
View File

@ -29,7 +29,7 @@
#include <sys/signal.h> #include <sys/signal.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <machine/i4b_tel_ioctl.h> #include <i4b/i4b_tel_ioctl.h>
#include "proto.h" #include "proto.h"
#include "getargs.h" #include "getargs.h"

2
share/examples/isdn/contrib/isdntelmux.c
View File

@ -47,7 +47,7 @@
#include<sys/types.h> #include<sys/types.h>
#include<sys/time.h> #include<sys/time.h>
#include<sys/param.h> #include<sys/param.h>
#include<machine/i4b_tel_ioctl.h> #include<i4b/i4b_tel_ioctl.h>
// DECL DEFS // DECL DEFS
#define BUFLEN 2048 #define BUFLEN 2048

4
share/examples/isdn/i4brunppp/i4brunppp.c
View File

@ -59,8 +59,8 @@
#include <time.h> #include <time.h>
#include <ctype.h> #include <ctype.h>
#include <machine/i4b_ioctl.h> #include <i4b/i4b_ioctl.h>
#include <machine/i4b_rbch_ioctl.h> #include <i4b/i4b_rbch_ioctl.h>
#define I4BDEVICE "/dev/i4b" #define I4BDEVICE "/dev/i4b"

2
share/examples/isdn/v21/v21modem.c
View File

@ -25,7 +25,7 @@
#include <termios.h> #include <termios.h>
#include <libutil.h> #include <libutil.h>
#include <machine/i4b_tel_ioctl.h> #include <i4b/i4b_tel_ioctl.h>
static void create_session(void); static void create_session(void);
static void input_byte(int byte, int stopbit); static void input_byte(int byte, int stopbit);

2
usr.sbin/i4b/g711conv/g711conv.c
View File

@ -76,7 +76,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <machine/i4b_ioctl.h> #include <i4b/i4b_ioctl.h>
/* copy from CCITT G.711 specifications */ /* copy from CCITT G.711 specifications */

4
usr.sbin/i4b/isdnd/isdnd.8
View File

@ -28,7 +28,7 @@
.\" .\"
.\" last edit-date: [Wed May 2 10:48:30 2001] .\" last edit-date: [Wed May 2 10:48:30 2001]
.\" .\"
.Dd May 2, 2001 .Dd July 5, 2007
.Dt ISDND 8 .Dt ISDND 8
.Os .Os
.Sh NAME .Sh NAME
@ -223,7 +223,7 @@ from device
.Pp .Pp
The messages and message parameters are documented in the include The messages and message parameters are documented in the include
file file
.Em /usr/include/machine/i4b_ioctl.h . .Em /usr/include/i4b/i4b_ioctl.h .
.Pp .Pp
Supported command and response messages (ioctls) to the kernel are: Supported command and response messages (ioctls) to the kernel are:
.Bl -tag -width Ds -compact -offset indent .Bl -tag -width Ds -compact -offset indent

4
usr.sbin/i4b/isdnd/isdnd.h
View File

@ -68,8 +68,8 @@
#include <net/if_sppp.h> #include <net/if_sppp.h>
#include <machine/i4b_ioctl.h> #include <i4b/i4b_ioctl.h>
#include <machine/i4b_cause.h> #include <i4b/i4b_cause.h>
#include "config.h" /* compile time configuration */ #include "config.h" /* compile time configuration */
#include "pathnames.h" /* location of files */ #include "pathnames.h" /* location of files */

4
usr.sbin/i4b/isdndebug/main.c
View File

@ -47,8 +47,8 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/time.h> #include <sys/time.h>
#include <machine/i4b_debug.h> #include <i4b/i4b_debug.h>
#include <machine/i4b_ioctl.h> #include <i4b/i4b_ioctl.h>
char *bin_str(unsigned long val, int length); char *bin_str(unsigned long val, int length);

4
usr.sbin/i4b/isdndecode/decode.h
View File

@ -50,8 +50,8 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/file.h> #include <sys/file.h>
#include <machine/i4b_ioctl.h> #include <i4b/i4b_ioctl.h>
#include <machine/i4b_trace.h> #include <i4b/i4b_trace.h>
#include "pcause.h" #include "pcause.h"

2
usr.sbin/i4b/isdnmonitor/monprivate.h
View File

@ -62,7 +62,7 @@
#if defined (__FreeBSD__) || defined(__NetBSD__) || \ #if defined (__FreeBSD__) || defined(__NetBSD__) || \
defined (__OpenBSD__) || defined(__bsdi__) defined (__OpenBSD__) || defined(__bsdi__)
#include <machine/i4b_ioctl.h> #include <i4b/i4b_ioctl.h>
#else #else

4
usr.sbin/i4b/isdnphone/defs.h
View File

@ -54,8 +54,8 @@
#include <sys/time.h> #include <sys/time.h>
#include <sys/param.h> #include <sys/param.h>
#include <machine/i4b_ioctl.h> #include <i4b/i4b_ioctl.h>
#include <machine/i4b_tel_ioctl.h> #include <i4b/i4b_tel_ioctl.h>
/* device file prefixes */ /* device file prefixes */

2
usr.sbin/i4b/isdntel/defs.h
View File

@ -53,7 +53,7 @@
#endif #endif
#include <sys/param.h> #include <sys/param.h>
#include <machine/i4b_ioctl.h> #include <i4b/i4b_ioctl.h>
#define GOOD 0 #define GOOD 0
#define ERROR (-1) #define ERROR (-1)

4
usr.sbin/i4b/isdntelctl/main.c
View File

@ -50,8 +50,8 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/time.h> #include <sys/time.h>
#include <machine/i4b_ioctl.h> #include <i4b/i4b_ioctl.h>
#include <machine/i4b_tel_ioctl.h> #include <i4b/i4b_tel_ioctl.h>
static void usage ( void ); static void usage ( void );

4
usr.sbin/i4b/isdntest/main.c
View File

@ -49,8 +49,8 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/time.h> #include <sys/time.h>
#include <machine/i4b_ioctl.h> #include <i4b/i4b_ioctl.h>
#include <machine/i4b_cause.h> #include <i4b/i4b_cause.h>
static void kbdrdhdl ( void ); static void kbdrdhdl ( void );
static void isdnrdhdl (int isdnfd ); static void isdnrdhdl (int isdnfd );

4
usr.sbin/i4b/isdntrace/trace.h
View File

@ -59,8 +59,8 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/param.h> #include <sys/param.h>
#include <machine/i4b_ioctl.h> #include <i4b/i4b_ioctl.h>
#include <machine/i4b_trace.h> #include <i4b/i4b_trace.h>
#include "pcause_1tr6.h" /* obsolete german national ISDN */ #include "pcause_1tr6.h" /* obsolete german national ISDN */
#include "pcause_q850.h" #include "pcause_q850.h"

4
usr.sbin/i4b/man/i4b.4
View File

@ -26,7 +26,7 @@
.\" .\"
.\" last edit-date: [Sun Jul 28 12:07:13 2002] .\" last edit-date: [Sun Jul 28 12:07:13 2002]
.\" .\"
.Dd July 28, 2002 .Dd July 5, 2007
.Dt I4B 4 .Dt I4B 4
.Os .Os
.Sh NAME .Sh NAME
@ -49,7 +49,7 @@ by user programs.
.Pp .Pp
The messages and message parameters are documented in the include The messages and message parameters are documented in the include
file file
.Em /usr/include/machine/i4b_ioctl.h . .Em /usr/include/i4b/i4b_ioctl.h .
.Pp .Pp
The most important available ioctl's are: The most important available ioctl's are:
.Pp .Pp

5
usr.sbin/ppp/i4b.c
View File

@ -36,10 +36,6 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#ifdef __FreeBSD__
#include <machine/i4b_ioctl.h>
#include <machine/i4b_rbch_ioctl.h>
#else
#ifdef __NetBSD__ #ifdef __NetBSD__
#include <netisdn/i4b_ioctl.h> #include <netisdn/i4b_ioctl.h>
#include <netisdn/i4b_rbch_ioctl.h> #include <netisdn/i4b_rbch_ioctl.h>
@ -47,7 +43,6 @@
#include <i4b/i4b_ioctl.h> #include <i4b/i4b_ioctl.h>
#include <i4b/i4b_rbch_ioctl.h> #include <i4b/i4b_rbch_ioctl.h>
#endif #endif
#endif
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>