diff options
author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-11-06 21:18:42 +0000 |
---|---|---|
committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2006-11-06 21:18:42 +0000 |
commit | 4953605453a7f7f1da8c70c4c12a4b557cfc2c24 (patch) | |
tree | 0d1bd64cb09f75bf0c7aca3b17820738965a0f77 /xpp/card_fxo.h | |
parent | 1148b31f800c4a280c9a26592a18d4478afc1a82 (diff) |
r1557@boole: tzafrir | 2006-11-06 20:12:16 +0200
Merging xpp driver release 1.2 (rev. 2569), originally team/tzafrir/xpp_1.2
* Should build well. Almost final.
* genzaptelconf: Also work when zap_autoreg=0
* README.Astribank updated for rev. 1.2.
* xpp/utils/Makefile: Use $< with cc -c
* Get xpp/utils configuration from autoconf (without changesin top dir)
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@1563 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'xpp/card_fxo.h')
-rw-r--r-- | xpp/card_fxo.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/xpp/card_fxo.h b/xpp/card_fxo.h index 6e5186b..a22e193 100644 --- a/xpp/card_fxo.h +++ b/xpp/card_fxo.h @@ -23,19 +23,16 @@ */ #include "xpd.h" -#include "slic.h" enum fxo_opcodes { XPROTO_NAME(FXO, SIG_CHANGED) = 0x06, /**/ XPROTO_NAME(FXO, DAA_WRITE) = 0x0F, /* Write to DAA */ - XPROTO_NAME(FXO, CHAN_ENABLE) = 0x0F, /* Write to DAA */ + XPROTO_NAME(FXO, XPD_STATE) = 0x0F, /* Write to DAA */ XPROTO_NAME(FXO, CHAN_CID) = 0x0F, /* Write to DAA */ XPROTO_NAME(FXO, RING) = 0x0F, /* Write to DAA */ XPROTO_NAME(FXO, LED) = 0x0F, /* Write to DAA */ XPROTO_NAME(FXO, RELAY_OUT) = 0x0F, /* Write to DAA */ - XPROTO_NAME(FXO, DAA_INIT) = 0x0F, /* Write to DAA */ - XPROTO_NAME(FXO, DAA_QUERY) = 0x0F, /* Write to DAA */ /**/ XPROTO_NAME(FXO, DAA_REPLY) = 0x10, }; @@ -47,11 +44,7 @@ DEF_RPACKET_DATA(FXO, SIG_CHANGED, xpp_line_t sig_toggles; /* channels: lsb=1, msb=8 */ ); DEF_RPACKET_DATA(FXO, DAA_REPLY, /* Get status of a single DAA (for debugging) */ - xpp_line_t lines; - slic_reply_t info; - ); -DEF_RPACKET_DATA(FXO, DAA_WRITE, - slic_cmd_t slic_cmd; + reg_cmd_t regcmd; ); #define DAA_VBAT_REGISTER 29 |