[zaptel-commits] tzafrir: branch 1.4 r2833 - in /branches/1.4: ./ xpp/

[SVN commits to the Zaptel project]

Author: tzafrir
Date: Tue Aug 14 16:01:13 2007
New Revision: 2833

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2833
Log:
Merging a few small changes Xorcom:
* Marked with no. 4416, to note that major changes after 4415 were
  note merged yet.
* Demote the messages about PCM in non-PCM from notice to debug (r4501).
* Fix sample BRI zapata.conf: NT instead of TE (r4498).
* Disable FXS hardware DTMF detection by default (r4492).

Merged revisions 2832 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

Modified:
    branches/1.4/   (props changed)
    branches/1.4/xpp/.version
    branches/1.4/xpp/ChangeLog
    branches/1.4/xpp/README.Astribank
    branches/1.4/xpp/card_fxs.c
    branches/1.4/xpp/xproto.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/xpp/.version
URL: http://svn.digium.com/view/zaptel/branches/1.4/xpp/.version?view=diff&rev=2833&r1=2832&r2=2833
==============================================================================
--- branches/1.4/xpp/.version (original)
+++ branches/1.4/xpp/.version Tue Aug 14 16:01:13 2007
@@ -1,1 +1,1 @@
-trunk-r4415
+trunk-r4416

Modified: branches/1.4/xpp/ChangeLog
URL: http://svn.digium.com/view/zaptel/branches/1.4/xpp/ChangeLog?view=diff&rev=2833&r1=2832&r2=2833
==============================================================================
--- branches/1.4/xpp/ChangeLog (original)
+++ branches/1.4/xpp/ChangeLog Tue Aug 14 16:01:13 2007
@@ -1,3 +1,11 @@
+Tue Aug 14 2007 Tzafrir Cohen <tzafrir.cohen at xorcom.com> - xpp.r4416
+  * Marked with no. 4416, to note that major changes after 4415 were
+    note merged yet.
+  * Demote the messages about PCM in non-PCM from notice to debug (r4501).
+  * Fix sample BRI zapata.conf: NT instead of TE (r4498).
+  * Disable FXS hardware DTMF detection by default (r4492).
+  * Extra Zaptel PCI IDs (from Philipp Kempgen) (r4466).
+
 Thu Jul 30 2007 Oron Peled <oron at actcom.co.il> - xpp.r4415
   * Show Astribank 6+2 as 6/2 channels and not 8/8 channels.
     - Added as a "subtype" to the device type (r4391).

Modified: branches/1.4/xpp/README.Astribank
URL: http://svn.digium.com/view/zaptel/branches/1.4/xpp/README.Astribank?view=diff&rev=2833&r1=2832&r2=2833
==============================================================================
--- branches/1.4/xpp/README.Astribank (original)
+++ branches/1.4/xpp/README.Astribank Tue Aug 14 16:01:13 2007
@@ -415,14 +415,14 @@
     channel => 7,8
     
     ; NT ports:
-    signalling = bri_cpe_ptmp
-    ;signalling = bri_cpe
-    context = from-pstn
+    signalling = bri_net_ptmp
+    ;signalling = bri_net
+    context = from-internal
     group = 2,12
-    channel => 1,2
+    channel => 4,5
     
     group = 2,14
-    channel => 7,8
+    channel => 10,11
 
 
 See also the output of genzaptelconf for examples of mailbox and 

Modified: branches/1.4/xpp/card_fxs.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/xpp/card_fxs.c?view=diff&rev=2833&r1=2832&r2=2833
==============================================================================
--- branches/1.4/xpp/card_fxs.c (original)
+++ branches/1.4/xpp/card_fxs.c Tue Aug 14 16:01:13 2007
@@ -37,7 +37,7 @@
 DEF_PARM(uint, poll_digital_inputs, 1000, 0644, "Poll Digital Inputs");
 DEF_PARM_BOOL(reversepolarity, 0, 0644, "Reverse Line Polarity");
 DEF_PARM_BOOL(vmwineon, 0, 0644, "Indicate voicemail to a neon lamp");
-DEF_PARM_BOOL(dtmf_detection, 1, 0644, "Do DTMF detection in hardware");
+DEF_PARM_BOOL(dtmf_detection, 0, 0644, "Do DTMF detection in hardware");
 
 #ifdef	ZT_VMWI
 DEF_PARM_BOOL(vmwi_ioctl, 0, 0644, "Asterisk support VMWI notification via ioctl");

Modified: branches/1.4/xpp/xproto.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/xpp/xproto.c?view=diff&rev=2833&r1=2832&r2=2833
==============================================================================
--- branches/1.4/xpp/xproto.c (original)
+++ branches/1.4/xpp/xproto.c Tue Aug 14 16:01:13 2007
@@ -237,11 +237,11 @@
 		len = pack->datalen;
 		/* Sanity checks */
 		if(unlikely(is_pcm && pack->opcode != XPROTO_NAME(GLOBAL,PCM_READ) && printk_ratelimit())) {
-			XBUS_NOTICE(xbus, "Non-PCM packet within a PCM xframe\n");
+			XBUS_DBG(xbus, "Non-PCM packet within a PCM xframe\n");
 			dump_xframe("In PCM xframe", xbus, xframe);
 			// goto bad_proto;
 		} else if(unlikely(!is_pcm && pack->opcode == XPROTO_NAME(GLOBAL,PCM_READ) && printk_ratelimit())) {
-			XBUS_NOTICE(xbus, "A PCM packet within a Non-PCM xframe\n");
+			XBUS_DBG(xbus, "A PCM packet within a Non-PCM xframe\n");
 			// goto bad_proto;
 		}
 		p += len;