diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | torisa.c | 2 | ||||
| -rw-r--r-- | torisa.h | 40 | ||||
| -rw-r--r-- | torisatool.c | 1 | ||||
| -rw-r--r-- | zaptel.h | 13 |
5 files changed, 14 insertions, 46 deletions
@@ -201,8 +201,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 wcfxsusb.o: wcfxsusb.h @@ -388,9 +386,9 @@ endif $(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 @@ -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> diff --git a/torisa.h b/torisa.h deleted file mode 100644 index c3fb9e2..0000000 --- a/torisa.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * BSD Telephony Of Mexico "Tormenta" card LINUX driver, version 1.8 4/8/01 - * - * Working with the "Tormenta ISA" Card - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Modified from original tor.c by Mark Spencer <markster@linux-support.net> - * original by Jim Dixon <jim@lambdatel.com> - */ - -#ifndef _LINUX_TORISA_H -#define _LINUX_TORISA_H - -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's */ -#define TORISA_GETDEBUG _IOW (ZT_CODE, 60, struct torisa_debug) - -#endif diff --git a/torisatool.c b/torisatool.c index f2e475e..34287ae 100644 --- a/torisatool.c +++ b/torisatool.c @@ -29,7 +29,6 @@ #include <string.h> #include <errno.h> #include "zaptel.h" -#include "torisa.h" static void usage(void) { @@ -1762,4 +1762,17 @@ struct zt_radio_param { #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 */ |