[zaptel-commits] kpfleming: branch group/new_octasic_build r1351 - in /team/group/new_octasic_...

zaptel-commits at lists.digium.com zaptel-commits at lists.digium.com
Fri Aug 25 17:20:07 MST 2006


Author: kpfleming
Date: Fri Aug 25 19:20:07 2006
New Revision: 1351

URL: http://svn.digium.com/view/zaptel?rev=1351&view=rev
Log:
update to current branch and initialize merge tracking

Modified:
    team/group/new_octasic_build/   (props changed)
    team/group/new_octasic_build/Makefile
    team/group/new_octasic_build/fxotune.c
    team/group/new_octasic_build/wct4xxp/base.c
    team/group/new_octasic_build/zaptel.c
    team/group/new_octasic_build/zaptel.init

Propchange: team/group/new_octasic_build/
------------------------------------------------------------------------------
    svnmerge-integrated = /branches/1.2:1-1350

Modified: team/group/new_octasic_build/Makefile
URL: http://svn.digium.com/view/zaptel/team/group/new_octasic_build/Makefile?rev=1351&r1=1350&r2=1351&view=diff
==============================================================================
--- team/group/new_octasic_build/Makefile (original)
+++ team/group/new_octasic_build/Makefile Fri Aug 25 19:20:07 2006
@@ -7,9 +7,8 @@
 
 
 HOSTCC=gcc
-ifeq ($(PWD),)
 PWD:=$(shell pwd)
-endif
+
 # If you want to build for a kernel other than the current kernel, set KVERS
 ifndef KVERS
 KVERS:=$(shell uname -r)
@@ -178,7 +177,7 @@
 	$(CC) $(KFLAGS) -o $@ -c $<
 
 vpm450m.o: vpm450m.c zaptel.h
-	$(CC) $(KFLAGS) -I$(SUBDIRS)/include  -I$(SUBDIRS)/include/oct6100api -o $@ -c $<
+	$(CC) $(KFLAGS) -I$(PWD)/include -I$(PWD)/include/oct6100api -I$(SUBDIRS)/include -I$(SUBDIRS)/include/oct6100api -o $@ -c $<
 
 wct4xxp.o: wct4xxp_base.o vpm450m.o
 	$(LD) -r -o $@ wct4xxp_base.o vpm450m.o
@@ -315,6 +314,15 @@
   endif
 endif
 
+b410p:
+	@wget -V >/dev/null || (echo "You need wget in order to install the drivers" ; false)
+	[ -f misdn-b410p.tar.bz ] || wget ftp://ftp.digium.com/pub/zaptel/b410p/misdn-b410p.tar.gz
+	tar -zxf misdn-b410p.tar.gz
+	$(MAKE) -C misdn install
+	[ -f mISDNuser.tar.gz ] || wget ftp://ftp.digium.com/pub/zaptel/b410p/mISDNuser.tar.gz
+	tar -zxf mISDNuser.tar.gz
+	$(MAKE) -C mISDNuser install
+
 install: all devices firmware
 	install -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg
 	if [ -f sethdlc-new ]; then \

Modified: team/group/new_octasic_build/fxotune.c
URL: http://svn.digium.com/view/zaptel/team/group/new_octasic_build/fxotune.c?rev=1351&r1=1350&r2=1351&view=diff
==============================================================================
--- team/group/new_octasic_build/fxotune.c (original)
+++ team/group/new_octasic_build/fxotune.c Fri Aug 25 19:20:07 2006
@@ -49,6 +49,7 @@
 static short outbuf[TEST_DURATION];
 static int debug = 0;
 
+static FILE *outfile = NULL;
 
 /* Generates a tone of hz frequency.  Index is the current sample
  * to begenerated.  For a normal waveform you need to increment
@@ -128,13 +129,10 @@
 	struct wctdm_echo_coefs coefs;
 	short inbuf[BUFFER_LENGTH]; 
 	int lowest = 0;
-	FILE *outfile = NULL;
 	float acim_results[16];
 
-
-	if (debug) {
-		outfile = fopen("fxotune.vals", "w");
-		if (!outfile) {
+	if (debug && !outfile) {
+		if (!(outfile = fopen("fxotune.vals", "w"))) {
 			fprintf(stdout, "Cannot create fxotune.vals\n");
 			return -1;
 		}
@@ -243,7 +241,8 @@
 			/* calculate power of response */
 			
 			freq_results[(freq/200)-1] = power_of(inbuf+SKIP_BYTES, BUFFER_LENGTH-SKIP_BYTES, 1);
-			if (debug) fprintf(outfile, "%d,%d,%f\n", acim, freq, freq_results[(freq/200)-1]);
+			if (debug) 
+				fprintf(outfile, "%d,%d,%f\n", acim, freq, freq_results[(freq/200)-1]);
 		}
 		acim_results[acim] = power_of(freq_results, 15, 0);
 	}

Modified: team/group/new_octasic_build/wct4xxp/base.c
URL: http://svn.digium.com/view/zaptel/team/group/new_octasic_build/wct4xxp/base.c?rev=1351&r1=1350&r2=1351&view=diff
==============================================================================
--- team/group/new_octasic_build/wct4xxp/base.c (original)
+++ team/group/new_octasic_build/wct4xxp/base.c Fri Aug 25 19:20:07 2006
@@ -57,6 +57,8 @@
  * you are more concerned with the performance of your machine, enable the
  * tasklets.  If you are strict about absolutely no drops, then do not enable
  * tasklets.
+ *
+ * XXX THIS IS NOT CURRENTLY IMPLEMENTED FOR THIS MODULE.  FOR NOW, DO NOT USE!
  */
 
 /* #define ENABLE_TASKLETS */
@@ -2724,7 +2726,7 @@
 	release_firmware(firmware);
 #endif
 	wc->vpm = T4_VPM_PRESENT;
-	printk("VPM450: Present and operational servicing %d span(s)\n", vpmspans);
+	printk("VPM450: Present and operational servicing %d span(s)\n", wc->numspans);
 }
 
 static void t4_vpm400_init(struct t4 *wc)
@@ -2859,7 +2861,7 @@
 			t4_vpm_out(wc, x, i, (x < 4) ? 0x55 : 0xAA);
 
 	} 
-	printk("VPM400%s: Present and operational servicing %d span(s)\n", (gen2vpm ? "(2nd Gen)" : ""), vpmspans);
+	printk("VPM400%s: Present and operational servicing %d span(s)\n", (gen2vpm ? "(2nd Gen)" : ""), wc->numspans);
 	wc->vpm = T4_VPM_PRESENT;
 }
 

Modified: team/group/new_octasic_build/zaptel.c
URL: http://svn.digium.com/view/zaptel/team/group/new_octasic_build/zaptel.c?rev=1351&r1=1350&r2=1351&view=diff
==============================================================================
--- team/group/new_octasic_build/zaptel.c (original)
+++ team/group/new_octasic_build/zaptel.c Fri Aug 25 19:20:07 2006
@@ -2592,6 +2592,8 @@
 					return;
 				}
 			} else {
+		case 'w':
+		case 'W':
 				chan->curtone = zt_dtmf_tone(c, (chan->digitmode == DIGIT_MODE_MFV1)); 
 				chan->tonep = 0;
 				/* All done */

Modified: team/group/new_octasic_build/zaptel.init
URL: http://svn.digium.com/view/zaptel/team/group/new_octasic_build/zaptel.init?rev=1351&r1=1350&r2=1351&view=diff
==============================================================================
--- team/group/new_octasic_build/zaptel.init (original)
+++ team/group/new_octasic_build/zaptel.init Fri Aug 25 19:20:07 2006
@@ -26,8 +26,10 @@
 # Source zaptel configuration.
 if [ $system = debian ]; then
     [ -f /etc/default/zaptel ] && . /etc/default/zaptel
+	LOCKFILE=/var/lock/zaptel
 elif [ $system = redhat ]; then
     [ -f /etc/sysconfig/zaptel ] && . /etc/sysconfig/zaptel
+	LOCKFILE=/var/lock/subsys/zaptel
 fi
 
 if [ -z "${MODULES}" ]; then 
@@ -57,7 +59,7 @@
 # See how we were called.
 case "$1" in
   start)
-        # Load drivers
+	# Load drivers
 	rmmod wcusb >& /dev/null
 	rmmod wcfxsusb >& /dev/null
 	rmmod audio >& /dev/null
@@ -99,11 +101,11 @@
 	fi
 	RETVAL=$?
 
-        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/zaptel
-        ;;
+	[ $RETVAL -eq 0 ] && touch $LOCKFILE
+	;;
   stop)
-        # Unload drivers
-        echo -n "Unloading zaptel hardware drivers:"
+	# Unload drivers
+	echo -n "Unloading zaptel hardware drivers:"
 	for x in $RMODULES; do 
 		if rmmod ${x} >& /dev/null; then
 			echo -n " $x"
@@ -120,9 +122,9 @@
 	fi
 	RETVAL=$?
 
-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/zaptel
-        ;;
- restart)
+	[ $RETVAL -eq 0 ] && rm -f $LOCKFILE
+	;;
+  restart)
 	$0 stop
 	$0 start
 	;;
@@ -137,8 +139,8 @@
 	RETVAL=$?
 	;;
   *)
-        echo "Usage: zaptel {start|stop|restart|reload}"
-        exit 1
+	echo "Usage: zaptel {start|stop|restart|reload}"
+	exit 1
 esac
 
 exit $RETVAL



More information about the zaptel-commits mailing list