[zaptel-commits] trunk r1197 - in /trunk: Makefile torisa.c torisa.h torisatool.c zaptel.h

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Thu Jun 29 03:03:36 2006
New Revision: 1197

URL: http://svn.digium.com/view/zaptel?rev=1197&view=rev
Log:
merge torisa.h into zaptel.h
remove any installed copies of torisa.h during 'make install'

Removed:
    trunk/torisa.h
Modified:
    trunk/Makefile
    trunk/torisa.c
    trunk/torisatool.c
    trunk/zaptel.h

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?rev=1197&r1=1196&r2=1197&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Jun 29 03:03:36 2006
@@ -200,8 +200,6 @@
 tor2.o: tor2-hw.h tor2fw.h
 
 zaptel.o: digits.h arith.h sec.h mec.h sec-2.h mec2.h mec3.h zconfig.h
-
-torisa.o: torisa.h
 
 wcusb.o: wcusb.h
 
@@ -388,9 +386,9 @@
 		$(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/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
+	rm -f $(INSTALL_PREFIX)/usr/include/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/torisa.c
URL: http://svn.digium.com/view/zaptel/trunk/torisa.c?rev=1197&r1=1196&r2=1197&view=diff
==============================================================================
--- trunk/torisa.c (original)
+++ trunk/torisa.c Thu Jun 29 03:03:36 2006
@@ -31,10 +31,8 @@
 #include <asm/io.h>
 #ifdef STANDALONE_ZAPATA
 #include "zaptel.h"
-#include "torisa.h"
 #else
 #include <zaptel.h>
-#include <linux/torisa.h>
 #endif
 #ifdef LINUX26
 #include <linux/moduleparam.h>

Modified: trunk/torisatool.c
URL: http://svn.digium.com/view/zaptel/trunk/torisatool.c?rev=1197&r1=1196&r2=1197&view=diff
==============================================================================
--- trunk/torisatool.c (original)
+++ trunk/torisatool.c Thu Jun 29 03:03:36 2006
@@ -29,7 +29,6 @@
 #include <string.h>
 #include <errno.h>
 #include "zaptel.h"
-#include "torisa.h"
 
 static void usage(void)
 {

Modified: trunk/zaptel.h
URL: http://svn.digium.com/view/zaptel/trunk/zaptel.h?rev=1197&r1=1196&r2=1197&view=diff
==============================================================================
--- trunk/zaptel.h (original)
+++ trunk/zaptel.h Thu Jun 29 03:03:36 2006
@@ -1762,4 +1762,17 @@
 
 #define	ZT_RADPAR_TXGAIN 21 /* Audio (Out from system) Tx Gain */ 
 
+struct torisa_debug {
+	unsigned int txerrors;
+	unsigned int irqcount;
+	unsigned int taskletsched;
+	unsigned int taskletrun;
+	unsigned int taskletexec;
+	int span1flags;
+	int span2flags;
+};
+
+/* Special torisa ioctl */
+#define TORISA_GETDEBUG		_IOW (ZT_CODE, 60, struct torisa_debug)
+
 #endif /* _LINUX_ZAPTEL_H */