[Pkg-voip-commits] r2037 - in zaptel/trunk/debian: . patches
Tzafrir Cohen
tzafrir-guest at costa.debian.org
Mon Jul 10 21:06:53 UTC 2006
Author: tzafrir-guest
Date: 2006-07-10 21:06:51 +0000 (Mon, 10 Jul 2006)
New Revision: 2037
Modified:
zaptel/trunk/debian/changelog
zaptel/trunk/debian/patches/xpp_xorcom_debian.dpatch
Log:
xpp_xorcom_debian: r1608:
- Current parameters finetuning.
- genzaptelconf E1/{nl,il} fixes.
Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog 2006-07-10 20:55:58 UTC (rev 2036)
+++ zaptel/trunk/debian/changelog 2006-07-10 21:06:51 UTC (rev 2037)
@@ -11,7 +11,7 @@
* Removing some unneeded dirs from zaptel-source
* debian/patches/Makefile_kbuild: a small part of the original one.
Fixes building on Sarge
- * xpp revision r1588 (branches/RELEASE-1.1.0)
+ * xpp revision r1608 (branches/RELEASE-1.1.0)
- With EC
- FXS caller ID working
- Improved FXO
Modified: zaptel/trunk/debian/patches/xpp_xorcom_debian.dpatch
===================================================================
--- zaptel/trunk/debian/patches/xpp_xorcom_debian.dpatch 2006-07-10 20:55:58 UTC (rev 2036)
+++ zaptel/trunk/debian/patches/xpp_xorcom_debian.dpatch 2006-07-10 21:06:51 UTC (rev 2037)
@@ -2,17 +2,15 @@
## xpp_xorcom_debian.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
##
## DP: Up-to-date zaptel drivers for the Xorcom Astribank and friends.
-## DP: Revision r1588 (branches/RELEASE-1.1.0)
+## DP: Revision r1608 (branches/RELEASE-1.1.0)
## DP: This version omites the .version file and the firmware files.
-## DP: This patch has been merged into trunk and branch 1.2 and is expected
-## DP: to be included in zaptel 1.2.7
@DPATCH@
-diff -uNr -x .svn -x debian zaptel-1.2.6/.version zaptel-xpp-oaIQ8i_dist/.version
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/card_fxo.c zaptel-xpp-oaIQ8i_dist/xpp/card_fxo.c
+diff -uNr -x .svn -x debian zaptel-1.2.6/.version zaptel-xpp-LJNBCn_dist/.version
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/card_fxo.c zaptel-xpp-LJNBCn_dist/xpp/card_fxo.c
--- zaptel-1.2.6/xpp/card_fxo.c 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/card_fxo.c 2006-07-05 16:28:42.355959000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/card_fxo.c 2006-07-05 16:28:42.355959000 +0300
@@ -0,0 +1,946 @@
+/*
+ * Written by Oron Peled <oron at actcom.co.il>
@@ -960,9 +958,9 @@
+
+module_init(card_fxo_startup);
+module_exit(card_fxo_cleanup);
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/card_fxo.h zaptel-xpp-oaIQ8i_dist/xpp/card_fxo.h
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/card_fxo.h zaptel-xpp-LJNBCn_dist/xpp/card_fxo.h
--- zaptel-1.2.6/xpp/card_fxo.h 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/card_fxo.h 2006-07-02 17:17:18.812352000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/card_fxo.h 2006-07-02 17:17:18.812352000 +0300
@@ -0,0 +1,61 @@
+#ifndef CARD_FXO_H
+#define CARD_FXO_H
@@ -1025,9 +1023,9 @@
+#define BAT_THRESHOLD 3
+
+#endif /* CARD_FXO_H */
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/card_fxs.c zaptel-xpp-oaIQ8i_dist/xpp/card_fxs.c
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/card_fxs.c zaptel-xpp-LJNBCn_dist/xpp/card_fxs.c
--- zaptel-1.2.6/xpp/card_fxs.c 2006-04-03 10:08:13.000000000 +0300
-+++ zaptel-xpp-oaIQ8i_dist/xpp/card_fxs.c 2006-07-04 10:42:50.607003000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/card_fxs.c 2006-07-10 12:13:42.526183000 +0300
@@ -1,6 +1,6 @@
/*
* Written by Oron Peled <oron at actcom.co.il>
@@ -1051,7 +1049,7 @@
-static const char rcsid[] = "$Id: card_fxs.c 995 2006-04-03 07:08:13Z tzafrir $";
-static const char revision[] = "$Revision: 995 $";
-+static const char rcsid[] = "$Id: card_fxs.c 1564 2006-07-04 07:42:50Z oron $";
++static const char rcsid[] = "$Id: card_fxs.c 1604 2006-07-10 09:13:42Z tzafrir $";
DEF_PARM(int, print_dbg, 0, "Print DBG statements"); /* must be before zap_debug.h */
+DEF_PARM(bool, poll_digital_inputs, 1, "Poll Digital Inputs"); /* must be before zap_debug.h */
@@ -1436,10 +1434,11 @@
+ for_each_line(xpd, i) {
+ MARK_LED(priv, i, color, LED_ON);
+ mdelay(50);
-+ }
-+ return 0;
-+}
-+
+ }
+-#endif
+ return 0;
+ }
+
+static int FXS_card_zaptel_postregistration(xpd_t *xpd, bool on)
+{
+ xbus_t *xbus;
@@ -1456,11 +1455,10 @@
+ for_each_line(xpd, i) {
+ MARK_LED(priv, i, color, LED_OFF);
+ mdelay(50);
- }
--#endif
- return 0;
- }
-
++ }
++ return 0;
++}
++
+#ifdef WITH_RBS
+int FXS_card_hooksig(xbus_t *xbus, xpd_t *xpd, int pos, zt_txsig_t txsig)
+{
@@ -1900,7 +1898,7 @@
XPACKET_NEW(pack, xbus, FXS, SLIC_WRITE, xpd->id);
sc = &RPACKET_FIELD(pack, FXS, SLIC_WRITE, slic_cmd);
len = slic_cmd_direct_read(sc, BIT(pos), reg_num);
-@@ -416,31 +757,45 @@
+@@ -416,31 +757,39 @@
HANDLER_DEF(FXS, SIG_CHANGED)
{
xpp_line_t sig_status = RPACKET_FIELD(pack, FXS, SIG_CHANGED, sig_status);
@@ -1912,20 +1910,7 @@
- NOTICE("%s: received %s for non-existing xpd: %d\n",
- __FUNCTION__, cmd->name, XPD_NUM(pack->content.addr));
- return -EPROTO;
-+ BUG_ON(!xpd);
-+ BUG_ON(xpd->direction != TO_PHONE);
-+ priv = xpd->priv;
-+ DBG("%s/%s: (PHONE) sig_toggles=0x%04X sig_status=0x%04X\n", xbus->busname, xpd->xpdname, sig_toggles, sig_status);
-+ if(!SPAN_REGISTERED(xpd)) {
-+ NOTICE("%s: %s/%s is not registered. Skipping.\n", __FUNCTION__, xbus->busname, xpd->xpdname);
-+ return -ENODEV;
-+ }
-+#if 0
-+ Is this needed?
-+ for_each_line(xpd, i) {
-+ if(IS_SET(sig_toggles, i))
-+ do_chan_power(xpd->xbus, xpd, BIT(i), 0); // Power down (prevent overheating!!!)
- }
+- }
- if(xpd->direction == TO_PHONE) { /* Hook state changes */
- DBG("%s (PHONE) sig_status=0x%04X\n", xpd->xpdname, sig_status);
- xpp_check_hookstate(xpd, sig_status);
@@ -1936,7 +1921,14 @@
- DBG("%s (PSTN) sig_status=0x%04X\n", xpd->xpdname, sig_status);
- spin_lock_irqsave(&xpd->lock, flags);
- for(i = 0; i < xpd->channels; i++) {
-+#endif
++ BUG_ON(!xpd);
++ BUG_ON(xpd->direction != TO_PHONE);
++ priv = xpd->priv;
++ DBG("%s/%s: (PHONE) sig_toggles=0x%04X sig_status=0x%04X\n", xbus->busname, xpd->xpdname, sig_toggles, sig_status);
++ if(!SPAN_REGISTERED(xpd)) {
++ NOTICE("%s: %s/%s is not registered. Skipping.\n", __FUNCTION__, xbus->busname, xpd->xpdname);
++ return -ENODEV;
++ }
+ for_each_line(xpd, i) {
+ if(IS_SET(xpd->digital_outputs, i) || IS_SET(xpd->digital_inputs, i))
+ continue;
@@ -1944,6 +1936,7 @@
+ struct zt_chan *chan = &xpd->span.chans[i];
+
+ xpd->ringing[i] = 0; // No more ringing...
++ do_chan_power(xpd->xbus, xpd, BIT(i), 0); // When not ringing, VBAT is always Low
+ MARK_BLINK(priv,i,LED_GREEN,0);
if(IS_SET(sig_status, i)) {
- xpd->ringing[i] = RINGS_NUM*2;
@@ -1965,7 +1958,7 @@
}
return 0;
}
-@@ -460,52 +815,75 @@
+@@ -460,52 +809,75 @@
spin_lock_irqsave(&xpd->lock, flags);
priv = xpd->priv;
BUG_ON(!priv);
@@ -2049,7 +2042,7 @@
.CHAN_CID = XPROTO_CALLER(FXS, CHAN_CID),
.SYNC_SOURCE = XPROTO_CALLER(GLOBAL, SYNC_SOURCE),
-@@ -519,7 +897,7 @@
+@@ -519,7 +891,7 @@
{
const xproto_entry_t *xe;
@@ -2058,7 +2051,7 @@
xe = xproto_card_entry(&PROTO_TABLE(FXS), pack->content.opcode);
return xe != NULL;
}
-@@ -531,6 +909,57 @@
+@@ -531,6 +903,57 @@
/*------------------------- SLIC Handling --------------------------*/
@@ -2116,7 +2109,7 @@
static int proc_xpd_slic_read(char *page, char **start, off_t off, int count, int *eof, void *data)
{
int len = 0;
-@@ -570,7 +999,7 @@
+@@ -570,7 +993,7 @@
* |
* SLIC #
*/
@@ -2125,7 +2118,7 @@
{
char op; /* [W]rite, [R]ead */
char reg_type; /* [D]irect, [I]ndirect */
-@@ -588,9 +1017,17 @@
+@@ -588,9 +1011,17 @@
if(reg_type == 'D' && ret == 7) {
// DBG("0x%X 0x%X 0x%X 0x%X %c %x\n", s1, s2, s3, s4, reg_type, reg_num);
ret = slic_cmd_direct_read(sc, lines, reg_num);
@@ -2143,7 +2136,7 @@
} else {
NOTICE("%s: Bad read input: ret=%d buf='%s' reg_type=%c\n", __FUNCTION__, ret, buf, reg_type);
goto err;
-@@ -619,14 +1056,16 @@
+@@ -619,14 +1050,16 @@
static int process_slic_cmdline(xpd_t *xpd, char *cmdline)
{
@@ -2165,7 +2158,7 @@
if((p = strchr(cmdline, '#')) != NULL) /* Truncate comments */
*p = '\0';
if((p = strchr(cmdline, ';')) != NULL) /* Truncate comments */
-@@ -635,12 +1074,11 @@
+@@ -635,12 +1068,11 @@
;
if(*p == '\0')
return 0;
@@ -2180,7 +2173,7 @@
return 0;
}
dump_slic_cmd("WRITE_SLIC", &sc);
-@@ -660,7 +1098,8 @@
+@@ -660,7 +1092,8 @@
int i;
int ret;
@@ -2190,7 +2183,7 @@
for(i = 0; i < count; /* noop */) {
for(p = buf; p < buf + LINE_LEN; p++) { /* read a line */
if(i >= count)
-@@ -677,6 +1116,7 @@
+@@ -677,6 +1110,7 @@
ret = process_slic_cmdline(xpd, buf);
if(ret < 0)
return ret;
@@ -2198,7 +2191,7 @@
}
return count;
}
-@@ -684,7 +1124,13 @@
+@@ -684,7 +1118,13 @@
int __init card_fxs_startup(void)
{
@@ -2213,7 +2206,7 @@
xproto_register(&PROTO_TABLE(FXS));
return 0;
}
-@@ -697,7 +1143,8 @@
+@@ -697,7 +1137,8 @@
MODULE_DESCRIPTION("XPP FXS Card Driver");
MODULE_AUTHOR("Oron Peled <oron at actcom.co.il>");
MODULE_LICENSE("GPL");
@@ -2223,9 +2216,9 @@
module_init(card_fxs_startup);
module_exit(card_fxs_cleanup);
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/card_fxs.h zaptel-xpp-oaIQ8i_dist/xpp/card_fxs.h
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/card_fxs.h zaptel-xpp-LJNBCn_dist/xpp/card_fxs.h
--- zaptel-1.2.6/xpp/card_fxs.h 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/card_fxs.h 2006-07-02 17:17:18.812352000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/card_fxs.h 2006-07-02 17:17:18.812352000 +0300
@@ -2,7 +2,7 @@
#define CARD_FXS_H
/*
@@ -2271,9 +2264,9 @@
DEF_RPACKET_DATA(FXS, SLIC_WRITE,
slic_cmd_t slic_cmd;
);
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/card_global.c zaptel-xpp-oaIQ8i_dist/xpp/card_global.c
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/card_global.c zaptel-xpp-LJNBCn_dist/xpp/card_global.c
--- zaptel-1.2.6/xpp/card_global.c 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/card_global.c 2006-07-03 14:04:21.414889000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/card_global.c 2006-07-03 14:04:21.414889000 +0300
@@ -1,6 +1,6 @@
/*
* Written by Oron Peled <oron at actcom.co.il>
@@ -2428,9 +2421,9 @@
if(IS_SET(lines, i))
count++;
if(pack->datalen != (sizeof(xpp_line_t) + count * 8)) {
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/card_global.h zaptel-xpp-oaIQ8i_dist/xpp/card_global.h
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/card_global.h zaptel-xpp-LJNBCn_dist/xpp/card_global.h
--- zaptel-1.2.6/xpp/card_global.h 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/card_global.h 2006-07-03 13:44:48.152691000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/card_global.h 2006-07-03 13:44:48.152691000 +0300
@@ -2,7 +2,7 @@
#define CARD_GLOBAL_H
/*
@@ -2462,9 +2455,9 @@
byte pcm[PCM_CHUNKSIZE];
);
DEF_RPACKET_DATA(GLOBAL, SYNC_SOURCE,
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/cards.c zaptel-xpp-oaIQ8i_dist/xpp/cards.c
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/cards.c zaptel-xpp-LJNBCn_dist/xpp/cards.c
--- zaptel-1.2.6/xpp/cards.c 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/cards.c 1970-01-01 02:00:00.000000000 +0200
++++ zaptel-xpp-LJNBCn_dist/xpp/cards.c 1970-01-01 02:00:00.000000000 +0200
@@ -1,394 +0,0 @@
-#include <linux/module.h>
-#include "xpd.h"
@@ -2860,9 +2853,9 @@
- return NULL;
- return &xpd_card_ops[xpd_type];
-}
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/cards.h zaptel-xpp-oaIQ8i_dist/xpp/cards.h
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/cards.h zaptel-xpp-LJNBCn_dist/xpp/cards.h
--- zaptel-1.2.6/xpp/cards.h 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/cards.h 1970-01-01 02:00:00.000000000 +0200
++++ zaptel-xpp-LJNBCn_dist/xpp/cards.h 1970-01-01 02:00:00.000000000 +0200
@@ -1,23 +0,0 @@
-#ifndef CARDS_H
-#define CARDS_H
@@ -2887,10 +2880,10 @@
-xops_t *get_xops(xpd_type_t xpd_type);
-
-#endif /* CARDS_H */
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/FPGA_XPD.hex zaptel-xpp-oaIQ8i_dist/xpp/FPGA_XPD.hex
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/gen_slic_init zaptel-xpp-oaIQ8i_dist/xpp/gen_slic_init
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/FPGA_XPD.hex zaptel-xpp-LJNBCn_dist/xpp/FPGA_XPD.hex
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/gen_slic_init zaptel-xpp-LJNBCn_dist/xpp/gen_slic_init
--- zaptel-1.2.6/xpp/gen_slic_init 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/gen_slic_init 1970-01-01 02:00:00.000000000 +0200
++++ zaptel-xpp-LJNBCn_dist/xpp/gen_slic_init 1970-01-01 02:00:00.000000000 +0200
@@ -1,37 +0,0 @@
-#! /usr/bin/perl -w
-
@@ -2929,9 +2922,9 @@
- }
- print HF "\n";
-}
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/init_data_3_19.cmd zaptel-xpp-oaIQ8i_dist/xpp/init_data_3_19.cmd
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/init_data_3_19.cmd zaptel-xpp-LJNBCn_dist/xpp/init_data_3_19.cmd
--- zaptel-1.2.6/xpp/init_data_3_19.cmd 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/init_data_3_19.cmd 2006-06-26 11:48:58.007317000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/init_data_3_19.cmd 2006-06-26 11:48:58.007317000 +0300
@@ -0,0 +1,169 @@
+#
+# Written by Oron Peled <oron at actcom.co.il>
@@ -3102,10 +3095,10 @@
+80 00 00 00 WD 03 00
+80 00 00 00 WD 04 39
+80 00 00 00 WD 05 00
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/init_data_3_20.cmd zaptel-xpp-oaIQ8i_dist/xpp/init_data_3_20.cmd
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/init_data_3_20.cmd zaptel-xpp-LJNBCn_dist/xpp/init_data_3_20.cmd
--- zaptel-1.2.6/xpp/init_data_3_20.cmd 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/init_data_3_20.cmd 2006-06-26 11:48:58.007317000 +0300
-@@ -0,0 +1,170 @@
++++ zaptel-xpp-LJNBCn_dist/xpp/init_data_3_20.cmd 2006-07-10 12:13:42.526183000 +0300
+@@ -0,0 +1,172 @@
+#
+# Written by Oron Peled <oron at actcom.co.il>
+# Copyright (C) 2006, Xorcom
@@ -3212,8 +3205,9 @@
+FF 00 00 00 WD 13 FF
+FF 00 00 00 WD 14 FF
+
-+; Automatic/Manual Control: defaults - Cancel Power Alarm
-+FF 00 00 00 WD 43 1E
++; Automatic/Manual Control:
++; Manual BATL/BATH select. NOTE: bit 08 switches VBAT to Low AND to High!
++FF 00 00 00 WD 43 16
+
+FF 00 00 00 WD 4A 31
+FF 00 00 00 WD 4B 10
@@ -3232,7 +3226,8 @@
+FF 00 00 00 WD 46 0B
+
+; Loop Current Limit
-+FF 00 00 00 WD 47 07
++; 23 milliampere for line current
++FF 00 00 00 WD 47 01
+
+; Setting of SLICs offsets
+
@@ -3276,9 +3271,9 @@
+80 00 00 00 WD 03 00
+80 00 00 00 WD 04 38
+80 00 00 00 WD 05 00
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/init_data_4_19.cmd zaptel-xpp-oaIQ8i_dist/xpp/init_data_4_19.cmd
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/init_data_4_19.cmd zaptel-xpp-LJNBCn_dist/xpp/init_data_4_19.cmd
--- zaptel-1.2.6/xpp/init_data_4_19.cmd 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/init_data_4_19.cmd 2006-04-27 16:03:25.463235000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/init_data_4_19.cmd 2006-04-27 16:03:25.463235000 +0300
@@ -0,0 +1,69 @@
+#
+# Written by Oron Peled <oron at actcom.co.il>
@@ -3349,9 +3344,9 @@
+
+; ----------- DAA ONHOOK --------------------
+FF FF 00 00 WD 05 00
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/init_data_4_20.cmd zaptel-xpp-oaIQ8i_dist/xpp/init_data_4_20.cmd
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/init_data_4_20.cmd zaptel-xpp-LJNBCn_dist/xpp/init_data_4_20.cmd
--- zaptel-1.2.6/xpp/init_data_4_20.cmd 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/init_data_4_20.cmd 2006-07-05 16:28:42.355959000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/init_data_4_20.cmd 2006-07-05 16:28:42.355959000 +0300
@@ -0,0 +1,60 @@
+#
+# Written by Oron Peled <oron at actcom.co.il>
@@ -3413,9 +3408,9 @@
+
+; ----------- DAA ONHOOK --------------------
+FF FF 00 00 WD 05 08
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/initialize_registers zaptel-xpp-oaIQ8i_dist/xpp/initialize_registers
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/initialize_registers zaptel-xpp-LJNBCn_dist/xpp/initialize_registers
--- zaptel-1.2.6/xpp/initialize_registers 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/initialize_registers 2006-05-01 12:49:12.732258000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/initialize_registers 2006-05-01 12:49:12.732258000 +0300
@@ -0,0 +1,39 @@
+#! /bin/sh
+# XPD_BUS - bus name
@@ -3456,9 +3451,9 @@
+$LOGGER "Wrote '$FILE' into '$SLICS'"
+
+exit 0
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/LICENSE.firmware zaptel-xpp-oaIQ8i_dist/xpp/LICENSE.firmware
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/LICENSE.firmware zaptel-xpp-LJNBCn_dist/xpp/LICENSE.firmware
--- zaptel-1.2.6/xpp/LICENSE.firmware 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/LICENSE.firmware 2006-05-01 22:45:43.558912000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/LICENSE.firmware 2006-05-01 22:45:43.558912000 +0300
@@ -0,0 +1,37 @@
+The firmware files (*.hex) in this directory are software for the
+Astribank itself and not intended to run on the Linux system itself.
@@ -3497,9 +3492,9 @@
+/* hardware or firmware either solely or in combination with the firmware. */
+/****************************************************************************/
+
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/Makefile zaptel-xpp-oaIQ8i_dist/xpp/Makefile
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/Makefile zaptel-xpp-LJNBCn_dist/xpp/Makefile
--- zaptel-1.2.6/xpp/Makefile 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/Makefile 2006-07-02 17:17:18.812352000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/Makefile 2006-07-02 17:17:18.812352000 +0300
@@ -1,5 +1,9 @@
-EXTRA_CFLAGS = -I$(src)/.. -DSOFT_SIMULATOR=0
+EXTRA_CFLAGS = -I$(SUBDIRS) -DDEBUG -DPOLL_DIGITAL_INPUTS -DWITH_ECHO_SUPPRESSION -DXPP_EC_CHUNK -DWITH_RBS
@@ -3514,9 +3509,9 @@
+
+ctags:
+ ctags *.[ch]
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/README.Astribank zaptel-xpp-oaIQ8i_dist/xpp/README.Astribank
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/README.Astribank zaptel-xpp-LJNBCn_dist/xpp/README.Astribank
--- zaptel-1.2.6/xpp/README.Astribank 2006-03-03 21:11:53.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/README.Astribank 2006-06-19 11:29:10.334411000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/README.Astribank 2006-06-19 11:29:10.334411000 +0300
@@ -5,15 +5,63 @@
Building and Installation:
"""""""""""""""""""""""""
@@ -3630,9 +3625,9 @@
BTW: XPP here does not stand for X Printing Panel, XML Pull Parser,
X-Windows Phase Plane or XML Professional Publisher. It is simply the
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/slic.c zaptel-xpp-oaIQ8i_dist/xpp/slic.c
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/slic.c zaptel-xpp-LJNBCn_dist/xpp/slic.c
--- zaptel-1.2.6/xpp/slic.c 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/slic.c 2006-05-01 12:37:15.907543000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/slic.c 2006-05-01 12:37:15.907543000 +0300
@@ -1,6 +1,6 @@
/*
* Written by Oron Peled <oron at actcom.co.il>
@@ -3710,9 +3705,9 @@
EXPORT_SYMBOL(slic_cmd_direct_write);
EXPORT_SYMBOL(slic_cmd_direct_read);
EXPORT_SYMBOL(slic_cmd_indirect_write);
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/slic.h zaptel-xpp-oaIQ8i_dist/xpp/slic.h
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/slic.h zaptel-xpp-LJNBCn_dist/xpp/slic.h
--- zaptel-1.2.6/xpp/slic.h 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/slic.h 2006-07-02 17:17:18.812352000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/slic.h 2006-07-02 17:17:18.812352000 +0300
@@ -1,5 +1,26 @@
#ifndef SLIC_H
#define SLIC_H
@@ -3761,9 +3756,9 @@
#endif /* SLIC_H */
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/slic_init.inc zaptel-xpp-oaIQ8i_dist/xpp/slic_init.inc
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/slic_init.inc zaptel-xpp-LJNBCn_dist/xpp/slic_init.inc
--- zaptel-1.2.6/xpp/slic_init.inc 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/slic_init.inc 1970-01-01 02:00:00.000000000 +0200
++++ zaptel-xpp-LJNBCn_dist/xpp/slic_init.inc 1970-01-01 02:00:00.000000000 +0200
@@ -1,65 +0,0 @@
-// ----------------------------------==== 8-channel FXS unit initialization ===-----------------------------------------
-
@@ -3830,9 +3825,9 @@
-S_(0x000000FF, 0x02, 0x42, 0x06),
-// -------------------------------------------------------------
-
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/supress/ec_xpp.h zaptel-xpp-oaIQ8i_dist/xpp/supress/ec_xpp.h
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/supress/ec_xpp.h zaptel-xpp-LJNBCn_dist/xpp/supress/ec_xpp.h
--- zaptel-1.2.6/xpp/supress/ec_xpp.h 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/supress/ec_xpp.h 2006-06-25 14:42:21.798100000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/supress/ec_xpp.h 2006-06-25 14:42:21.798100000 +0300
@@ -0,0 +1,100 @@
+#ifndef __EC_XPP_H__
+#define __EC_XPP_H__
@@ -3934,9 +3929,9 @@
+
+#endif
+
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/supress/suppressor.c zaptel-xpp-oaIQ8i_dist/xpp/supress/suppressor.c
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/supress/suppressor.c zaptel-xpp-LJNBCn_dist/xpp/supress/suppressor.c
--- zaptel-1.2.6/xpp/supress/suppressor.c 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/supress/suppressor.c 2006-06-25 14:42:21.798100000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/supress/suppressor.c 2006-06-25 14:42:21.798100000 +0300
@@ -0,0 +1,321 @@
+ /***********************************************************************
+ * Written by Sergey Serik.
@@ -4259,9 +4254,9 @@
+
+ return nearSample;
+}
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/supress/suppressor.h zaptel-xpp-oaIQ8i_dist/xpp/supress/suppressor.h
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/supress/suppressor.h zaptel-xpp-LJNBCn_dist/xpp/supress/suppressor.h
--- zaptel-1.2.6/xpp/supress/suppressor.h 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/supress/suppressor.h 2006-06-25 14:42:21.798100000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/supress/suppressor.h 2006-06-25 14:42:21.798100000 +0300
@@ -0,0 +1,160 @@
+#if 0 /* File Header */
+************************************************************************
@@ -4423,9 +4418,9 @@
+#endif
+
+#endif /* __SUPPRESSOR_H__ */
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/sync.sh zaptel-xpp-oaIQ8i_dist/xpp/sync.sh
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/sync.sh zaptel-xpp-LJNBCn_dist/xpp/sync.sh
--- zaptel-1.2.6/xpp/sync.sh 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/sync.sh 1970-01-01 02:00:00.000000000 +0200
++++ zaptel-xpp-LJNBCn_dist/xpp/sync.sh 1970-01-01 02:00:00.000000000 +0200
@@ -1,31 +0,0 @@
-#!/bin/sh
-
@@ -4458,10 +4453,10 @@
-cp -a $XORTEL_DIR/gen_slic_init ${TARGET_DIR}/
-cp -a $XPP_DIR/Makefile ${TARGET_DIR}/
-cp -a $XPP_DIR/slic_init.inc ${TARGET_DIR}/
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/FPGA_FXS.hex zaptel-xpp-oaIQ8i_dist/xpp/utils/FPGA_FXS.hex
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/fpga_load.8 zaptel-xpp-oaIQ8i_dist/xpp/utils/fpga_load.8
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/FPGA_FXS.hex zaptel-xpp-LJNBCn_dist/xpp/utils/FPGA_FXS.hex
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/fpga_load.8 zaptel-xpp-LJNBCn_dist/xpp/utils/fpga_load.8
--- zaptel-1.2.6/xpp/utils/fpga_load.8 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/utils/fpga_load.8 2006-04-16 16:20:04.117881000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/utils/fpga_load.8 2006-04-16 16:20:04.117881000 +0300
@@ -0,0 +1,72 @@
+.TH "FPGA_LOAD" "8" "16 April 2006" "" ""
+
@@ -4535,9 +4530,9 @@
+
+On Debian systems, the complete text of the GNU General Public
+License can be found in /usr/share/common-licenses/GPL.
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/fpga_load.c zaptel-xpp-oaIQ8i_dist/xpp/utils/fpga_load.c
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/fpga_load.c zaptel-xpp-LJNBCn_dist/xpp/utils/fpga_load.c
--- zaptel-1.2.6/xpp/utils/fpga_load.c 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/utils/fpga_load.c 2006-06-01 11:50:28.294045000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/utils/fpga_load.c 2006-06-01 11:50:28.294045000 +0300
@@ -0,0 +1,822 @@
+#include <stdio.h>
+#include <assert.h>
@@ -5361,10 +5356,10 @@
+ usb_cleanup(handle);
+ return ret;
+}
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/genzaptelconf zaptel-xpp-oaIQ8i_dist/xpp/utils/genzaptelconf
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/genzaptelconf zaptel-xpp-LJNBCn_dist/xpp/utils/genzaptelconf
--- zaptel-1.2.6/xpp/utils/genzaptelconf 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/utils/genzaptelconf 2006-06-27 20:23:31.736538000 +0300
-@@ -0,0 +1,954 @@
++++ zaptel-xpp-LJNBCn_dist/xpp/utils/genzaptelconf 2006-07-10 14:41:08.140923000 +0300
+@@ -0,0 +1,944 @@
+#! /bin/bash
+
+# genzaptelconf: generate as smartly as you can:
@@ -5404,6 +5399,8 @@
+# * Fixed timeout for Astribank load
+# * Delete unsuccessfully-probe modules
+# * Pass callerid from trunks
++# * A simpler wait_for_xpp using new proc wait_for_xpds
++# * fixed confusion between framing and coding for E1/{il/nl}
+# 0.5.2:
+# * Now it should detect most PRI cards and even wcusb
+# 0.5.1:
@@ -5852,20 +5849,8 @@
+ [ "`cat /sys/module/xpp/parameters/zap_autoreg`" = 'Y' ]
+ then
+ # wait for the XPDs to register:
-+ success=0
-+ for i in `seq 30`; do
-+ if ! grep -q 0 /proc/xpp/*/*/zt_registration 2>/dev/null
-+ then
-+ # There are either no XPDs or all of them are
-+ # registered. Nothing to do
-+ success=1
-+ break
-+ fi
-+ sleep 1
-+ done
-+ if [ "$success" = 0 ]; then
-+ echo 1>&2 "$0: WARNING: some XPD's are not registered yet (timeout)"
-+ fi
++ # TODO: improve error reporting and produce a messagee here
++ cat /proc/xpp/XBUS-*/wait_for_xpds 2>/dev/null >/dev/null || true
+ fi
+}
+
@@ -6089,15 +6074,15 @@
+ case "$lc_country" in
+ nl)
+ # (Just an example for per-country info)
-+ echo 'ami' >$tmp_dir/span_framing
-+ echo 'ccs' >$tmp_dir/span_coding
++ echo 'ccs' >$tmp_dir/span_framing
++ echo 'ami' >$tmp_dir/span_coding
+ #echo 'crc4' >$tmp_dir/span_yellow
+ #echo 'euroisdn' >$tmp_dir/span_switchtype
+ #echo 'pri_cpe' >$tmp_dir/span_signalling
+ ;;
+ il)
-+ echo 'hdb3' >$tmp_dir/span_framing
-+ echo 'ccs' >$tmp_dir/span_coding
++ echo 'ccs' >$tmp_dir/span_framing
++ echo 'hdb3' >$tmp_dir/span_coding
+ echo 'crc4' >$tmp_dir/span_yellow
+ echo 'euroisdn' >$tmp_dir/span_switchtype
+ esac
@@ -6319,9 +6304,9 @@
+fi
+
+# vim:ts=2:
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/genzaptelconf.8 zaptel-xpp-oaIQ8i_dist/xpp/utils/genzaptelconf.8
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/genzaptelconf.8 zaptel-xpp-LJNBCn_dist/xpp/utils/genzaptelconf.8
--- zaptel-1.2.6/xpp/utils/genzaptelconf.8 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/utils/genzaptelconf.8 2006-06-17 09:56:07.169240000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/utils/genzaptelconf.8 2006-06-17 09:56:07.169240000 +0300
@@ -0,0 +1,258 @@
+.TH GENZAPTELCONF 8 "July 18th, 2005" "Xorcom Rapid Asterisk" "Linux Programmer's Manual"
+.SH "NAME"
@@ -6581,9 +6566,9 @@
+
+On Debian systems, the complete text of the GNU General Public
+License can be found in /usr/share/common-licenses/GPL.
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/hexfile.c zaptel-xpp-oaIQ8i_dist/xpp/utils/hexfile.c
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/hexfile.c zaptel-xpp-LJNBCn_dist/xpp/utils/hexfile.c
--- zaptel-1.2.6/xpp/utils/hexfile.c 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/utils/hexfile.c 2006-06-18 17:05:04.917972000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/utils/hexfile.c 2006-06-18 17:05:04.917972000 +0300
@@ -0,0 +1,360 @@
+/*
+ * Written by Oron Peled <oron at actcom.co.il>
@@ -6945,9 +6930,9 @@
+ fclose(fp);
+}
+
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/hexfile.h zaptel-xpp-oaIQ8i_dist/xpp/utils/hexfile.h
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/hexfile.h zaptel-xpp-LJNBCn_dist/xpp/utils/hexfile.h
--- zaptel-1.2.6/xpp/utils/hexfile.h 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/utils/hexfile.h 2006-05-15 17:27:26.264723000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/utils/hexfile.h 2006-05-15 17:27:26.264723000 +0300
@@ -0,0 +1,120 @@
+/*
+ * Written by Oron Peled <oron at actcom.co.il>
@@ -7069,9 +7054,9 @@
+__END_DECLS
+
+#endif
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/Makefile zaptel-xpp-oaIQ8i_dist/xpp/utils/Makefile
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/Makefile zaptel-xpp-LJNBCn_dist/xpp/utils/Makefile
--- zaptel-1.2.6/xpp/utils/Makefile 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/utils/Makefile 2006-07-02 17:49:51.471281000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/utils/Makefile 2006-07-02 17:49:51.471281000 +0300
@@ -0,0 +1,50 @@
+PEDANTIC = -ansi -pedantic -std=c99
+
@@ -7123,9 +7108,9 @@
+
+clean:
+ $(RM) *.o $(TARGETS)
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/test_parse.c zaptel-xpp-oaIQ8i_dist/xpp/utils/test_parse.c
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/test_parse.c zaptel-xpp-LJNBCn_dist/xpp/utils/test_parse.c
--- zaptel-1.2.6/xpp/utils/test_parse.c 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/utils/test_parse.c 2006-05-15 17:27:26.264723000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/utils/test_parse.c 2006-05-15 17:27:26.264723000 +0300
@@ -0,0 +1,34 @@
+#include <stdio.h>
+#include <stdarg.h>
@@ -7161,11 +7146,11 @@
+ }
+ return 0;
+}
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/USB_1130.hex zaptel-xpp-oaIQ8i_dist/xpp/utils/USB_1130.hex
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/USB_8613.hex zaptel-xpp-oaIQ8i_dist/xpp/utils/USB_8613.hex
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/xpp_fxloader zaptel-xpp-oaIQ8i_dist/xpp/utils/xpp_fxloader
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/USB_1130.hex zaptel-xpp-LJNBCn_dist/xpp/utils/USB_1130.hex
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/USB_8613.hex zaptel-xpp-LJNBCn_dist/xpp/utils/USB_8613.hex
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/xpp_fxloader zaptel-xpp-LJNBCn_dist/xpp/utils/xpp_fxloader
--- zaptel-1.2.6/xpp/utils/xpp_fxloader 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/utils/xpp_fxloader 2006-07-02 17:49:51.471281000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/utils/xpp_fxloader 2006-07-02 17:49:51.471281000 +0300
@@ -0,0 +1,163 @@
+#!/bin/sh
+
@@ -7330,17 +7315,17 @@
+ ;;
+ esac
+fi
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/xpp_fxloader.usermap zaptel-xpp-oaIQ8i_dist/xpp/utils/xpp_fxloader.usermap
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/xpp_fxloader.usermap zaptel-xpp-LJNBCn_dist/xpp/utils/xpp_fxloader.usermap
--- zaptel-1.2.6/xpp/utils/xpp_fxloader.usermap 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/utils/xpp_fxloader.usermap 2006-05-01 18:45:04.050100000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/utils/xpp_fxloader.usermap 2006-05-01 18:45:04.050100000 +0300
@@ -0,0 +1,4 @@
+# module match_flags idVendor idProduct bcdDevice_lo bcdDevice_hi bDeviceClass bDeviceSubClass bDeviceProtocol bInterfaceClass bInterfaceSubClass bInterfaceProtocol driver_info
+xpp_fxloader 0x0003 0x04b4 0x8613 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x0
+xpp_fxloader 0x0003 0xe4e4 0x1130 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x0
+xpp_fxloader 0x0003 0xe4e4 0x1131 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x0
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/xpp_modprobe zaptel-xpp-oaIQ8i_dist/xpp/utils/xpp_modprobe
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/xpp_modprobe zaptel-xpp-LJNBCn_dist/xpp/utils/xpp_modprobe
--- zaptel-1.2.6/xpp/utils/xpp_modprobe 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/utils/xpp_modprobe 2006-05-01 17:08:34.781705000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/utils/xpp_modprobe 2006-05-01 17:08:34.781705000 +0300
@@ -0,0 +1,10 @@
+# Some debugging options for the brave of heart:
+#options zaptel debug=1
@@ -7352,9 +7337,9 @@
+
+# For pre-loading of card modules (e.g: xpp_fxs)
+#install xpp_usb /sbin/modprobe xpd_fxs && /sbin/modprobe --ignore-install xpp_usb
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xbus-core.c zaptel-xpp-oaIQ8i_dist/xpp/xbus-core.c
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xbus-core.c zaptel-xpp-LJNBCn_dist/xpp/xbus-core.c
--- zaptel-1.2.6/xpp/xbus-core.c 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/xbus-core.c 2006-07-03 12:11:26.109424000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/xbus-core.c 2006-07-03 12:11:26.109424000 +0300
@@ -0,0 +1,874 @@
+/*
+ * Written by Oron Peled <oron at actcom.co.il>
@@ -8230,9 +8215,9 @@
+EXPORT_SYMBOL(xbus_activate);
+EXPORT_SYMBOL(xbus_disconnect);
+EXPORT_SYMBOL(xbus_reset_counters);
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xbus-core.h zaptel-xpp-oaIQ8i_dist/xpp/xbus-core.h
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xbus-core.h zaptel-xpp-LJNBCn_dist/xpp/xbus-core.h
--- zaptel-1.2.6/xpp/xbus-core.h 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/xbus-core.h 2006-07-02 19:47:41.666262000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/xbus-core.h 2006-07-02 19:47:41.666262000 +0300
@@ -0,0 +1,56 @@
+/*
+ * Written by Oron Peled <oron at actcom.co.il>
@@ -8290,9 +8275,9 @@
+
+#endif /* XBUS_CORE_H */
+
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xdefs.h zaptel-xpp-oaIQ8i_dist/xpp/xdefs.h
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xdefs.h zaptel-xpp-LJNBCn_dist/xpp/xdefs.h
--- zaptel-1.2.6/xpp/xdefs.h 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/xdefs.h 2006-07-03 12:11:26.109424000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/xdefs.h 2006-07-03 12:11:26.109424000 +0300
@@ -2,7 +2,7 @@
#define XDEFS_H
/*
@@ -8398,9 +8383,9 @@
+
#endif /* XDEFS_H */
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xpd.h zaptel-xpp-oaIQ8i_dist/xpp/xpd.h
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xpd.h zaptel-xpp-LJNBCn_dist/xpp/xpd.h
--- zaptel-1.2.6/xpp/xpd.h 2006-03-03 22:14:09.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/xpd.h 2006-07-03 12:11:26.109424000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/xpd.h 2006-07-03 12:11:26.109424000 +0300
@@ -3,7 +3,7 @@
/*
@@ -8700,9 +8685,9 @@
#endif
#endif /* XPD_H */
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xpp_fxloader zaptel-xpp-oaIQ8i_dist/xpp/xpp_fxloader
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xpp_fxloader zaptel-xpp-LJNBCn_dist/xpp/xpp_fxloader
--- zaptel-1.2.6/xpp/xpp_fxloader 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/xpp_fxloader 1970-01-01 02:00:00.000000000 +0200
++++ zaptel-xpp-LJNBCn_dist/xpp/xpp_fxloader 1970-01-01 02:00:00.000000000 +0200
@@ -1,24 +0,0 @@
-#!/bin/sh
-
@@ -8728,15 +8713,15 @@
- fxload -t fx2 -D "$DEVICE" -I "$FIRMWARE" || exit 1
-fi
-
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xpp_fxloader.usermap zaptel-xpp-oaIQ8i_dist/xpp/xpp_fxloader.usermap
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xpp_fxloader.usermap zaptel-xpp-LJNBCn_dist/xpp/xpp_fxloader.usermap
--- zaptel-1.2.6/xpp/xpp_fxloader.usermap 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/xpp_fxloader.usermap 1970-01-01 02:00:00.000000000 +0200
++++ zaptel-xpp-LJNBCn_dist/xpp/xpp_fxloader.usermap 1970-01-01 02:00:00.000000000 +0200
@@ -1,2 +0,0 @@
-# module match_flags idVendor idProduct bcdDevice_lo bcdDevice_hi bDeviceClass bDeviceSubClass bDeviceProtocol bInterfaceClass bInterfaceSubClass bInterfaceProtocol driver_info
-xpp_fxloader 0x0003 0x04b4 0x8613 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x0
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xpp_modprobe zaptel-xpp-oaIQ8i_dist/xpp/xpp_modprobe
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xpp_modprobe zaptel-xpp-LJNBCn_dist/xpp/xpp_modprobe
--- zaptel-1.2.6/xpp/xpp_modprobe 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/xpp_modprobe 1970-01-01 02:00:00.000000000 +0200
++++ zaptel-xpp-LJNBCn_dist/xpp/xpp_modprobe 1970-01-01 02:00:00.000000000 +0200
@@ -1,10 +0,0 @@
-# Some debugging options for the brave of heart:
-#options zaptel debug=1
@@ -8748,9 +8733,9 @@
-
-# For auto loading of card modules
-alias xpd-type-3 xpd_fxs
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xpp_proto.c zaptel-xpp-oaIQ8i_dist/xpp/xpp_proto.c
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xpp_proto.c zaptel-xpp-LJNBCn_dist/xpp/xpp_proto.c
--- zaptel-1.2.6/xpp/xpp_proto.c 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/xpp_proto.c 1970-01-01 02:00:00.000000000 +0200
++++ zaptel-xpp-LJNBCn_dist/xpp/xpp_proto.c 1970-01-01 02:00:00.000000000 +0200
@@ -1,1044 +0,0 @@
-#include <linux/module.h>
-#include <linux/delay.h> /* for udelay */
@@ -9796,9 +9781,9 @@
-EXPORT_SYMBOL(packet_receive);
-EXPORT_SYMBOL(proc_xpd_slic_read);
-EXPORT_SYMBOL(proc_xpd_slic_write);
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xpp_proto.h zaptel-xpp-oaIQ8i_dist/xpp/xpp_proto.h
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xpp_proto.h zaptel-xpp-LJNBCn_dist/xpp/xpp_proto.h
--- zaptel-1.2.6/xpp/xpp_proto.h 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/xpp_proto.h 1970-01-01 02:00:00.000000000 +0200
++++ zaptel-xpp-LJNBCn_dist/xpp/xpp_proto.h 1970-01-01 02:00:00.000000000 +0200
@@ -1,188 +0,0 @@
-#ifndef XPP_PROTO_H
-#define XPP_PROTO_H
@@ -9988,9 +9973,9 @@
-#endif
-
-#endif /* XPP_PROTO_H */
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xpp_usb.c zaptel-xpp-oaIQ8i_dist/xpp/xpp_usb.c
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xpp_usb.c zaptel-xpp-LJNBCn_dist/xpp/xpp_usb.c
--- zaptel-1.2.6/xpp/xpp_usb.c 2006-04-03 10:08:13.000000000 +0300
-+++ zaptel-xpp-oaIQ8i_dist/xpp/xpp_usb.c 2006-07-04 17:49:04.495340000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/xpp_usb.c 2006-07-04 17:49:04.495340000 +0300
@@ -1,6 +1,6 @@
/*
* Written by Oron Peled <oron at actcom.co.il>
@@ -10838,9 +10823,9 @@
module_init(xpp_usb_init);
module_exit(xpp_usb_cleanup);
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xpp_zap.c zaptel-xpp-oaIQ8i_dist/xpp/xpp_zap.c
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xpp_zap.c zaptel-xpp-LJNBCn_dist/xpp/xpp_zap.c
--- zaptel-1.2.6/xpp/xpp_zap.c 2006-04-03 10:08:13.000000000 +0300
-+++ zaptel-xpp-oaIQ8i_dist/xpp/xpp_zap.c 2006-07-08 03:48:48.529239179 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/xpp_zap.c 2006-07-10 23:59:46.263727324 +0300
@@ -33,245 +33,64 @@
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -13212,9 +13197,9 @@
module_init(xpp_zap_init);
module_exit(xpp_zap_cleanup);
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xpp_zap.h zaptel-xpp-oaIQ8i_dist/xpp/xpp_zap.h
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xpp_zap.h zaptel-xpp-LJNBCn_dist/xpp/xpp_zap.h
--- zaptel-1.2.6/xpp/xpp_zap.h 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/xpp_zap.h 2006-07-02 19:47:41.666262000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/xpp_zap.h 2006-07-02 19:47:41.666262000 +0300
@@ -1,58 +1,54 @@
#ifndef XPP_ZAP_H
#define XPP_ZAP_H
@@ -13302,9 +13287,9 @@
+#define SPAN_REGISTERED(xpd) ((xpd)->span.flags & ZT_FLAG_REGISTERED)
#endif /* XPP_ZAP_H */
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xproto.c zaptel-xpp-oaIQ8i_dist/xpp/xproto.c
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xproto.c zaptel-xpp-LJNBCn_dist/xpp/xproto.c
--- zaptel-1.2.6/xpp/xproto.c 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/xproto.c 2006-07-03 12:11:26.109424000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/xproto.c 2006-07-03 12:11:26.109424000 +0300
@@ -1,6 +1,6 @@
/*
* Written by Oron Peled <oron at actcom.co.il>
@@ -13527,9 +13512,9 @@
NOTICE("%s: Bad xproto type %s (%d)\n", __FUNCTION__, name, type);
return;
}
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xproto.h zaptel-xpp-oaIQ8i_dist/xpp/xproto.h
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xproto.h zaptel-xpp-LJNBCn_dist/xpp/xproto.h
--- zaptel-1.2.6/xpp/xproto.h 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/xproto.h 2006-07-03 13:44:48.152691000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/xproto.h 2006-07-03 13:44:48.152691000 +0300
@@ -2,7 +2,7 @@
#define XPROTO_H
/*
@@ -13757,9 +13742,9 @@
};
void dump_packet(const char *msg, xpacket_t *packet, bool print_dbg);
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/zap_debug.c zaptel-xpp-oaIQ8i_dist/xpp/zap_debug.c
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/zap_debug.c zaptel-xpp-LJNBCn_dist/xpp/zap_debug.c
--- zaptel-1.2.6/xpp/zap_debug.c 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/zap_debug.c 2006-03-30 12:42:46.619481000 +0200
++++ zaptel-xpp-LJNBCn_dist/xpp/zap_debug.c 2006-03-30 12:42:46.619481000 +0200
@@ -1,6 +1,6 @@
/*
* Written by Oron Peled <oron at actcom.co.il>
@@ -13852,9 +13837,9 @@
EXPORT_SYMBOL(dump_poll);
-EXPORT_SYMBOL(event2str);
-EXPORT_SYMBOL(dump_sigtype);
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/zap_debug.h zaptel-xpp-oaIQ8i_dist/xpp/zap_debug.h
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/zap_debug.h zaptel-xpp-LJNBCn_dist/xpp/zap_debug.h
--- zaptel-1.2.6/xpp/zap_debug.h 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-oaIQ8i_dist/xpp/zap_debug.h 2006-06-19 10:36:29.741020000 +0300
++++ zaptel-xpp-LJNBCn_dist/xpp/zap_debug.h 2006-06-19 10:36:29.741020000 +0300
@@ -1,16 +1,125 @@
#ifndef ZAP_DEBUG_H
#define ZAP_DEBUG_H
More information about the Pkg-voip-commits
mailing list