diff options
| author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-10-03 16:46:13 +0000 |
|---|---|---|
| committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-10-03 16:46:13 +0000 |
| commit | 82e6b0217e63d5a77e7f673bc2a7c3712c84b7e6 (patch) | |
| tree | 75dd0e4c558d02887f828bbe873998f5c26d81f0 /xpp/xproto.c | |
| parent | 0599b53369244cd6b3696022309ece91446eae9d (diff) | |
New xpp release: r4786:
* New firmware protocol version: 2.9 .
* fpga_load: initial clean-ups before interface split.
* genzaptelconf: Don't leave an empty directory behind (4784)
* Increase xpp poll_timeout to 1000ms - useful for CentOS 4 (r4781).
* Fix initialization anoyance: if AB don't answer to polls, don't
waitfor_xpds, and show no waiting XPDs (r4725).
* Disable dtmf_detect by default once again (r4712).
* Don't check twice for asterisk to stop. The second test was done
while Asterisk was still stopping (r4708).
* Support building the kernel with M= instead of with SUBDIRS= , as
used in some newer build systems (r4677).
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.2@3105 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'xpp/xproto.c')
| -rw-r--r-- | xpp/xproto.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xpp/xproto.c b/xpp/xproto.c index fb179d1..45ab125 100644 --- a/xpp/xproto.c +++ b/xpp/xproto.c @@ -227,7 +227,7 @@ int xframe_receive(xbus_t *xbus, xframe_t *xframe) /* * We want to check that xframes do not mix PCM and other commands */ - is_pcm = XPACKET_OP((xpacket_t *)p) == XPROTO_NAME(GLOBAL,PCM_READ); + is_pcm = XPACKET_IS_PCM((xpacket_t *)p); if(print_dbg & DBG_PCM) { static int rate_limit; @@ -286,20 +286,20 @@ void dump_packet(const char *msg, xpacket_t *packet, bool print_dbg) if(!print_dbg) return; - DBG(GENERAL, "%s: XPD=%1X-%1X (0x%X) OP=0x%02X LEN=%d", + printk(KERN_DEBUG "%s: XPD=%1X-%1X%c (0x%X) OP=0x%02X LEN=%d", msg, XPACKET_ADDR(packet).unit, XPACKET_ADDR(packet).subunit, + (XPACKET_ADDR(packet).sync_master)?'+':' ', *addr, op, - (byte)XPACKET_LEN(packet)); + XPACKET_LEN(packet)); #if VERBOSE_DEBUG { int i; byte *p = (byte *)packet; - if (print_dbg) - printk(" BYTES: "); + printk(" BYTES: "); for(i = 0; i < XPACKET_LEN(packet); i++) { static int limiter = 0; |