diff options
| author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-08-14 21:18:37 +0000 |
|---|---|---|
| committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-08-14 21:18:37 +0000 |
| commit | a832f5aee6179fee8709c71a74911e6f61a0f9f5 (patch) | |
| tree | 9690c79927a5fd376d3a955d0d14f835fbb8ec3e | |
| parent | 3b81e315879a888cb0a6e79c9d01ecb9a37caf04 (diff) | |
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
Merged revisions 2833 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@2834 5390a7c7-147a-4af0-8ec9-7488f05a26cb
| -rw-r--r-- | xpp/.version | 2 | ||||
| -rw-r--r-- | xpp/ChangeLog | 8 | ||||
| -rw-r--r-- | xpp/README.Astribank | 10 | ||||
| -rw-r--r-- | xpp/card_fxs.c | 2 | ||||
| -rw-r--r-- | xpp/xproto.c | 4 |
5 files changed, 17 insertions, 9 deletions
diff --git a/xpp/.version b/xpp/.version index c59a409..5cd7489 100644 --- a/xpp/.version +++ b/xpp/.version @@ -1 +1 @@ -trunk-r4415 +trunk-r4416 diff --git a/xpp/ChangeLog b/xpp/ChangeLog index b7c5a0b..9e83c29 100644 --- a/xpp/ChangeLog +++ b/xpp/ChangeLog @@ -1,3 +1,11 @@ +Tue Aug 14 2007 Tzafrir Cohen <tzafrir.cohen@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@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). diff --git a/xpp/README.Astribank b/xpp/README.Astribank index ba39793..18c5bbe 100644 --- a/xpp/README.Astribank +++ b/xpp/README.Astribank @@ -415,14 +415,14 @@ Astribank 4 BRI 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 diff --git a/xpp/card_fxs.c b/xpp/card_fxs.c index 359591d..fbbcab4 100644 --- a/xpp/card_fxs.c +++ b/xpp/card_fxs.c @@ -37,7 +37,7 @@ DEF_PARM(int, print_dbg, 0, 0644, "Print DBG statements"); /* must be before zap 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"); diff --git a/xpp/xproto.c b/xpp/xproto.c index 052a923..4796ed3 100644 --- a/xpp/xproto.c +++ b/xpp/xproto.c @@ -237,11 +237,11 @@ int xframe_receive(xbus_t *xbus, xframe_t *xframe) 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; |