[svn-commits] tzafrir: branch tzafrir/sysfs r3311 - /team/tzafrir/sysfs/

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Tue Dec  4 18:01:50 2007
New Revision: 3311

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3311
Log:
Merge live_zap and other stuff:

Merged revisions 3298,3300,3303,3308 via svnmerge from 
http://svn.digium.com/svn/zaptel/branches/1.4

........
r3298 | dbailey | 2007-12-04 22:56:14 +0200 (Tue, 04 Dec 2007) | 2 lines

Add ioctl call to set hw gain from CLI.  

........
r3300 | qwell | 2007-12-04 23:32:14 +0200 (Tue, 04 Dec 2007) | 4 lines

Remove some code that does...well...nothing.

Closes issue #11460, patch by flefoll.

........
r3303 | mmichelson | 2007-12-05 00:28:58 +0200 (Wed, 05 Dec 2007) | 4 lines

Moving the ZT_SET_HWGAIN define so that the list maintains the numerical order
previously established.


........
r3308 | tzafrir | 2007-12-05 01:15:04 +0200 (Wed, 05 Dec 2007) | 2 lines

live_zap - A script to test Zaptel without fully installing it.

........

Added:
    team/tzafrir/sysfs/live_zap
      - copied unchanged from r3308, branches/1.4/live_zap
Modified:
    team/tzafrir/sysfs/   (props changed)
    team/tzafrir/sysfs/README
    team/tzafrir/sysfs/zaptel-base.c
    team/tzafrir/sysfs/zaptel.h

Propchange: team/tzafrir/sysfs/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Dec  4 18:01:50 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-3297
+/branches/1.4:1-3308

Modified: team/tzafrir/sysfs/README
URL: http://svn.digium.com/view/zaptel/team/tzafrir/sysfs/README?view=diff&rev=3311&r1=3310&r2=3311
==============================================================================
--- team/tzafrir/sysfs/README (original)
+++ team/tzafrir/sysfs/README Tue Dec  4 18:01:50 2007
@@ -239,6 +239,28 @@
   make install DESTDIR=$PWD/target DYNFS=
 
 
+Test Install: live_ast
+^^^^^^^^^^^^^^^^^^^^^^
+If you need to test a version of Zaptel without touching the version
+installed on your system, you can use the script live_zap . Note,
+however, that it may take some extra configuration to be used right.
+
+Basica usage:
+
+  ./configure
+  make
+  ./live_ast install # instead of 'make install'
+  ./live_ast config  # instead of 'make config'
+  ./live_ast unload  # instead of '/etc/init.d/zaptel stop'
+  ./live_ast load    # instead of '/etc/init.d/zaptel start'
+
+Everything is installed under the subdirectory live/ . You will probably
+need to adjust MODULES . Generally you should not edit the script
+itself, but , rather, edit live/live.conf . Please let me know if you
+needed to change anything in the script beyond changing live.conf so I
+can include useful fixes.
+
+
 ./configure Options
 ^^^^^^^^^^^^^^^^^^^
 The configure script various several tests and based on them generates

Modified: team/tzafrir/sysfs/zaptel-base.c
URL: http://svn.digium.com/view/zaptel/team/tzafrir/sysfs/zaptel-base.c?view=diff&rev=3311&r1=3310&r2=3311
==============================================================================
--- team/tzafrir/sysfs/zaptel-base.c (original)
+++ team/tzafrir/sysfs/zaptel-base.c Tue Dec  4 18:01:50 2007
@@ -465,13 +465,8 @@
 	  /* if RBS does not apply, return error */
 	if (!(chan->span->flags & ZT_FLAG_RBS) || 
 		!chan->span->rbsbits) return(-1);
-	if (chan->sig == ZT_SIG_CAS) {
-		static int printed = 0;
-		if (printed < 10) {
-			printed++;
-		}
+	if (chan->sig == ZT_SIG_CAS)
 		return chan->idlebits;
-	}
 	for (x=0;x<NUM_SIGS;x++) {
 		if (in_sig[x][0] == chan->sig) return(in_sig[x][1]);
 	}	return(-1); /* not found -- error */

Modified: team/tzafrir/sysfs/zaptel.h
URL: http://svn.digium.com/view/zaptel/team/tzafrir/sysfs/zaptel.h?view=diff&rev=3311&r1=3310&r2=3311
==============================================================================
--- team/tzafrir/sysfs/zaptel.h (original)
+++ team/tzafrir/sysfs/zaptel.h Tue Dec  4 18:01:50 2007
@@ -387,6 +387,11 @@
 	char echo_canceller[80];
 };
 
+struct zt_hwgain{
+	int newgain; /* desired gain in dB but x10.  -3.5dB would be -35 */
+	int tx:1; /* 0=rx; 1=tx */
+};
+
 
 /* ioctl definitions */
 #define ZT_CODE	'J'
@@ -693,6 +698,7 @@
  */
 #define ZT_LOOPBACK _IOW(ZT_CODE, 58, int)
 
+
 /*
  *  60-80 are reserved for private drivers
  *  80-85 are reserved for dynamic span stuff
@@ -707,6 +713,11 @@
  * Destroy a dynamic span 
  */
 #define ZT_DYNAMIC_DESTROY	_IOW (ZT_CODE, 81, struct zt_dynamic_span)
+
+/*
+ * Set the HW gain for a device
+ */
+#define ZT_SET_HWGAIN   _IOW (ZT_CODE, 86, struct zt_hwgain)
 
 /*
  * Enable tone detection -- implemented by low level driver