[zaptel-commits] kpfleming: branch mogorman/zaptel-1.2-transcoder r2036 - /team/mogorman/zapte...

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Tue Jan 30 19:22:23 2007
New Revision: 2036

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2036
Log:
fix buglets with mode parsing

Modified:
    team/mogorman/zaptel-1.2-transcoder/wctc4xxp/base.c

Modified: team/mogorman/zaptel-1.2-transcoder/wctc4xxp/base.c
URL: http://svn.digium.com/view/zaptel/team/mogorman/zaptel-1.2-transcoder/wctc4xxp/base.c?view=diff&rev=2036&r1=2035&r2=2036
==============================================================================
--- team/mogorman/zaptel-1.2-transcoder/wctc4xxp/base.c (original)
+++ team/mogorman/zaptel-1.2-transcoder/wctc4xxp/base.c Tue Jan 30 19:22:23 2007
@@ -259,7 +259,7 @@
 	unsigned int ztsnd_rtx;
 	unsigned int ztsnd_0010_rtx;
 
-	unsigned char numchannels;
+	unsigned int numchannels;
 	unsigned char complexname[40];
 
 	unsigned long iobase;
@@ -308,7 +308,7 @@
 };
 
 static int debug = 0;
-static char *mode[2] = { "g729", "g723" };
+static char *mode[2] = { "g729", "g723.1" };
 static int mode_count = 2;
 u32 debug_packets = 0;
 u32 debug_cmd_packets = 0;
@@ -1339,7 +1339,8 @@
 	struct wcdte *wc;
 	struct wcdte_desc *d = (struct wcdte_desc *) ent->driver_data;
 	int x;
-	u8 g729_numchannels, g723_numchannels, min_numchannels, firmware_ver;
+	unsigned int g729_numchannels, g723_numchannels;
+	u8 firmware_ver;
 	unsigned int complexfmts = 0;
 	struct firmware embedded_firmware;
 	const struct firmware *firmware = &embedded_firmware;
@@ -1423,7 +1424,7 @@
 	g729_numchannels = firmware->data[1];
 	g723_numchannels = firmware->data[2];
 	
-	min_numchannels = min(g723_numchannels, g729_numchannels);
+	wc->numchannels = 2048;		/* someday... */
 	
 	for (x = 0; x < mode_count; x++) {
 		if (!strcmp(mode[x], "g729") ||