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

in include/machine/. Adapt #include paths. Approved by: re (kensmith)
2007-07-06 07:21:56 +00:00 · 2007-07-06 07:21:56 +00:00 · ec8fa4cfd9
commit ec8fa4cfd9
parent 9fa28ff687
19 changed files with 29 additions and 34 deletions
--- a/share/examples/isdn/FAQ
+++ b/share/examples/isdn/FAQ
@ -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
 9) add support for NetBSD to layer1/isa_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

 Produce diffs (please use context diffs, flag "-c" for diff) and send them in.
--- a/share/examples/isdn/Overview
+++ b/share/examples/isdn/Overview
@ -252,7 +252,7 @@ Debugging control
 (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
    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.


@ -271,7 +271,7 @@ Layer 4
    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
    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
    containing much of the Layer 4 interface to the lower layers.

--- a/share/examples/isdn/contrib/hplay.c
+++ b/share/examples/isdn/contrib/hplay.c
@ -29,7 +29,7 @@
 #include <sys/signal.h>
 #include <sys/ioctl.h>

-#include <machine/i4b_tel_ioctl.h>
+#include <i4b/i4b_tel_ioctl.h>

 #include "proto.h"
 #include "getargs.h"
--- a/share/examples/isdn/contrib/isdntelmux.c
+++ b/share/examples/isdn/contrib/isdntelmux.c
@ -47,7 +47,7 @@
 #include<sys/types.h>
 #include<sys/time.h>
 #include<sys/param.h>
-#include<machine/i4b_tel_ioctl.h>
+#include<i4b/i4b_tel_ioctl.h>

 // DECL DEFS
 #define BUFLEN 2048
--- a/share/examples/isdn/i4brunppp/i4brunppp.c
+++ b/share/examples/isdn/i4brunppp/i4brunppp.c
@ -59,8 +59,8 @@
 #include <time.h>
 #include <ctype.h>

-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_rbch_ioctl.h>
+#include <i4b/i4b_ioctl.h>
+#include <i4b/i4b_rbch_ioctl.h>

 #define I4BDEVICE	"/dev/i4b"

--- a/share/examples/isdn/v21/v21modem.c
+++ b/share/examples/isdn/v21/v21modem.c
@ -25,7 +25,7 @@
 #include <termios.h>
 #include <libutil.h>

-#include <machine/i4b_tel_ioctl.h>
+#include <i4b/i4b_tel_ioctl.h>

 static void create_session(void);
 static void input_byte(int byte, int stopbit);
--- a/usr.sbin/i4b/g711conv/g711conv.c
+++ b/usr.sbin/i4b/g711conv/g711conv.c
@ -76,7 +76,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <machine/i4b_ioctl.h>
+#include <i4b/i4b_ioctl.h>

 /* copy from CCITT G.711 specifications */

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

 #include <net/if_sppp.h>

-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_cause.h>
+#include <i4b/i4b_ioctl.h>
+#include <i4b/i4b_cause.h>

 #include "config.h"		/* compile time configuration	*/
 #include "pathnames.h"		/* location of files		*/
--- a/usr.sbin/i4b/isdndebug/main.c
+++ b/usr.sbin/i4b/isdndebug/main.c
@ -47,8 +47,8 @@
 #include <sys/types.h>
 #include <sys/time.h>

-#include <machine/i4b_debug.h>
-#include <machine/i4b_ioctl.h>
+#include <i4b/i4b_debug.h>
+#include <i4b/i4b_ioctl.h>

 char *bin_str(unsigned long val, int length);

--- a/usr.sbin/i4b/isdndecode/decode.h
+++ b/usr.sbin/i4b/isdndecode/decode.h
@ -50,8 +50,8 @@
 #include <sys/ioctl.h>
 #include <sys/file.h>

-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/i4b_ioctl.h>
+#include <i4b/i4b_trace.h>

 #include "pcause.h"

--- a/usr.sbin/i4b/isdnmonitor/monprivate.h
+++ b/usr.sbin/i4b/isdnmonitor/monprivate.h
@ -62,7 +62,7 @@
 #if defined (__FreeBSD__) || defined(__NetBSD__) || \
    defined (__OpenBSD__) || defined(__bsdi__)

-#include <machine/i4b_ioctl.h>
+#include <i4b/i4b_ioctl.h>

 #else

--- a/usr.sbin/i4b/isdnphone/defs.h
+++ b/usr.sbin/i4b/isdnphone/defs.h
@ -54,8 +54,8 @@
 #include <sys/time.h>
 #include <sys/param.h>

-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_tel_ioctl.h>
+#include <i4b/i4b_ioctl.h>
+#include <i4b/i4b_tel_ioctl.h>

 /* device file prefixes */

--- a/usr.sbin/i4b/isdntel/defs.h
+++ b/usr.sbin/i4b/isdntel/defs.h
@ -53,7 +53,7 @@
 #endif
 #include <sys/param.h>

-#include <machine/i4b_ioctl.h>
+#include <i4b/i4b_ioctl.h>

 #define GOOD	0
 #define	ERROR	(-1)
--- a/usr.sbin/i4b/isdntelctl/main.c
+++ b/usr.sbin/i4b/isdntelctl/main.c
@ -50,8 +50,8 @@
 #include <sys/types.h>
 #include <sys/time.h>

-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_tel_ioctl.h>
+#include <i4b/i4b_ioctl.h>
+#include <i4b/i4b_tel_ioctl.h>

 static void usage ( void );

--- a/usr.sbin/i4b/isdntest/main.c
+++ b/usr.sbin/i4b/isdntest/main.c
@ -49,8 +49,8 @@
 #include <sys/types.h>
 #include <sys/time.h>

-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_cause.h>
+#include <i4b/i4b_ioctl.h>
+#include <i4b/i4b_cause.h>

 static void kbdrdhdl ( void );
 static void isdnrdhdl (int isdnfd );
--- a/usr.sbin/i4b/isdntrace/trace.h
+++ b/usr.sbin/i4b/isdntrace/trace.h
@ -59,8 +59,8 @@
 #include <sys/stat.h>
 #include <sys/param.h>

-#include <machine/i4b_ioctl.h>
-#include <machine/i4b_trace.h>
+#include <i4b/i4b_ioctl.h>
+#include <i4b/i4b_trace.h>

 #include "pcause_1tr6.h"	/* obsolete german national ISDN */
 #include "pcause_q850.h"
--- a/usr.sbin/i4b/man/i4b.4
+++ b/usr.sbin/i4b/man/i4b.4
@ -26,7 +26,7 @@
 .\"
 .\"	last edit-date: [Sun Jul 28 12:07:13 2002]
 .\"
-.Dd July 28, 2002
+.Dd July 5, 2007
 .Dt I4B 4
 .Os
 .Sh NAME
@ -49,7 +49,7 @@ by user programs.
 .Pp
 The messages and message parameters are documented in the include
 file
-.Em /usr/include/machine/i4b_ioctl.h .
+.Em /usr/include/i4b/i4b_ioctl.h .
 .Pp
 The most important available ioctl's are:
 .Pp
--- a/usr.sbin/ppp/i4b.c
+++ b/usr.sbin/ppp/i4b.c
@ -36,10 +36,6 @@

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