xpp r5151:

  * xpd_pri: Basically ready.
  * PCM synchronization changes:
    - Each Astribank unit ticks independently. Each with its own PLL.
    - HOST synchronization is gone. Loading of xpp will no longer cause
      useless 250 ticks per second if you have no Astribank.
    - Synchronization from the zaptel sync master requires setting
      ZAPTEL as sync source (xpp_sync ZAPTEL).
  * rx_tasklet is now a parameter of the module xpp, rather than of xpp_usb.
  * New FPGA firmware: 5128 (1151) / 5122 (1141, 1131):
    - Fixes synchronization issues.
    - PRI module: E1 should now work.
  * perl module and utilities:
    - Modules no longer magically scan system on initialization.
    - Scanning is by calling explicit methods.
    - "Serial" has been renamed "Label". It is basically unique, but 
      should be modifieble.
    - Some basic documentation of zaptel perl modules.
  * Default sort order of zt_registration is back to SORT_CONNCTOR.
  * zt_registration proc file now shows the number of span registered to 
    if registered. Try: grep . /proc/xpp/XBUS-*/XPD-*/zt_registration
  * genzaptelconf: Allow using a custom command instead of
    /etc/init.d/asterisk to start/stop asterisk.
  * Fixed the typo "Slagish".

Merged revisions 3506 via svnmerge from 
http://svn.digium.com/svn/zaptel/branches/1.2


git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@3508 5390a7c7-147a-4af0-8ec9-7488f05a26cb

1 files changed, 2 insertions, 6 deletions

diff --git a/xpp/xpp_zap.h b/xpp/xpp_zap.h
index 60936a7..fee20c5 100644
--- a/xpp/xpp_zap.h
+++ b/xpp/xpp_zap.h
@@ -25,22 +25,18 @@
 #include "xpd.h"
 #include "xproto.h"
 
-void elect_syncer(const char *msg);
 void xpd_disconnect(xpd_t *xpd);
 void card_detected(struct card_desc_struct *card_desc);
 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_line_status(xpd_t *xpd, int pos, bool good);
-void pcm_recompute(xpd_t *xpd, xpp_line_t tmp_pcm_mask);
-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);
 int xpp_close(struct zt_chan *chan);
 int xpp_ioctl(struct zt_chan *chan, unsigned int cmd, unsigned long arg);
 int xpp_maint(struct zt_span *span, int cmd);
+void report_bad_ioctl(const char *msg, xpd_t *xpd, int pos, unsigned int cmd);
+int total_registered_spans(void);
 
 #ifdef CONFIG_PROC_FS
 #include <linux/proc_fs.h>