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.h | |
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.h')
-rw-r--r-- | xpp/xproto.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/xpp/xproto.h b/xpp/xproto.h index 9f0257f..2eb6d18 100644 --- a/xpp/xproto.h +++ b/xpp/xproto.h @@ -40,14 +40,16 @@ struct xpacket_header { uint16_t packet_len:10; uint16_t reserved:1; uint16_t is_pcm:1; - uint16_t timeslot:4; + uint16_t pcmslot:4; uint8_t opcode; struct xpd_addr addr; } PACKED; -#define XPACKET_OP(p) ((p)->head.opcode) -#define XPACKET_LEN(p) ((p)->head.packet_len) -#define XPACKET_ADDR(p) ((p)->head.addr) +#define XPACKET_OP(p) ((p)->head.opcode) +#define XPACKET_LEN(p) ((p)->head.packet_len) +#define XPACKET_IS_PCM(p) ((p)->head.is_pcm) +#define XPACKET_PCMSLOT(p) ((p)->head.pcmslot) +#define XPACKET_ADDR(p) ((p)->head.addr) #define PROTO_TABLE(n) n ## _protocol_table |