[zaptel-commits] kpfleming: branch 1.2 r2073 - in /branches/1.2: ./ wctc4xxp/

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Wed Jan 31 17:34:05 2007
New Revision: 2073

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2073
Log:
clean up wctc4xxp directory during 'make clean'
adjust zt_transcoder_hdr padding to account for removed fields

Modified:
    branches/1.2/Makefile
    branches/1.2/wctc4xxp/Makefile
    branches/1.2/wctc4xxp/codec_test.c
    branches/1.2/zaptel.h

Modified: branches/1.2/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.2/Makefile?view=diff&rev=2073&r1=2072&r2=2073
==============================================================================
--- branches/1.2/Makefile (original)
+++ branches/1.2/Makefile Wed Jan 31 17:34:05 2007
@@ -414,12 +414,9 @@
 	rm -f patgen pattest patlooptest hdlcstress hdlctest hdlcgen hdlcverify timertest
 	rm -f *.o ztcfg tzdriver sethdlc sethdlc-new
 	rm -f $(TZOBJS) $(LIBTONEZONE_SO) *.lo
-ifeq ($(BUILDVER),linux26)
 	$(MAKE) -C $(KSRC) SUBDIRS=$(PWD) clean
-else
 	$(MAKE) -C wct4xxp clean
 	$(MAKE) -C wctc4xxp clean
-endif
 	rm -rf .tmp_versions
 	rm -f gendigits tones.h
 	rm -f libtonezone*

Modified: branches/1.2/wctc4xxp/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.2/wctc4xxp/Makefile?view=diff&rev=2073&r1=2072&r2=2073
==============================================================================
--- branches/1.2/wctc4xxp/Makefile (original)
+++ branches/1.2/wctc4xxp/Makefile Wed Jan 31 17:34:05 2007
@@ -8,3 +8,6 @@
 
 codec_test: codec_test.c ../zaptel.h
 	$(CC) -o $@ $< $(CFLAGS)
+
+clean:
+	rm -rf codec_test

Modified: branches/1.2/wctc4xxp/codec_test.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/wctc4xxp/codec_test.c?view=diff&rev=2073&r1=2072&r2=2073
==============================================================================
--- branches/1.2/wctc4xxp/codec_test.c (original)
+++ branches/1.2/wctc4xxp/codec_test.c Wed Jan 31 17:34:05 2007
@@ -36,7 +36,7 @@
 #include <sys/mman.h>
 #include <unistd.h>
 #ifdef STANDALONE_ZAPATA
-#include "../zaptel.h"
+#include "zaptel.h"
 #else
 #include <linux/zaptel.h>
 #endif

Modified: branches/1.2/zaptel.h
URL: http://svn.digium.com/view/zaptel/branches/1.2/zaptel.h?view=diff&rev=2073&r1=2072&r2=2073
==============================================================================
--- branches/1.2/zaptel.h (original)
+++ branches/1.2/zaptel.h Wed Jan 31 17:34:05 2007
@@ -744,7 +744,7 @@
 	__u32 magic;		/* Magic value -- ZT_TRANSCODE_MAGIC, read by user */
 	__u32 config;		/* Read/write by user */
 	__u32 busy:1;		/* Read/write by user */
-	__u8 userhdr[ZT_TRANSCODE_HDRLEN - (sizeof(__u32) * 14)];	/* Storage for user parameters */
+	__u8 userhdr[ZT_TRANSCODE_HDRLEN - (sizeof(__u32) * 10)];	/* Storage for user parameters */
 	__u8 srcdata[ZT_TRANSCODE_BUFSIZ / 2];	/* Storage of source data */
 	__u8 dstdata[ZT_TRANSCODE_BUFSIZ / 2];	/* Storage of destination data */
 };