bkruse: branch asterisknow r1334 - in /branches/asterisknow: ./ tools/

[SVN commits to the Asterisk-GUI project]

Author: bkruse
Date: Tue Aug 14 17:03:40 2007
New Revision: 1334

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=1334
Log:
Merged revisions 1332 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-gui/branches/1.4

........
r1332 | bkruse | 2007-08-14 16:56:16 -0500 (Tue, 14 Aug 2007) | 1 line

Initial tool (ztscan) to scan for digital cards. Outputs to file /etc/asterisk/ztscan.conf to be read in and parsed by the GUI. This is still in BETA, but works pretty well. Pari and I will be working on the GUI aspect of this throughout the week. The tool uses /dev/zap/ctl (ioctl) to get span information for each span. Todo: use ZT_GET_PARAMS instead of ZT_SPAN_INFO to get the lbo/framing/coding etc. ztcfg does this, but that is because its setting the arguments with ZT_SET_PARAM, not retreiving them. Other than that, works great. The config file will tell the gui continue=yes or continue=no depending on whether or not cards were found in the system. The tool has the ability to modprobe for drivers (but does not currently do so) since that is up to the OS. The config file also has the current alarm of the span, the total spans inside the general section (for the gui, if t.fieldbyname['totalspans'] < 0, return false, etc), Description of the card, Name of the card, how many c
 hannels it has, and how many channels are currently configured.
........

Added:
    branches/asterisknow/tools/ztscan.c
      - copied unchanged from r1332, branches/1.4/tools/ztscan.c
Modified:
    branches/asterisknow/   (props changed)
    branches/asterisknow/tools/Makefile

Propchange: branches/asterisknow/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Aug 14 17:03:40 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-1296,1316,1326
+/branches/1.4:1-1296,1316,1326,1332

Modified: branches/asterisknow/tools/Makefile
URL: http://svn.digium.com/view/asterisk-gui/branches/asterisknow/tools/Makefile?view=diff&rev=1334&r1=1333&r2=1334
==============================================================================
--- branches/asterisknow/tools/Makefile (original)
+++ branches/asterisknow/tools/Makefile Tue Aug 14 17:03:40 2007
@@ -9,9 +9,11 @@
 #
 # This program is free software, distributed under the terms of
 # the GNU General Public License
+#
+# Added support for ztscan 8/8/07 - Brandon Kruse <bkruse at digium.com>
 
 ifeq ($(PBX_ZAPTEL),1)
-TOOLS:=zapscan.bin
+TOOLS:=zapscan.bin ztscan
 endif
 
 all: $(TOOLS)
@@ -19,7 +21,13 @@
 zapscan.bin: zapscan.o
 	$(CC) -o $@ $^
 
+ztscan.bin: ztscan.o
+	$(CC) -o $@ $^
+
 zapscan.o: CFLAGS+=$(ZAPTEL_INCLUDE) $(ASTCFLAGS)
+
+ztscan.o: CFLAGS+=$(ZAPTEL_INCLUDE) $(ASTCFLAGS)
+
 
 install:
 ifeq ($(PBX_ZAPTEL),1)
@@ -28,10 +36,14 @@
 	$(INSTALL) -m 755 zapscan.bin /sbin
 	$(INSTALL) -m 755 zapscan $(ASTSBINDIR)
 	$(INSTALL) -m 755 zapscan /sbin	
+	$(INSTALL) -m 755 ztscan /sbin	
+	$(INSTALL) -m 755 ztscan $(ASTSBINDIR)
+	
 endif
 
 clean: 
 	rm -f zapscan.o
 	rm -f zapscan.bin
+	rm -f ztscan
 
 .PHONY: all install clean