[zaptel-commits] sruffell: branch sruffell/zaptel-1.4-buffering r4522 - in /team/sruffell/zapt...

[SVN commits to the Zaptel project]

Author: sruffell
Date: Tue Sep  9 08:32:51 2008
New Revision: 4522

URL: http://svn.digium.com/view/zaptel?view=rev&rev=4522
Log:
- The changes to not allow the receive buffering policy to be set from
userspace, but instead keep it at immediate at all times.

- Set mISDN 1.1.8 as the default install.

- Increase the number of buffers (drivers for some of the cards on a few
  systems complain that we cannot kmalloc that much).


Modified:
    team/sruffell/zaptel-1.4-buffering/   (props changed)
    team/sruffell/zaptel-1.4-buffering/Makefile
    team/sruffell/zaptel-1.4-buffering/kernel/zaptel-base.c
    team/sruffell/zaptel-1.4-buffering/kernel/zaptel.h

Propchange: team/sruffell/zaptel-1.4-buffering/
------------------------------------------------------------------------------
    automerge = yes

Propchange: team/sruffell/zaptel-1.4-buffering/
------------------------------------------------------------------------------
    svnmerge-integrated = /branches/1.4:1-4520

Modified: team/sruffell/zaptel-1.4-buffering/Makefile
URL: http://svn.digium.com/view/zaptel/team/sruffell/zaptel-1.4-buffering/Makefile?view=diff&rev=4522&r1=4521&r2=4522
==============================================================================
--- team/sruffell/zaptel-1.4-buffering/Makefile (original)
+++ team/sruffell/zaptel-1.4-buffering/Makefile Tue Sep  9 08:32:51 2008
@@ -408,8 +408,8 @@
 htmlman: $(GROFF_HTML)
 
 
-MISDNVERSION=1_1_7_2
-MISDNUSERVERSION=1_1_7_2
+MISDNVERSION=1_1_8
+MISDNUSERVERSION=1_1_8
 b410p:
 	@if test "$(DOWNLOAD)" = ":" ; then \
 		echo "**************************************************"; \

Modified: team/sruffell/zaptel-1.4-buffering/kernel/zaptel-base.c
URL: http://svn.digium.com/view/zaptel/team/sruffell/zaptel-1.4-buffering/kernel/zaptel-base.c?view=diff&rev=4522&r1=4521&r2=4522
==============================================================================
--- team/sruffell/zaptel-1.4-buffering/kernel/zaptel-base.c (original)
+++ team/sruffell/zaptel-1.4-buffering/kernel/zaptel-base.c Tue Sep  9 08:32:51 2008
@@ -34,6 +34,7 @@
  * this program for more details.
  */
 
+#define HERE() printk(KERN_DEBUG "HERE: %s:%d\n", __FILE__, __LINE__);
 #include "zconfig.h"
 #include "../version.h"
 
@@ -4186,7 +4187,7 @@
 			return -EINVAL;
 		if (stack.bi.bufsize * stack.bi.numbufs > ZT_MAX_BUF_SPACE)
 			return -EINVAL;
-		chan->rxbufpolicy = stack.bi.rxbufpolicy & 0x1;
+		chan->rxbufpolicy = ZT_POLICY_IMMEDIATE;
 		chan->txbufpolicy = stack.bi.txbufpolicy & 0x1;
 		if ((rv = zt_reallocbufs(chan,  stack.bi.bufsize, stack.bi.numbufs)))
 			return (rv);
@@ -6466,6 +6467,8 @@
 				echo_can_free(ms->ec);
 				ms->ec = NULL;
 				break;
+			} else {
+				HERE();
 			}
 		}
 	}

Modified: team/sruffell/zaptel-1.4-buffering/kernel/zaptel.h
URL: http://svn.digium.com/view/zaptel/team/sruffell/zaptel-1.4-buffering/kernel/zaptel.h?view=diff&rev=4522&r1=4521&r2=4522
==============================================================================
--- team/sruffell/zaptel-1.4-buffering/kernel/zaptel.h (original)
+++ team/sruffell/zaptel-1.4-buffering/kernel/zaptel.h Tue Sep  9 08:32:51 2008
@@ -176,7 +176,7 @@
 
 #define ZT_MAX_BLOCKSIZE 	 8192
 #define ZT_DEFAULT_NUM_BUFS	 2
-#define ZT_MAX_NUM_BUFS		 32
+#define ZT_MAX_NUM_BUFS		 128
 #define ZT_MAX_BUF_SPACE         32768
 
 #define ZT_DEFAULT_BLOCKSIZE 1024