[zaptel-commits] tzafrir: branch tzafrir/move r3788 - in /team/tzafrir/move: ./ doc/ kernel/ k...

Sat Feb 2 22:24:15 CST 2008

Author: tzafrir
Date: Sat Feb  2 22:24:15 2008
New Revision: 3788

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3788
Log:
Merged revisions 3767,3775,3779,3783,3785 via svnmerge from 
http://svn.digium.com/svn/zaptel/branches/1.4
(And a manual svn merge in the kernel directory for -r3757:3786)

........
r3767 | tzafrir | 2008-01-31 00:53:33 +0200 (Thu, 31 Jan 2008) | 5 lines

Don't fail zapconf if no config file was found.

Merged revisions 3766 via svnmerge from 
http://svn.digium.com/svn/zaptel/branches/1.2

........
r3775 | mattf | 2008-02-01 00:40:42 +0200 (Fri, 01 Feb 2008) | 1 line

Fix bug so that echo cancellation actually will be disabled
........
r3779 | mattf | 2008-02-01 22:10:28 +0200 (Fri, 01 Feb 2008) | 1 line

Assume if we're disabling echo can that there are no paramters passed
........
r3783 | kpfleming | 2008-02-02 01:32:59 +0200 (Sat, 02 Feb 2008) | 2 lines

add an (incomplete) text document describing module parameters available in Zaptel modules

........
r3785 | tzafrir | 2008-02-03 05:43:11 +0200 (Sun, 03 Feb 2008) | 3 lines

Fix building in 2.4 w/devfs. Closes issue #11884 
(There's still the msleep warning).

........

Added:
    team/tzafrir/move/doc/module-parameters.txt
      - copied unchanged from r3785, branches/1.4/doc/module-parameters.txt
Modified:
    team/tzafrir/move/   (props changed)
    team/tzafrir/move/kernel/wctdm24xxp/base.c
    team/tzafrir/move/kernel/xpp/utils/zconf/Zaptel/Config/Defaults.pm
    team/tzafrir/move/kernel/zaptel-base.c
    team/tzafrir/move/kernel/zaptel.h

Propchange: team/tzafrir/move/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/tzafrir/move/
------------------------------------------------------------------------------

--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Feb  2 22:24:15 2008
@@ -1,1 +1,1 @@
-/branches/1.4:1-3755
+/branches/1.4:1-3786

Modified: team/tzafrir/move/kernel/wctdm24xxp/base.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/move/kernel/wctdm24xxp/base.c?view=diff&rev=3788&r1=3787&r2=3788
==============================================================================
--- team/tzafrir/move/kernel/wctdm24xxp/base.c (original)
+++ team/tzafrir/move/kernel/wctdm24xxp/base.c Sat Feb  2 22:24:15 2008
@@ -3511,6 +3511,7 @@
 				if (debug & DEBUG_ECHOCAN)
 					printk("Echocan enable took %d ms\n", wc->intcount - start);
 			} else {
+				res = gpakAlgControl(vpm150m->dspid, i, BypassEcanA, &pstatus);
 				if (debug & DEBUG_ECHOCAN)
 					printk("Echocan disable took %d ms\n", wc->intcount - start);
 			}

Modified: team/tzafrir/move/kernel/xpp/utils/zconf/Zaptel/Config/Defaults.pm
URL: http://svn.digium.com/view/zaptel/team/tzafrir/move/kernel/xpp/utils/zconf/Zaptel/Config/Defaults.pm?view=diff&rev=3788&r1=3787&r2=3788
==============================================================================
--- team/tzafrir/move/kernel/xpp/utils/zconf/Zaptel/Config/Defaults.pm (original)
+++ team/tzafrir/move/kernel/xpp/utils/zconf/Zaptel/Config/Defaults.pm Sat Feb  2 22:24:15 2008
@@ -46,7 +46,9 @@
 			}
 		}
 	}
-	die "No default_file" unless $default_file;
+	if (! $default_file) {
+		return ("", ());
+	}
 	my %vars = Zaptel::Config::Defaults::do_source($default_file, @vars);
 	return ($default_file, %vars);
 }

Modified: team/tzafrir/move/kernel/zaptel-base.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/move/kernel/zaptel-base.c?view=diff&rev=3788&r1=3787&r2=3788
==============================================================================
--- team/tzafrir/move/kernel/zaptel-base.c (original)
+++ team/tzafrir/move/kernel/zaptel-base.c Sat Feb  2 22:24:15 2008
@@ -153,6 +153,7 @@
 
 /* Here are a couple important little additions for devfs */
 #ifdef CONFIG_DEVFS_FS
+#define ZT_DEVFS_MODE (S_IFCHR|S_IRUGO|S_IWUGO)
 static devfs_handle_t zaptel_devfs_dir;
 static devfs_handle_t channel;
 static devfs_handle_t pseudo;
@@ -4363,8 +4364,17 @@
 		chan->echolastupdate = 0;
 		chan->echotimer = 0;
 		spin_unlock_irqrestore(&chan->lock, flags);
-		if (chan->span && chan->span->echocan)
-			chan->span->echocan(chan, 0);
+
+		/* Make sure this is zero if we're disabling echo can */
+		ecp->param_count = 0;
+
+		if (chan->span) {
+			if (chan->span->echocan_with_params)
+				chan->span->echocan_with_params(chan, ecp, NULL);
+			else if (chan->span->echocan)
+				chan->span->echocan(chan, 0);
+		}
+		
 		if (tec)
 			echo_can_free(tec);
 
@@ -7336,7 +7346,7 @@
 #endif /* CONFIG_ZAP_UDEV */
 	
 #ifdef CONFIG_DEVFS_FS
-	dev->devfs_handle = devfs_register(zaptel_devfs_dir, dev->name, DEVFS_FL_DEFAULT, ZT_MAJOR, dev->minor, mode, &zt_fops, NULL);
+	dev->devfs_handle = devfs_register(zaptel_devfs_dir, dev->name, DEVFS_FL_DEFAULT, ZT_MAJOR, dev->minor, ZT_DEVFS_MODE, &zt_fops, NULL);
 #endif /* CONFIG_DEVFS_FS */
 
 	return 0;
@@ -7372,15 +7382,13 @@
 
 #ifdef CONFIG_DEVFS_FS
 	{
-		umode_t mode = S_IFCHR|S_IRUGO|S_IWUGO;
-
 		devfs_register_chrdev(ZT_MAJOR, "zaptel", &zt_fops);
 		if (!(zaptel_devfs_dir = devfs_mk_dir(NULL, "zap", NULL)))
 			return -EBUSY; /* This would be bad */
-		timer = devfs_register(zaptel_devfs_dir, "timer", DEVFS_FL_DEFAULT, ZT_MAJOR, 253, mode, &zt_fops, NULL);
-		channel = devfs_register(zaptel_devfs_dir, "channel", DEVFS_FL_DEFAULT, ZT_MAJOR, 254, mode, &zt_fops, NULL);
-		pseudo = devfs_register(zaptel_devfs_dir, "pseudo", DEVFS_FL_DEFAULT, ZT_MAJOR, 255, mode, &zt_fops, NULL);
-		ctl = devfs_register(zaptel_devfs_dir, "ctl", DEVFS_FL_DEFAULT, ZT_MAJOR, 0, mode, &zt_fops, NULL);
+		timer = devfs_register(zaptel_devfs_dir, "timer", DEVFS_FL_DEFAULT, ZT_MAJOR, 253, ZT_DEVFS_MODE, &zt_fops, NULL);
+		channel = devfs_register(zaptel_devfs_dir, "channel", DEVFS_FL_DEFAULT, ZT_MAJOR, 254, ZT_DEVFS_MODE, &zt_fops, NULL);
+		pseudo = devfs_register(zaptel_devfs_dir, "pseudo", DEVFS_FL_DEFAULT, ZT_MAJOR, 255, ZT_DEVFS_MODE, &zt_fops, NULL);
+		ctl = devfs_register(zaptel_devfs_dir, "ctl", DEVFS_FL_DEFAULT, ZT_MAJOR, 0, ZT_DEVFS_MODE, &zt_fops, NULL);
 	}
 #else
 	if ((res = register_chrdev(ZT_MAJOR, "zaptel", &zt_fops))) {

Modified: team/tzafrir/move/kernel/zaptel.h
URL: http://svn.digium.com/view/zaptel/team/tzafrir/move/kernel/zaptel.h?view=diff&rev=3788&r1=3787&r2=3788
==============================================================================
--- team/tzafrir/move/kernel/zaptel.h (original)
+++ team/tzafrir/move/kernel/zaptel.h Sat Feb  2 22:24:15 2008
@@ -1203,7 +1203,7 @@
 	const char *name;
 	__u8 minor;
 #ifdef CONFIG_DEVFS_FS
-	static devfs_handle_t devfs_handle;
+	devfs_handle_t devfs_handle;
 #endif
 };
 


