[svn-commits] trunk r1172 - /trunk/
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Sat Jun 24 12:35:33 MST 2006
Author: kpfleming
Date: Sat Jun 24 14:35:33 2006
New Revision: 1172
URL: http://svn.digium.com/view/zaptel?rev=1172&view=rev
Log:
install zaptel.h and tonezone.h into /usr/include, not /usr/include/linux, sinc e they are used much more by userspace apps than by kernel modules
remove any old copies of those headers
remove README.udev, since it no longer applies
Removed:
trunk/README.udev
Modified:
trunk/Makefile
trunk/fxotune.c
trunk/fxsdump.c
trunk/hdlcstress.c
trunk/hdlctest.c
trunk/patgen.c
trunk/patlooptest.c
trunk/pattest.c
trunk/pciradio.c
trunk/timertest.c
trunk/tonezone.h
trunk/tor2.c
trunk/torisa.c
trunk/usbfxstest.c
trunk/wcfxo.c
trunk/wcfxsusb.c
trunk/wct1xxp.c
trunk/wct4xxp_base.c
trunk/wctdm.c
trunk/wctdm24xxp.c
trunk/wcte11xp.c
trunk/wcusb.c
trunk/zaptel.c
trunk/ztd-eth.c
trunk/ztd-loc.c
trunk/ztdiag.c
trunk/ztdummy.c
trunk/ztdynamic.c
trunk/ztmonitor.c
trunk/zttool.c
trunk/zttranscode.c
Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?rev=1172&r1=1171&r2=1172&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Sat Jun 24 14:35:33 2006
@@ -370,8 +370,10 @@
ln -sf $(LIBTONEZONE_SO).$(LIBTONEZONE_SO_MAJOR_VER).$(LIBTONEZONE_SO_MINOR_VER) \
$(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO)
if [ -x /usr/sbin/sestatus ] && (/usr/sbin/sestatus | grep "SELinux status:" | grep -q "enabled") ; then restorecon -v $(INSTALL_PREFIX)/usr/lib/$(LIBTONEZONE_SO); fi
- install -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/linux/zaptel.h
- install -D -m 644 torisa.h $(INSTALL_PREFIX)/usr/include/linux/torisa.h
+ install -D -m 644 zaptel.h $(INSTALL_PREFIX)/usr/include/zaptel.h
+ install -D -m 644 torisa.h $(INSTALL_PREFIX)/usr/include/torisa.h
+ rm -f $(INSTALL_PREFIX)/usr/include/linux/zaptel.h
+ rm -f $(INSTALL_PREFIX)/usr/include/linux/torisa.h
install -D -m 644 tonezone.h $(INSTALL_PREFIX)/usr/include/tonezone.h
install -m 644 doc/ztcfg.8 $(INSTALL_PREFIX)/usr/share/man/man8
install -m 644 doc/zttool.8 $(INSTALL_PREFIX)/usr/share/man/man8
Modified: trunk/fxotune.c
URL: http://svn.digium.com/view/zaptel/trunk/fxotune.c?rev=1172&r1=1171&r2=1172&view=diff
==============================================================================
--- trunk/fxotune.c (original)
+++ trunk/fxotune.c Sat Jun 24 14:35:33 2006
@@ -26,7 +26,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif
#include "wctdm.h"
#include "fxotune.h"
Modified: trunk/fxsdump.c
URL: http://svn.digium.com/view/zaptel/trunk/fxsdump.c?rev=1172&r1=1171&r2=1172&view=diff
==============================================================================
--- trunk/fxsdump.c (original)
+++ trunk/fxsdump.c Sat Jun 24 14:35:33 2006
@@ -11,7 +11,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif
#include "coeffs.h"
Modified: trunk/hdlcstress.c
URL: http://svn.digium.com/view/zaptel/trunk/hdlcstress.c?rev=1172&r1=1171&r2=1172&view=diff
==============================================================================
--- trunk/hdlcstress.c (original)
+++ trunk/hdlcstress.c Sat Jun 24 14:35:33 2006
@@ -2,7 +2,7 @@
#include <fcntl.h>
#include <string.h>
#include <errno.h>
-#include <linux/zaptel.h>
+#include <zaptel.h>
#include <stdio.h>
#include <linux/types.h>
#include <linux/ppp_defs.h>
Modified: trunk/hdlctest.c
URL: http://svn.digium.com/view/zaptel/trunk/hdlctest.c?rev=1172&r1=1171&r2=1172&view=diff
==============================================================================
--- trunk/hdlctest.c (original)
+++ trunk/hdlctest.c Sat Jun 24 14:35:33 2006
@@ -2,7 +2,7 @@
#include <fcntl.h>
#include <string.h>
#include <errno.h>
-#include <linux/zaptel.h>
+#include <zaptel.h>
#include <stdio.h>
#include <linux/types.h>
#include <linux/ppp_defs.h>
Modified: trunk/patgen.c
URL: http://svn.digium.com/view/zaptel/trunk/patgen.c?rev=1172&r1=1171&r2=1172&view=diff
==============================================================================
--- trunk/patgen.c (original)
+++ trunk/patgen.c Sat Jun 24 14:35:33 2006
@@ -13,7 +13,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif
/* #define BLOCK_SIZE 2048 */
Modified: trunk/patlooptest.c
URL: http://svn.digium.com/view/zaptel/trunk/patlooptest.c?rev=1172&r1=1171&r2=1172&view=diff
==============================================================================
--- trunk/patlooptest.c (original)
+++ trunk/patlooptest.c Sat Jun 24 14:35:33 2006
@@ -13,7 +13,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif
#define BLOCK_SIZE 2039
Modified: trunk/pattest.c
URL: http://svn.digium.com/view/zaptel/trunk/pattest.c?rev=1172&r1=1171&r2=1172&view=diff
==============================================================================
--- trunk/pattest.c (original)
+++ trunk/pattest.c Sat Jun 24 14:35:33 2006
@@ -13,7 +13,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif
#define BLOCK_SIZE 2039
Modified: trunk/pciradio.c
URL: http://svn.digium.com/view/zaptel/trunk/pciradio.c?rev=1172&r1=1171&r2=1172&view=diff
==============================================================================
--- trunk/pciradio.c (original)
+++ trunk/pciradio.c Sat Jun 24 14:35:33 2006
@@ -56,7 +56,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif
#define RAD_MAX_IFACES 128
Modified: trunk/timertest.c
URL: http://svn.digium.com/view/zaptel/trunk/timertest.c?rev=1172&r1=1171&r2=1172&view=diff
==============================================================================
--- trunk/timertest.c (original)
+++ trunk/timertest.c Sat Jun 24 14:35:33 2006
@@ -11,7 +11,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif
int main(int argc, char *argv[])
Modified: trunk/tonezone.h
URL: http://svn.digium.com/view/zaptel/trunk/tonezone.h?rev=1172&r1=1171&r2=1172&view=diff
==============================================================================
--- trunk/tonezone.h (original)
+++ trunk/tonezone.h Sat Jun 24 14:35:33 2006
@@ -23,11 +23,8 @@
#ifndef _TONEZONE_H
#define _TONEZONE_H
-#ifdef BUILDING_TONEZONE
-#include "zaptel.h"
-#else
-#include <linux/zaptel.h>
-#endif
+
+#include <zaptel.h>
struct tone_zone_sound {
int toneid;
Modified: trunk/tor2.c
URL: http://svn.digium.com/view/zaptel/trunk/tor2.c?rev=1172&r1=1171&r2=1172&view=diff
==============================================================================
--- trunk/tor2.c (original)
+++ trunk/tor2.c Sat Jun 24 14:35:33 2006
@@ -37,7 +37,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif
#ifdef LINUX26
#include <linux/moduleparam.h>
Modified: trunk/torisa.c
URL: http://svn.digium.com/view/zaptel/trunk/torisa.c?rev=1172&r1=1171&r2=1172&view=diff
==============================================================================
--- trunk/torisa.c (original)
+++ trunk/torisa.c Sat Jun 24 14:35:33 2006
@@ -33,7 +33,7 @@
#include "zaptel.h"
#include "torisa.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#include <linux/torisa.h>
#endif
#ifdef LINUX26
Modified: trunk/usbfxstest.c
URL: http://svn.digium.com/view/zaptel/trunk/usbfxstest.c?rev=1172&r1=1171&r2=1172&view=diff
==============================================================================
--- trunk/usbfxstest.c (original)
+++ trunk/usbfxstest.c Sat Jun 24 14:35:33 2006
@@ -6,7 +6,7 @@
#include <unistd.h>
#include <sys/ioctl.h>
#include "zap.h"
-#include <linux/zaptel.h>
+#include <zaptel.h>
int main(int argc, char *argv[])
{
Modified: trunk/wcfxo.c
URL: http://svn.digium.com/view/zaptel/trunk/wcfxo.c?rev=1172&r1=1171&r2=1172&view=diff
==============================================================================
--- trunk/wcfxo.c (original)
+++ trunk/wcfxo.c Sat Jun 24 14:35:33 2006
@@ -35,7 +35,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif
#ifdef LINUX26
#include <linux/moduleparam.h>
Modified: trunk/wcfxsusb.c
URL: http://svn.digium.com/view/zaptel/trunk/wcfxsusb.c?rev=1172&r1=1171&r2=1172&view=diff
==============================================================================
--- trunk/wcfxsusb.c (original)
+++ trunk/wcfxsusb.c Sat Jun 24 14:35:33 2006
@@ -48,7 +48,7 @@
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif /* STANDALONE_ZAPATA */
#include "wcfxsusb.h"
Modified: trunk/wct1xxp.c
URL: http://svn.digium.com/view/zaptel/trunk/wct1xxp.c?rev=1172&r1=1171&r2=1172&view=diff
==============================================================================
--- trunk/wct1xxp.c (original)
+++ trunk/wct1xxp.c Sat Jun 24 14:35:33 2006
@@ -37,7 +37,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif
#ifdef LINUX26
#include <linux/moduleparam.h>
Modified: trunk/wct4xxp_base.c
URL: http://svn.digium.com/view/zaptel/trunk/wct4xxp_base.c?rev=1172&r1=1171&r2=1172&view=diff
==============================================================================
--- trunk/wct4xxp_base.c (original)
+++ trunk/wct4xxp_base.c Sat Jun 24 14:35:33 2006
@@ -38,7 +38,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif
#ifdef LINUX26
#include <linux/moduleparam.h>
Modified: trunk/wctdm.c
URL: http://svn.digium.com/view/zaptel/trunk/wctdm.c?rev=1172&r1=1171&r2=1172&view=diff
==============================================================================
--- trunk/wctdm.c (original)
+++ trunk/wctdm.c Sat Jun 24 14:35:33 2006
@@ -204,7 +204,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif
#ifdef LINUX26
Modified: trunk/wctdm24xxp.c
URL: http://svn.digium.com/view/zaptel/trunk/wctdm24xxp.c?rev=1172&r1=1171&r2=1172&view=diff
==============================================================================
--- trunk/wctdm24xxp.c (original)
+++ trunk/wctdm24xxp.c Sat Jun 24 14:35:33 2006
@@ -231,7 +231,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif
#ifdef LINUX26
Modified: trunk/wcte11xp.c
URL: http://svn.digium.com/view/zaptel/trunk/wcte11xp.c?rev=1172&r1=1171&r2=1172&view=diff
==============================================================================
--- trunk/wcte11xp.c (original)
+++ trunk/wcte11xp.c Sat Jun 24 14:35:33 2006
@@ -37,7 +37,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif
#ifdef LINUX26
#include <linux/moduleparam.h>
Modified: trunk/wcusb.c
URL: http://svn.digium.com/view/zaptel/trunk/wcusb.c?rev=1172&r1=1171&r2=1172&view=diff
==============================================================================
--- trunk/wcusb.c (original)
+++ trunk/wcusb.c Sat Jun 24 14:35:33 2006
@@ -48,7 +48,7 @@
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif /* STANDALONE_ZAPATA */
#include "wcusb.h"
Modified: trunk/zaptel.c
URL: http://svn.digium.com/view/zaptel/trunk/zaptel.c?rev=1172&r1=1171&r2=1172&view=diff
==============================================================================
--- trunk/zaptel.c (original)
+++ trunk/zaptel.c Sat Jun 24 14:35:33 2006
@@ -82,7 +82,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif
#ifdef LINUX26
Modified: trunk/ztd-eth.c
URL: http://svn.digium.com/view/zaptel/trunk/ztd-eth.c?rev=1172&r1=1171&r2=1172&view=diff
==============================================================================
--- trunk/ztd-eth.c (original)
+++ trunk/ztd-eth.c Sat Jun 24 14:35:33 2006
@@ -39,7 +39,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif
#define ETH_P_ZTDETH 0xd00d
Modified: trunk/ztd-loc.c
URL: http://svn.digium.com/view/zaptel/trunk/ztd-loc.c?rev=1172&r1=1171&r2=1172&view=diff
==============================================================================
--- trunk/ztd-loc.c (original)
+++ trunk/ztd-loc.c Sat Jun 24 14:35:33 2006
@@ -63,7 +63,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif
#ifdef DEFINE_SPINLOCK
Modified: trunk/ztdiag.c
URL: http://svn.digium.com/view/zaptel/trunk/ztdiag.c?rev=1172&r1=1171&r2=1172&view=diff
==============================================================================
--- trunk/ztdiag.c (original)
+++ trunk/ztdiag.c Sat Jun 24 14:35:33 2006
@@ -7,7 +7,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif
int main(int argc, char *argv[])
Modified: trunk/ztdummy.c
URL: http://svn.digium.com/view/zaptel/trunk/ztdummy.c?rev=1172&r1=1171&r2=1172&view=diff
==============================================================================
--- trunk/ztdummy.c (original)
+++ trunk/ztdummy.c Sat Jun 24 14:35:33 2006
@@ -62,7 +62,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif
#ifndef LINUX26
#include <linux/usb.h>
Modified: trunk/ztdynamic.c
URL: http://svn.digium.com/view/zaptel/trunk/ztdynamic.c?rev=1172&r1=1171&r2=1172&view=diff
==============================================================================
--- trunk/ztdynamic.c (original)
+++ trunk/ztdynamic.c Sat Jun 24 14:35:33 2006
@@ -39,7 +39,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif
#ifdef LINUX26
#include <linux/moduleparam.h>
Modified: trunk/ztmonitor.c
URL: http://svn.digium.com/view/zaptel/trunk/ztmonitor.c?rev=1172&r1=1171&r2=1172&view=diff
==============================================================================
--- trunk/ztmonitor.c (original)
+++ trunk/ztmonitor.c Sat Jun 24 14:35:33 2006
@@ -42,7 +42,7 @@
#include "zaptel.h"
#include "tonezone.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#include <tonezone.h>
#endif
#include <linux/soundcard.h>
Modified: trunk/zttool.c
URL: http://svn.digium.com/view/zaptel/trunk/zttool.c?rev=1172&r1=1171&r2=1172&view=diff
==============================================================================
--- trunk/zttool.c (original)
+++ trunk/zttool.c Sat Jun 24 14:35:33 2006
@@ -42,7 +42,7 @@
#include "zaptel.h"
#include "tonezone.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#include <tonezone.h>
#endif
Modified: trunk/zttranscode.c
URL: http://svn.digium.com/view/zaptel/trunk/zttranscode.c?rev=1172&r1=1171&r2=1172&view=diff
==============================================================================
--- trunk/zttranscode.c (original)
+++ trunk/zttranscode.c Sat Jun 24 14:35:33 2006
@@ -40,7 +40,7 @@
#ifdef STANDALONE_ZAPATA
#include "zaptel.h"
#else
-#include <linux/zaptel.h>
+#include <zaptel.h>
#endif
#ifdef LINUX26
#include <linux/moduleparam.h>
More information about the svn-commits
mailing list