From ec8fa4cfd9c06c9b082139952651e1353bd6d502 Mon Sep 17 00:00:00 2001 From: "Bjoern A. Zeeb" Date: Fri, 6 Jul 2007 07:21:56 +0000 Subject: [PATCH] I4B header files are now installed in include/i4b/ and no longer in include/machine/. Adapt #include paths. Approved by: re (kensmith) --- share/examples/isdn/FAQ | 2 +- share/examples/isdn/Overview | 4 ++-- share/examples/isdn/contrib/hplay.c | 2 +- share/examples/isdn/contrib/isdntelmux.c | 2 +- share/examples/isdn/i4brunppp/i4brunppp.c | 4 ++-- share/examples/isdn/v21/v21modem.c | 2 +- usr.sbin/i4b/g711conv/g711conv.c | 2 +- usr.sbin/i4b/isdnd/isdnd.8 | 4 ++-- usr.sbin/i4b/isdnd/isdnd.h | 4 ++-- usr.sbin/i4b/isdndebug/main.c | 4 ++-- usr.sbin/i4b/isdndecode/decode.h | 4 ++-- usr.sbin/i4b/isdnmonitor/monprivate.h | 2 +- usr.sbin/i4b/isdnphone/defs.h | 4 ++-- usr.sbin/i4b/isdntel/defs.h | 2 +- usr.sbin/i4b/isdntelctl/main.c | 4 ++-- usr.sbin/i4b/isdntest/main.c | 4 ++-- usr.sbin/i4b/isdntrace/trace.h | 4 ++-- usr.sbin/i4b/man/i4b.4 | 4 ++-- usr.sbin/ppp/i4b.c | 5 ----- 19 files changed, 29 insertions(+), 34 deletions(-) diff --git a/share/examples/isdn/FAQ b/share/examples/isdn/FAQ index b32ce7ba7dcd..f3a4fda52d6f 100644 --- 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. diff --git a/share/examples/isdn/Overview b/share/examples/isdn/Overview index 831350630b57..76043954c3ca 100644 --- 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. diff --git a/share/examples/isdn/contrib/hplay.c b/share/examples/isdn/contrib/hplay.c index 10660ac7b7b1..763e5a865dfa 100644 --- a/share/examples/isdn/contrib/hplay.c +++ b/share/examples/isdn/contrib/hplay.c @@ -29,7 +29,7 @@ #include #include -#include +#include #include "proto.h" #include "getargs.h" diff --git a/share/examples/isdn/contrib/isdntelmux.c b/share/examples/isdn/contrib/isdntelmux.c index 318ebfcb937e..1d517a7106a0 100644 --- a/share/examples/isdn/contrib/isdntelmux.c +++ b/share/examples/isdn/contrib/isdntelmux.c @@ -47,7 +47,7 @@ #include #include #include -#include +#include // DECL DEFS #define BUFLEN 2048 diff --git a/share/examples/isdn/i4brunppp/i4brunppp.c b/share/examples/isdn/i4brunppp/i4brunppp.c index 7d1fe3cd51dc..3c8b6e76e243 100644 --- a/share/examples/isdn/i4brunppp/i4brunppp.c +++ b/share/examples/isdn/i4brunppp/i4brunppp.c @@ -59,8 +59,8 @@ #include #include -#include -#include +#include +#include #define I4BDEVICE "/dev/i4b" diff --git a/share/examples/isdn/v21/v21modem.c b/share/examples/isdn/v21/v21modem.c index f49eb06bf6f7..2707cdb392b5 100644 --- a/share/examples/isdn/v21/v21modem.c +++ b/share/examples/isdn/v21/v21modem.c @@ -25,7 +25,7 @@ #include #include -#include +#include static void create_session(void); static void input_byte(int byte, int stopbit); diff --git a/usr.sbin/i4b/g711conv/g711conv.c b/usr.sbin/i4b/g711conv/g711conv.c index f8087c0469ed..f158a9d2e34c 100644 --- a/usr.sbin/i4b/g711conv/g711conv.c +++ b/usr.sbin/i4b/g711conv/g711conv.c @@ -76,7 +76,7 @@ #include #include #include -#include +#include /* copy from CCITT G.711 specifications */ diff --git a/usr.sbin/i4b/isdnd/isdnd.8 b/usr.sbin/i4b/isdnd/isdnd.8 index 60e00b300e16..b3c749a7aed5 100644 --- 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 diff --git a/usr.sbin/i4b/isdnd/isdnd.h b/usr.sbin/i4b/isdnd/isdnd.h index 2dbed37310e2..4e65bfe6efec 100644 --- a/usr.sbin/i4b/isdnd/isdnd.h +++ b/usr.sbin/i4b/isdnd/isdnd.h @@ -68,8 +68,8 @@ #include -#include -#include +#include +#include #include "config.h" /* compile time configuration */ #include "pathnames.h" /* location of files */ diff --git a/usr.sbin/i4b/isdndebug/main.c b/usr.sbin/i4b/isdndebug/main.c index caa38abf5375..3586173b6255 100644 --- a/usr.sbin/i4b/isdndebug/main.c +++ b/usr.sbin/i4b/isdndebug/main.c @@ -47,8 +47,8 @@ #include #include -#include -#include +#include +#include char *bin_str(unsigned long val, int length); diff --git a/usr.sbin/i4b/isdndecode/decode.h b/usr.sbin/i4b/isdndecode/decode.h index 83bab000165b..7eb544b8bbcc 100644 --- a/usr.sbin/i4b/isdndecode/decode.h +++ b/usr.sbin/i4b/isdndecode/decode.h @@ -50,8 +50,8 @@ #include #include -#include -#include +#include +#include #include "pcause.h" diff --git a/usr.sbin/i4b/isdnmonitor/monprivate.h b/usr.sbin/i4b/isdnmonitor/monprivate.h index ec6ec4d04ae1..d6763449c898 100644 --- 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 +#include #else diff --git a/usr.sbin/i4b/isdnphone/defs.h b/usr.sbin/i4b/isdnphone/defs.h index 18da037afe90..fade94b40c57 100644 --- a/usr.sbin/i4b/isdnphone/defs.h +++ b/usr.sbin/i4b/isdnphone/defs.h @@ -54,8 +54,8 @@ #include #include -#include -#include +#include +#include /* device file prefixes */ diff --git a/usr.sbin/i4b/isdntel/defs.h b/usr.sbin/i4b/isdntel/defs.h index 9b5fd694c69b..0d8d38652b93 100644 --- a/usr.sbin/i4b/isdntel/defs.h +++ b/usr.sbin/i4b/isdntel/defs.h @@ -53,7 +53,7 @@ #endif #include -#include +#include #define GOOD 0 #define ERROR (-1) diff --git a/usr.sbin/i4b/isdntelctl/main.c b/usr.sbin/i4b/isdntelctl/main.c index 3b11e5d1ed4c..0e9c8ff2cfa8 100644 --- a/usr.sbin/i4b/isdntelctl/main.c +++ b/usr.sbin/i4b/isdntelctl/main.c @@ -50,8 +50,8 @@ #include #include -#include -#include +#include +#include static void usage ( void ); diff --git a/usr.sbin/i4b/isdntest/main.c b/usr.sbin/i4b/isdntest/main.c index 2bb2b2499693..08c7b896f051 100644 --- a/usr.sbin/i4b/isdntest/main.c +++ b/usr.sbin/i4b/isdntest/main.c @@ -49,8 +49,8 @@ #include #include -#include -#include +#include +#include static void kbdrdhdl ( void ); static void isdnrdhdl (int isdnfd ); diff --git a/usr.sbin/i4b/isdntrace/trace.h b/usr.sbin/i4b/isdntrace/trace.h index 81fa415f9df2..95c68618b272 100644 --- a/usr.sbin/i4b/isdntrace/trace.h +++ b/usr.sbin/i4b/isdntrace/trace.h @@ -59,8 +59,8 @@ #include #include -#include -#include +#include +#include #include "pcause_1tr6.h" /* obsolete german national ISDN */ #include "pcause_q850.h" diff --git a/usr.sbin/i4b/man/i4b.4 b/usr.sbin/i4b/man/i4b.4 index f2e031a368bb..be7b22447c7f 100644 --- 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 diff --git a/usr.sbin/ppp/i4b.c b/usr.sbin/ppp/i4b.c index 95c686fcf5c2..f07962509d25 100644 --- a/usr.sbin/ppp/i4b.c +++ b/usr.sbin/ppp/i4b.c @@ -36,10 +36,6 @@ #include #include -#ifdef __FreeBSD__ -#include -#include -#else #ifdef __NetBSD__ #include #include @@ -47,7 +43,6 @@ #include #include #endif -#endif #include #include #include