diff options
| author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-08-02 12:21:11 +0000 |
|---|---|---|
| committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-08-02 12:21:11 +0000 |
| commit | c88eaa22e13bd4c092b367a28e57064659660466 (patch) | |
| tree | 2978dd7342b09b60bf9dbe5e333d043fb43d9114 /xpp/xpp_zap.h | |
| parent | 183cf9c2af77e6444450cf5d2b5c62ca6b875fbe (diff) | |
Merge xpp r4372:
* Update to zaptel-1.2.18 and zaptel-1.4.3 (r4308 onward)
* Fix a critical race with zaptel synchronization (r4362)
* Added a /proc/xpp/cmds for statistics about command timing (r4360)
* Fix a digit mapping bug with hardware dtmf detection (r4357)
* In xpp/utils/Makefile add perl syntax checks to our scripts (r4337)
* Better USB data error checking (r4336)
* udev rules (xpp.rules) avoid false calls from wrong nodes (r4331)
* Improve hardware detection and reporting in lszaptel,
zaptel_hardware. zapconf is basically functional.
* Leds are blinked synchronously on all Astribanks now (r4262)
* Fix a BRI bug if OPTIMIZE_CHANMUTE was compiled into zaptel (r4258)
(This feature was not yet accepted into official zaptel)
* Removed compile warning about HZ != 1000 (r4218)
* Firmware updates.
* fpga_load now supports USB pathes without zeros (r4211)
* XPD numbers have changed to '<Unit><Subunit>' (r4196)
* Proper support for ZT_VMWI ioctl, if used in zaptel (r4092)
* Fix FXO power denial detection (r4054)
* FXO could accidentally go off-hook with some compilers (r4048)
(From branches/1.2 r2732, r2735 - branches/1.4 2736)
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@2813 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'xpp/xpp_zap.h')
| -rw-r--r-- | xpp/xpp_zap.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xpp/xpp_zap.h b/xpp/xpp_zap.h index 0d47422..9fa2637 100644 --- a/xpp/xpp_zap.h +++ b/xpp/xpp_zap.h @@ -26,13 +26,15 @@ #include "xproto.h" void xpd_disconnect(xpd_t *xpd); -int xframe_send(xbus_t *xbus, xframe_t *xframe); void card_detected(struct card_desc_struct *card_desc); -xpd_t *xpd_alloc(size_t privsize, xbus_t *xbus, int xpd_num, const xproto_table_t *proto_table, int channels, byte revision); +xpd_t *xpd_alloc(size_t privsize, const xproto_table_t *proto_table, int channels); void xpd_remove(xpd_t *xpd); void update_xpd_status(xpd_t *xpd, int alarm_flag); void update_zap_ring(xpd_t *xpd, int pos, bool on); void update_line_status(xpd_t *xpd, int pos, bool good); +void pcm_recompute(xpd_t *xpd); +void generic_card_pcm_fromspan(xbus_t *xbus, xpd_t *xpd, xpp_line_t lines, xpacket_t *pack); +void generic_card_pcm_tospan(xbus_t *xbus, xpd_t *xpd, xpacket_t *pack); void fill_beep(u_char *buf, int num, int duration); void got_sync_from(xpd_t *xpd); int xpp_open(struct zt_chan *chan); |