diff options
| author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-01-31 23:34:05 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-01-31 23:34:05 +0000 |
| commit | 7976f3ed8ba610c565d4cd80a7f8c0643005de49 (patch) | |
| tree | 903e6dcecf149d96b922985ebbd41c92aee7fec3 | |
| parent | 4d708618286baedaa9d01c13dfc6021d9e5c49ec (diff) | |
clean up wctc4xxp directory during 'make clean'
adjust zt_transcoder_hdr padding to account for removed fields
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@2073 5390a7c7-147a-4af0-8ec9-7488f05a26cb
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | wctc4xxp/Makefile | 3 | ||||
| -rw-r--r-- | wctc4xxp/codec_test.c | 2 | ||||
| -rw-r--r-- | zaptel.h | 2 |
4 files changed, 5 insertions, 5 deletions
@@ -414,12 +414,9 @@ clean: 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* diff --git a/wctc4xxp/Makefile b/wctc4xxp/Makefile index 51770a9..d5d75f1 100644 --- a/wctc4xxp/Makefile +++ b/wctc4xxp/Makefile @@ -8,3 +8,6 @@ tests: codec_test codec_test: codec_test.c ../zaptel.h $(CC) -o $@ $< $(CFLAGS) + +clean: + rm -rf codec_test diff --git a/wctc4xxp/codec_test.c b/wctc4xxp/codec_test.c index 4117007..287979d 100644 --- a/wctc4xxp/codec_test.c +++ b/wctc4xxp/codec_test.c @@ -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 @@ -744,7 +744,7 @@ struct zt_transcode_header { __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 */ }; |