[Pkg-voip-commits] r1982 - in zaptel/trunk/debian: . patches
Tzafrir Cohen
tzafrir-guest at costa.debian.org
Thu Jun 29 17:20:11 UTC 2006
Author: tzafrir-guest
Date: 2006-06-29 17:20:09 +0000 (Thu, 29 Jun 2006)
New Revision: 1982
Added:
zaptel/trunk/debian/patches/bristuff_local_zaptelh.dpatch
Modified:
zaptel/trunk/debian/changelog
zaptel/trunk/debian/patches/00list
zaptel/trunk/debian/patches/xpp_xorcom_debian.dpatch
zaptel/trunk/debian/rules
Log:
* bristuff_local_zaptelh.dpatch: Make bristuff modules respect
-DSTANDALONE_ZAPATA
* Slightly newer xpp driver
Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog 2006-06-29 16:44:20 UTC (rev 1981)
+++ zaptel/trunk/debian/changelog 2006-06-29 17:20:09 UTC (rev 1982)
@@ -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 r1460 (branches/RELEASE-1.1.0):
+ * xpp revision r1473 (branches/RELEASE-1.1.0):
- With EC
- FXS caller ID working
- Improved FXO
@@ -26,6 +26,8 @@
* debian/control: require libusb-dev for building xpp firmware loader.
* debian/control: Recommend package xpp-firmware (should be added to
non-free)
+ * bristuff_local_zaptelh.dpatch: Build bristuff modules with correct
+ zaptel.conf (in Sarge)
-- Kilian Krause <kilian at debian.org> Sat, 17 Jun 2006 16:05:32 +0200
Modified: zaptel/trunk/debian/patches/00list
===================================================================
--- zaptel/trunk/debian/patches/00list 2006-06-29 16:44:20 UTC (rev 1981)
+++ zaptel/trunk/debian/patches/00list 2006-06-29 17:20:09 UTC (rev 1982)
@@ -8,4 +8,6 @@
# touches the Makefile as well:
echocan_env
ukcid
+xpp_xorcom_debian
bristuff
+bristuff_local_zaptelh
Added: zaptel/trunk/debian/patches/bristuff_local_zaptelh.dpatch
===================================================================
--- zaptel/trunk/debian/patches/bristuff_local_zaptelh.dpatch 2006-06-29 16:44:20 UTC (rev 1981)
+++ zaptel/trunk/debian/patches/bristuff_local_zaptelh.dpatch 2006-06-29 17:20:09 UTC (rev 1982)
@@ -0,0 +1,104 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## bristuff_local_zaptelh.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Allow bristuff modules to be built in the same directory as
+## DP: zaptel itself (when -DSTANDALONE_ZAPATA is used)
+
+ at DPATCH@
+diff -urNad trunk/cwain/cwain.c /tmp/dpep.u4G4Tv/trunk/cwain/cwain.c
+--- trunk/cwain/cwain.c 2006-04-25 22:15:34.000000000 +0300
++++ /tmp/dpep.u4G4Tv/trunk/cwain/cwain.c 2006-06-27 18:23:08.474483444 +0300
+@@ -18,7 +18,11 @@
+ #include <linux/pci.h>
+ #include <linux/init.h>
+ #include <linux/interrupt.h>
+-#include <zaptel.h>
++#ifdef STANDALONE_ZAPATA
++#include "zaptel.h"
++#else
++#include <linux/zaptel.h>
++#endif
+ #include "cwain.h"
+
+ #if CONFIG_PCI
+diff -urNad trunk/qozap/qozap.c /tmp/dpep.u4G4Tv/trunk/qozap/qozap.c
+--- trunk/qozap/qozap.c 2006-04-25 16:37:39.000000000 +0300
++++ /tmp/dpep.u4G4Tv/trunk/qozap/qozap.c 2006-06-27 18:24:14.512637006 +0300
+@@ -15,7 +15,11 @@
+ #include <linux/pci.h>
+ #include <linux/init.h>
+ #include <linux/interrupt.h>
+-#include <zaptel.h>
++#ifdef STANDALONE_ZAPATA
++#include "zaptel.h"
++#else
++#include <linux/zaptel.h>
++#endif
+ #include "qozap.h"
+
+ #if CONFIG_PCI
+diff -urNad trunk/vzaphfc/fifo.c /tmp/dpep.u4G4Tv/trunk/vzaphfc/fifo.c
+--- trunk/vzaphfc/fifo.c 2006-06-19 15:54:22.000000000 +0300
++++ /tmp/dpep.u4G4Tv/trunk/vzaphfc/fifo.c 2006-06-27 18:24:37.470600452 +0300
+@@ -15,7 +15,11 @@
+
+ #include <linux/kernel.h>
+
+-#include <zaptel.h>
++#ifdef STANDALONE_ZAPATA
++#include "zaptel.h"
++#else
++#include <linux/zaptel.h>
++#endif
+
+ #include "fifo.h"
+
+diff -urNad trunk/vzaphfc/vzaphfc_main.c /tmp/dpep.u4G4Tv/trunk/vzaphfc/vzaphfc_main.c
+--- trunk/vzaphfc/vzaphfc_main.c 2006-06-19 15:54:22.000000000 +0300
++++ /tmp/dpep.u4G4Tv/trunk/vzaphfc/vzaphfc_main.c 2006-06-27 18:24:50.110883842 +0300
+@@ -33,7 +33,11 @@
+ #include <linux/netdevice.h>
+ #include <linux/if_arp.h>
+
+-#include <zaptel.h>
++#ifdef STANDALONE_ZAPATA
++#include "zaptel.h"
++#else
++#include <linux/zaptel.h>
++#endif
+
+ #include "vzaphfc.h"
+ #include "fifo.h"
+diff -urNad trunk/zaphfc/zaphfc.c /tmp/dpep.u4G4Tv/trunk/zaphfc/zaphfc.c
+--- trunk/zaphfc/zaphfc.c 2006-04-25 16:38:47.000000000 +0300
++++ /tmp/dpep.u4G4Tv/trunk/zaphfc/zaphfc.c 2006-06-27 18:25:06.105038433 +0300
+@@ -24,7 +24,11 @@
+ #include <linux/init.h>
+ #include <linux/interrupt.h>
+ #include <linux/delay.h>
+-#include <zaptel.h>
++#ifdef STANDALONE_ZAPATA
++#include "zaptel.h"
++#else
++#include <linux/zaptel.h>
++#endif
+ #include "zaphfc.h"
+
+ #if CONFIG_PCI
+diff -urNad trunk/ztgsm/ztgsm.c /tmp/dpep.u4G4Tv/trunk/ztgsm/ztgsm.c
+--- trunk/ztgsm/ztgsm.c 2006-04-25 16:48:02.000000000 +0300
++++ /tmp/dpep.u4G4Tv/trunk/ztgsm/ztgsm.c 2006-06-27 18:25:19.518522688 +0300
+@@ -14,7 +14,11 @@
+ #include <linux/pci.h>
+ #include <linux/init.h>
+ #include <linux/interrupt.h>
+-#include <zaptel.h>
++#ifdef STANDALONE_ZAPATA
++#include "zaptel.h"
++#else
++#include <linux/zaptel.h>
++#endif
+ #include "ztgsm.h"
+
+ #if CONFIG_PCI
Property changes on: zaptel/trunk/debian/patches/bristuff_local_zaptelh.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: zaptel/trunk/debian/patches/xpp_xorcom_debian.dpatch
===================================================================
--- zaptel/trunk/debian/patches/xpp_xorcom_debian.dpatch 2006-06-29 16:44:20 UTC (rev 1981)
+++ zaptel/trunk/debian/patches/xpp_xorcom_debian.dpatch 2006-06-29 17:20:09 UTC (rev 1982)
@@ -2,15 +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 r1462 (branches/RELEASE-1.1.0)
+## DP: Revision r1473 (branches/RELEASE-1.1.0)
## DP: This version omites the .version file and the firmware files.
@DPATCH@
-diff -uNr -x .svn -x debian zaptel-1.2.6/.version zaptel-xpp-XJ8JZx_dist/.version
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/card_fxo.c zaptel-xpp-XJ8JZx_dist/xpp/card_fxo.c
+diff -uNr -x .svn -x debian zaptel-1.2.6/.version zaptel-xpp-8WuH7d_dist/.version
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/card_fxo.c zaptel-xpp-8WuH7d_dist/xpp/card_fxo.c
--- zaptel-1.2.6/xpp/card_fxo.c 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/card_fxo.c 2006-06-22 11:31:28.427315000 +0300
++++ zaptel-xpp-8WuH7d_dist/xpp/card_fxo.c 2006-06-22 11:31:28.427315000 +0300
@@ -0,0 +1,926 @@
+/*
+ * Written by Oron Peled <oron at actcom.co.il>
@@ -938,9 +938,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-XJ8JZx_dist/xpp/card_fxo.h
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/card_fxo.h zaptel-xpp-8WuH7d_dist/xpp/card_fxo.h
--- zaptel-1.2.6/xpp/card_fxo.h 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/card_fxo.h 2006-03-30 12:42:46.619481000 +0200
++++ zaptel-xpp-8WuH7d_dist/xpp/card_fxo.h 2006-03-30 12:42:46.619481000 +0200
@@ -0,0 +1,65 @@
+#ifndef CARD_FXO_H
+#define CARD_FXO_H
@@ -1007,9 +1007,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-XJ8JZx_dist/xpp/card_fxs.c
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/card_fxs.c zaptel-xpp-8WuH7d_dist/xpp/card_fxs.c
--- zaptel-1.2.6/xpp/card_fxs.c 2006-04-03 10:08:13.000000000 +0300
-+++ zaptel-xpp-XJ8JZx_dist/xpp/card_fxs.c 2006-06-26 19:51:05.258875000 +0300
++++ zaptel-xpp-8WuH7d_dist/xpp/card_fxs.c 2006-06-27 19:12:14.132258000 +0300
@@ -1,6 +1,6 @@
/*
* Written by Oron Peled <oron at actcom.co.il>
@@ -1033,7 +1033,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 1457 2006-06-26 16:51:05Z tzafrir $";
++static const char rcsid[] = "$Id: card_fxs.c 1473 2006-06-27 16:12:14Z tzafrir $";
DEF_PARM(int, print_dbg, 0, "Print DBG statements"); /* must be before zap_debug.h */
@@ -1665,7 +1665,7 @@
}
- DBG("Channel CID: 0x%04X\n", lines);
+ DBG("%s/%s/%d:\n", xbus->busname, xpd->xpdname, pos);
-+ do_chan_power(xbus, xpd, BIT(pos), 0); // Low battery for normal (non-ring) operation
++ //do_chan_power(xbus, xpd, BIT(pos), 0); // Low battery for normal (non-ring) operation
XPACKET_NEW(pack, xbus, FXS, SLIC_WRITE, xpd->id);
sc = &RPACKET_FIELD(pack, FXS, SLIC_WRITE, slic_cmd);
- pack->datalen = slic_cmd_direct_write(sc, lines, 0x40, 0x02);
@@ -2128,9 +2128,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-XJ8JZx_dist/xpp/card_fxs.h
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/card_fxs.h zaptel-xpp-8WuH7d_dist/xpp/card_fxs.h
--- zaptel-1.2.6/xpp/card_fxs.h 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/card_fxs.h 2006-03-30 12:42:46.619481000 +0200
++++ zaptel-xpp-8WuH7d_dist/xpp/card_fxs.h 2006-03-30 12:42:46.619481000 +0200
@@ -2,7 +2,7 @@
#define CARD_FXS_H
/*
@@ -2165,9 +2165,9 @@
DEF_RPACKET_DATA(FXS, SIG_CHANGED,
byte type; /* unused -- we have it from DEV_DESC */
xpp_line_t sig_status; /* channels: lsb=1, msb=8 */
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/card_global.c zaptel-xpp-XJ8JZx_dist/xpp/card_global.c
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/card_global.c zaptel-xpp-8WuH7d_dist/xpp/card_global.c
--- zaptel-1.2.6/xpp/card_global.c 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/card_global.c 2006-03-30 12:42:46.619481000 +0200
++++ zaptel-xpp-8WuH7d_dist/xpp/card_global.c 2006-03-30 12:42:46.619481000 +0200
@@ -1,6 +1,6 @@
/*
* Written by Oron Peled <oron at actcom.co.il>
@@ -2244,9 +2244,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-XJ8JZx_dist/xpp/card_global.h
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/card_global.h zaptel-xpp-8WuH7d_dist/xpp/card_global.h
--- zaptel-1.2.6/xpp/card_global.h 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/card_global.h 2006-03-30 12:42:46.619481000 +0200
++++ zaptel-xpp-8WuH7d_dist/xpp/card_global.h 2006-03-30 12:42:46.619481000 +0200
@@ -2,7 +2,7 @@
#define CARD_GLOBAL_H
/*
@@ -2270,9 +2270,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-XJ8JZx_dist/xpp/cards.c
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/cards.c zaptel-xpp-8WuH7d_dist/xpp/cards.c
--- zaptel-1.2.6/xpp/cards.c 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/cards.c 1970-01-01 02:00:00.000000000 +0200
++++ zaptel-xpp-8WuH7d_dist/xpp/cards.c 1970-01-01 02:00:00.000000000 +0200
@@ -1,394 +0,0 @@
-#include <linux/module.h>
-#include "xpd.h"
@@ -2668,9 +2668,9 @@
- return NULL;
- return &xpd_card_ops[xpd_type];
-}
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/cards.h zaptel-xpp-XJ8JZx_dist/xpp/cards.h
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/cards.h zaptel-xpp-8WuH7d_dist/xpp/cards.h
--- zaptel-1.2.6/xpp/cards.h 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/cards.h 1970-01-01 02:00:00.000000000 +0200
++++ zaptel-xpp-8WuH7d_dist/xpp/cards.h 1970-01-01 02:00:00.000000000 +0200
@@ -1,23 +0,0 @@
-#ifndef CARDS_H
-#define CARDS_H
@@ -2695,9 +2695,9 @@
-xops_t *get_xops(xpd_type_t xpd_type);
-
-#endif /* CARDS_H */
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/cmd2inc zaptel-xpp-XJ8JZx_dist/xpp/cmd2inc
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/cmd2inc zaptel-xpp-8WuH7d_dist/xpp/cmd2inc
--- zaptel-1.2.6/xpp/cmd2inc 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/cmd2inc 2006-03-01 14:30:36.514598000 +0200
++++ zaptel-xpp-8WuH7d_dist/xpp/cmd2inc 2006-03-01 14:30:36.514598000 +0200
@@ -0,0 +1,48 @@
+#! /usr/bin/perl -w
+
@@ -2747,10 +2747,10 @@
+ }
+ print "\n";
+}
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/FPGA_XPD.hex zaptel-xpp-XJ8JZx_dist/xpp/FPGA_XPD.hex
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/gen_slic_init zaptel-xpp-XJ8JZx_dist/xpp/gen_slic_init
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/FPGA_XPD.hex zaptel-xpp-8WuH7d_dist/xpp/FPGA_XPD.hex
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/gen_slic_init zaptel-xpp-8WuH7d_dist/xpp/gen_slic_init
--- zaptel-1.2.6/xpp/gen_slic_init 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/gen_slic_init 1970-01-01 02:00:00.000000000 +0200
++++ zaptel-xpp-8WuH7d_dist/xpp/gen_slic_init 1970-01-01 02:00:00.000000000 +0200
@@ -1,37 +0,0 @@
-#! /usr/bin/perl -w
-
@@ -2789,9 +2789,9 @@
- }
- print HF "\n";
-}
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/init_data_3_19.cmd zaptel-xpp-XJ8JZx_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-8WuH7d_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-XJ8JZx_dist/xpp/init_data_3_19.cmd 2006-06-26 11:48:58.007317000 +0300
++++ zaptel-xpp-8WuH7d_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>
@@ -2962,9 +2962,9 @@
+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-XJ8JZx_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-8WuH7d_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-XJ8JZx_dist/xpp/init_data_3_20.cmd 2006-06-26 11:48:58.007317000 +0300
++++ zaptel-xpp-8WuH7d_dist/xpp/init_data_3_20.cmd 2006-06-26 11:48:58.007317000 +0300
@@ -0,0 +1,170 @@
+#
+# Written by Oron Peled <oron at actcom.co.il>
@@ -3136,9 +3136,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-XJ8JZx_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-8WuH7d_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-XJ8JZx_dist/xpp/init_data_4_19.cmd 2006-04-27 16:03:25.463235000 +0300
++++ zaptel-xpp-8WuH7d_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>
@@ -3209,9 +3209,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-XJ8JZx_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-8WuH7d_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-XJ8JZx_dist/xpp/init_data_4_20.cmd 2006-04-27 16:03:25.463235000 +0300
++++ zaptel-xpp-8WuH7d_dist/xpp/init_data_4_20.cmd 2006-04-27 16:03:25.463235000 +0300
@@ -0,0 +1,69 @@
+#
+# Written by Oron Peled <oron at actcom.co.il>
@@ -3282,9 +3282,9 @@
+
+; ----------- DAA ONHOOK --------------------
+FF FF 00 00 WD 05 00
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/initialize_registers zaptel-xpp-XJ8JZx_dist/xpp/initialize_registers
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/initialize_registers zaptel-xpp-8WuH7d_dist/xpp/initialize_registers
--- zaptel-1.2.6/xpp/initialize_registers 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/initialize_registers 2006-05-01 12:49:12.732258000 +0300
++++ zaptel-xpp-8WuH7d_dist/xpp/initialize_registers 2006-05-01 12:49:12.732258000 +0300
@@ -0,0 +1,39 @@
+#! /bin/sh
+# XPD_BUS - bus name
@@ -3325,9 +3325,9 @@
+$LOGGER "Wrote '$FILE' into '$SLICS'"
+
+exit 0
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/LICENSE.firmware zaptel-xpp-XJ8JZx_dist/xpp/LICENSE.firmware
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/LICENSE.firmware zaptel-xpp-8WuH7d_dist/xpp/LICENSE.firmware
--- zaptel-1.2.6/xpp/LICENSE.firmware 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/LICENSE.firmware 2006-05-01 22:45:43.558912000 +0300
++++ zaptel-xpp-8WuH7d_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.
@@ -3366,9 +3366,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-XJ8JZx_dist/xpp/Makefile
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/Makefile zaptel-xpp-8WuH7d_dist/xpp/Makefile
--- zaptel-1.2.6/xpp/Makefile 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/Makefile 2006-06-22 11:31:28.427315000 +0300
++++ zaptel-xpp-8WuH7d_dist/xpp/Makefile 2006-06-22 11:31:28.427315000 +0300
@@ -1,5 +1,30 @@
-EXTRA_CFLAGS = -I$(src)/.. -DSOFT_SIMULATOR=0
+EXTRA_CFLAGS = -I$(SUBDIRS) -DDEBUG -DWITH_ECHO_SUPPRESSION -DXPP_EC_CHUNK -DWITH_RBS # -DHARD_CODED_INIT # -DOLD_CARD
@@ -3404,9 +3404,9 @@
+$(obj)/card_fxo.o: $(obj)/init_data_4_19.inc $(obj)/init_data_4_20.inc
+
+endif
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/README.Astribank zaptel-xpp-XJ8JZx_dist/xpp/README.Astribank
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/README.Astribank zaptel-xpp-8WuH7d_dist/xpp/README.Astribank
--- zaptel-1.2.6/xpp/README.Astribank 2006-03-03 21:11:53.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/README.Astribank 2006-06-19 11:29:10.334411000 +0300
++++ zaptel-xpp-8WuH7d_dist/xpp/README.Astribank 2006-06-19 11:29:10.334411000 +0300
@@ -5,15 +5,63 @@
Building and Installation:
"""""""""""""""""""""""""
@@ -3520,9 +3520,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-XJ8JZx_dist/xpp/slic.c
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/slic.c zaptel-xpp-8WuH7d_dist/xpp/slic.c
--- zaptel-1.2.6/xpp/slic.c 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/slic.c 2006-05-01 12:37:15.907543000 +0300
++++ zaptel-xpp-8WuH7d_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>
@@ -3600,9 +3600,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-XJ8JZx_dist/xpp/slic.h
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/slic.h zaptel-xpp-8WuH7d_dist/xpp/slic.h
--- zaptel-1.2.6/xpp/slic.h 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/slic.h 2006-04-02 18:33:25.346374000 +0300
++++ zaptel-xpp-8WuH7d_dist/xpp/slic.h 2006-04-02 18:33:25.346374000 +0300
@@ -1,5 +1,26 @@
#ifndef SLIC_H
#define SLIC_H
@@ -3638,9 +3638,9 @@
#endif /* SLIC_H */
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/slic_init.inc zaptel-xpp-XJ8JZx_dist/xpp/slic_init.inc
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/slic_init.inc zaptel-xpp-8WuH7d_dist/xpp/slic_init.inc
--- zaptel-1.2.6/xpp/slic_init.inc 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/slic_init.inc 1970-01-01 02:00:00.000000000 +0200
++++ zaptel-xpp-8WuH7d_dist/xpp/slic_init.inc 1970-01-01 02:00:00.000000000 +0200
@@ -1,65 +0,0 @@
-// ----------------------------------==== 8-channel FXS unit initialization ===-----------------------------------------
-
@@ -3707,9 +3707,9 @@
-S_(0x000000FF, 0x02, 0x42, 0x06),
-// -------------------------------------------------------------
-
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/supress/ec_xpp.h zaptel-xpp-XJ8JZx_dist/xpp/supress/ec_xpp.h
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/supress/ec_xpp.h zaptel-xpp-8WuH7d_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-XJ8JZx_dist/xpp/supress/ec_xpp.h 2006-06-25 14:42:21.798100000 +0300
++++ zaptel-xpp-8WuH7d_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__
@@ -3811,9 +3811,9 @@
+
+#endif
+
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/supress/suppressor.c zaptel-xpp-XJ8JZx_dist/xpp/supress/suppressor.c
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/supress/suppressor.c zaptel-xpp-8WuH7d_dist/xpp/supress/suppressor.c
--- zaptel-1.2.6/xpp/supress/suppressor.c 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/supress/suppressor.c 2006-06-25 14:42:21.798100000 +0300
++++ zaptel-xpp-8WuH7d_dist/xpp/supress/suppressor.c 2006-06-25 14:42:21.798100000 +0300
@@ -0,0 +1,321 @@
+ /***********************************************************************
+ * Written by Sergey Serik.
@@ -4136,9 +4136,9 @@
+
+ return nearSample;
+}
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/supress/suppressor.h zaptel-xpp-XJ8JZx_dist/xpp/supress/suppressor.h
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/supress/suppressor.h zaptel-xpp-8WuH7d_dist/xpp/supress/suppressor.h
--- zaptel-1.2.6/xpp/supress/suppressor.h 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/supress/suppressor.h 2006-06-25 14:42:21.798100000 +0300
++++ zaptel-xpp-8WuH7d_dist/xpp/supress/suppressor.h 2006-06-25 14:42:21.798100000 +0300
@@ -0,0 +1,160 @@
+#if 0 /* File Header */
+************************************************************************
@@ -4300,9 +4300,9 @@
+#endif
+
+#endif /* __SUPPRESSOR_H__ */
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/sync.sh zaptel-xpp-XJ8JZx_dist/xpp/sync.sh
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/sync.sh zaptel-xpp-8WuH7d_dist/xpp/sync.sh
--- zaptel-1.2.6/xpp/sync.sh 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/sync.sh 1970-01-01 02:00:00.000000000 +0200
++++ zaptel-xpp-8WuH7d_dist/xpp/sync.sh 1970-01-01 02:00:00.000000000 +0200
@@ -1,31 +0,0 @@
-#!/bin/sh
-
@@ -4335,10 +4335,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-XJ8JZx_dist/xpp/utils/FPGA_FXS.hex
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/fpga_load.8 zaptel-xpp-XJ8JZx_dist/xpp/utils/fpga_load.8
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/FPGA_FXS.hex zaptel-xpp-8WuH7d_dist/xpp/utils/FPGA_FXS.hex
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/fpga_load.8 zaptel-xpp-8WuH7d_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-XJ8JZx_dist/xpp/utils/fpga_load.8 2006-04-16 16:20:04.117881000 +0300
++++ zaptel-xpp-8WuH7d_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" "" ""
+
@@ -4412,9 +4412,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-XJ8JZx_dist/xpp/utils/fpga_load.c
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/fpga_load.c zaptel-xpp-8WuH7d_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-XJ8JZx_dist/xpp/utils/fpga_load.c 2006-06-01 11:50:28.294045000 +0300
++++ zaptel-xpp-8WuH7d_dist/xpp/utils/fpga_load.c 2006-06-01 11:50:28.294045000 +0300
@@ -0,0 +1,822 @@
+#include <stdio.h>
+#include <assert.h>
@@ -5238,9 +5238,9 @@
+ usb_cleanup(handle);
+ return ret;
+}
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/genzaptelconf zaptel-xpp-XJ8JZx_dist/xpp/utils/genzaptelconf
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/genzaptelconf zaptel-xpp-8WuH7d_dist/xpp/utils/genzaptelconf
--- zaptel-1.2.6/xpp/utils/genzaptelconf 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/utils/genzaptelconf 2006-06-27 10:06:55.011704000 +0300
++++ zaptel-xpp-8WuH7d_dist/xpp/utils/genzaptelconf 2006-06-27 10:06:55.011704000 +0300
@@ -0,0 +1,953 @@
+#! /bin/bash
+
@@ -6195,9 +6195,9 @@
+fi
+
+# vim:ts=2:
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/genzaptelconf.8 zaptel-xpp-XJ8JZx_dist/xpp/utils/genzaptelconf.8
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/genzaptelconf.8 zaptel-xpp-8WuH7d_dist/xpp/utils/genzaptelconf.8
--- zaptel-1.2.6/xpp/utils/genzaptelconf.8 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/utils/genzaptelconf.8 2006-06-17 09:56:07.169240000 +0300
++++ zaptel-xpp-8WuH7d_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"
@@ -6457,9 +6457,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-XJ8JZx_dist/xpp/utils/hexfile.c
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/hexfile.c zaptel-xpp-8WuH7d_dist/xpp/utils/hexfile.c
--- zaptel-1.2.6/xpp/utils/hexfile.c 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/utils/hexfile.c 2006-06-18 17:05:04.917972000 +0300
++++ zaptel-xpp-8WuH7d_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>
@@ -6821,9 +6821,9 @@
+ fclose(fp);
+}
+
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/hexfile.h zaptel-xpp-XJ8JZx_dist/xpp/utils/hexfile.h
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/hexfile.h zaptel-xpp-8WuH7d_dist/xpp/utils/hexfile.h
--- zaptel-1.2.6/xpp/utils/hexfile.h 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/utils/hexfile.h 2006-05-15 17:27:26.264723000 +0300
++++ zaptel-xpp-8WuH7d_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>
@@ -6945,9 +6945,9 @@
+__END_DECLS
+
+#endif
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/Makefile zaptel-xpp-XJ8JZx_dist/xpp/utils/Makefile
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/Makefile zaptel-xpp-8WuH7d_dist/xpp/utils/Makefile
--- zaptel-1.2.6/xpp/utils/Makefile 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/utils/Makefile 2006-06-27 02:07:26.558841000 +0300
++++ zaptel-xpp-8WuH7d_dist/xpp/utils/Makefile 2006-06-27 02:07:26.558841000 +0300
@@ -0,0 +1,50 @@
+PEDANTIC = -ansi -pedantic -std=c99
+
@@ -6999,9 +6999,9 @@
+
+clean:
+ $(RM) *.o $(TARGETS)
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/test_parse.c zaptel-xpp-XJ8JZx_dist/xpp/utils/test_parse.c
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/test_parse.c zaptel-xpp-8WuH7d_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-XJ8JZx_dist/xpp/utils/test_parse.c 2006-05-15 17:27:26.264723000 +0300
++++ zaptel-xpp-8WuH7d_dist/xpp/utils/test_parse.c 2006-05-15 17:27:26.264723000 +0300
@@ -0,0 +1,34 @@
+#include <stdio.h>
+#include <stdarg.h>
@@ -7037,11 +7037,11 @@
+ }
+ return 0;
+}
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/USB_1130.hex zaptel-xpp-XJ8JZx_dist/xpp/utils/USB_1130.hex
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/USB_8613.hex zaptel-xpp-XJ8JZx_dist/xpp/utils/USB_8613.hex
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/xpp_fxloader zaptel-xpp-XJ8JZx_dist/xpp/utils/xpp_fxloader
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/USB_1130.hex zaptel-xpp-8WuH7d_dist/xpp/utils/USB_1130.hex
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/USB_8613.hex zaptel-xpp-8WuH7d_dist/xpp/utils/USB_8613.hex
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/xpp_fxloader zaptel-xpp-8WuH7d_dist/xpp/utils/xpp_fxloader
--- zaptel-1.2.6/xpp/utils/xpp_fxloader 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/utils/xpp_fxloader 2006-06-27 02:07:26.558841000 +0300
++++ zaptel-xpp-8WuH7d_dist/xpp/utils/xpp_fxloader 2006-06-27 02:07:26.558841000 +0300
@@ -0,0 +1,158 @@
+#!/bin/sh
+
@@ -7201,17 +7201,17 @@
+ ;;
+ esac
+fi
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/xpp_fxloader.usermap zaptel-xpp-XJ8JZx_dist/xpp/utils/xpp_fxloader.usermap
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/xpp_fxloader.usermap zaptel-xpp-8WuH7d_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-XJ8JZx_dist/xpp/utils/xpp_fxloader.usermap 2006-05-01 18:45:04.050100000 +0300
++++ zaptel-xpp-8WuH7d_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-XJ8JZx_dist/xpp/utils/xpp_modprobe
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/utils/xpp_modprobe zaptel-xpp-8WuH7d_dist/xpp/utils/xpp_modprobe
--- zaptel-1.2.6/xpp/utils/xpp_modprobe 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/utils/xpp_modprobe 2006-05-01 17:08:34.781705000 +0300
++++ zaptel-xpp-8WuH7d_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
@@ -7223,9 +7223,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-XJ8JZx_dist/xpp/xbus-core.c
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xbus-core.c zaptel-xpp-8WuH7d_dist/xpp/xbus-core.c
--- zaptel-1.2.6/xpp/xbus-core.c 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/xbus-core.c 2006-04-26 15:44:38.391672000 +0300
++++ zaptel-xpp-8WuH7d_dist/xpp/xbus-core.c 2006-04-26 15:44:38.391672000 +0300
@@ -0,0 +1,677 @@
+/*
+ * Written by Oron Peled <oron at actcom.co.il>
@@ -7904,9 +7904,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-XJ8JZx_dist/xpp/xbus-core.h
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xbus-core.h zaptel-xpp-8WuH7d_dist/xpp/xbus-core.h
--- zaptel-1.2.6/xpp/xbus-core.h 1970-01-01 02:00:00.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/xbus-core.h 2006-03-13 14:24:00.628259000 +0200
++++ zaptel-xpp-8WuH7d_dist/xpp/xbus-core.h 2006-03-13 14:24:00.628259000 +0200
@@ -0,0 +1,53 @@
+/*
+ * Written by Oron Peled <oron at actcom.co.il>
@@ -7961,9 +7961,9 @@
+
+#endif /* XBUS_CORE_H */
+
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xdefs.h zaptel-xpp-XJ8JZx_dist/xpp/xdefs.h
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xdefs.h zaptel-xpp-8WuH7d_dist/xpp/xdefs.h
--- zaptel-1.2.6/xpp/xdefs.h 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/xdefs.h 2006-03-30 12:42:46.619481000 +0200
++++ zaptel-xpp-8WuH7d_dist/xpp/xdefs.h 2006-03-30 12:42:46.619481000 +0200
@@ -2,7 +2,7 @@
#define XDEFS_H
/*
@@ -8025,9 +8025,9 @@
-
#endif /* XDEFS_H */
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xpd.h zaptel-xpp-XJ8JZx_dist/xpp/xpd.h
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xpd.h zaptel-xpp-8WuH7d_dist/xpp/xpd.h
--- zaptel-1.2.6/xpp/xpd.h 2006-03-03 22:14:09.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/xpd.h 2006-06-22 11:31:28.427315000 +0300
++++ zaptel-xpp-8WuH7d_dist/xpp/xpd.h 2006-06-22 11:31:28.427315000 +0300
@@ -3,7 +3,7 @@
/*
@@ -8250,9 +8250,9 @@
#endif
#endif /* XPD_H */
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xpp_fxloader zaptel-xpp-XJ8JZx_dist/xpp/xpp_fxloader
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xpp_fxloader zaptel-xpp-8WuH7d_dist/xpp/xpp_fxloader
--- zaptel-1.2.6/xpp/xpp_fxloader 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/xpp_fxloader 1970-01-01 02:00:00.000000000 +0200
++++ zaptel-xpp-8WuH7d_dist/xpp/xpp_fxloader 1970-01-01 02:00:00.000000000 +0200
@@ -1,24 +0,0 @@
-#!/bin/sh
-
@@ -8278,15 +8278,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-XJ8JZx_dist/xpp/xpp_fxloader.usermap
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xpp_fxloader.usermap zaptel-xpp-8WuH7d_dist/xpp/xpp_fxloader.usermap
--- zaptel-1.2.6/xpp/xpp_fxloader.usermap 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/xpp_fxloader.usermap 1970-01-01 02:00:00.000000000 +0200
++++ zaptel-xpp-8WuH7d_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-XJ8JZx_dist/xpp/xpp_modprobe
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xpp_modprobe zaptel-xpp-8WuH7d_dist/xpp/xpp_modprobe
--- zaptel-1.2.6/xpp/xpp_modprobe 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/xpp_modprobe 1970-01-01 02:00:00.000000000 +0200
++++ zaptel-xpp-8WuH7d_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
@@ -8298,9 +8298,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-XJ8JZx_dist/xpp/xpp_proto.c
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xpp_proto.c zaptel-xpp-8WuH7d_dist/xpp/xpp_proto.c
--- zaptel-1.2.6/xpp/xpp_proto.c 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/xpp_proto.c 1970-01-01 02:00:00.000000000 +0200
++++ zaptel-xpp-8WuH7d_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 */
@@ -9346,9 +9346,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-XJ8JZx_dist/xpp/xpp_proto.h
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xpp_proto.h zaptel-xpp-8WuH7d_dist/xpp/xpp_proto.h
--- zaptel-1.2.6/xpp/xpp_proto.h 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/xpp_proto.h 1970-01-01 02:00:00.000000000 +0200
++++ zaptel-xpp-8WuH7d_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
@@ -9538,9 +9538,9 @@
-#endif
-
-#endif /* XPP_PROTO_H */
-diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xpp_usb.c zaptel-xpp-XJ8JZx_dist/xpp/xpp_usb.c
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xpp_usb.c zaptel-xpp-8WuH7d_dist/xpp/xpp_usb.c
--- zaptel-1.2.6/xpp/xpp_usb.c 2006-04-03 10:08:13.000000000 +0300
-+++ zaptel-xpp-XJ8JZx_dist/xpp/xpp_usb.c 2006-05-01 18:45:04.050100000 +0300
++++ zaptel-xpp-8WuH7d_dist/xpp/xpp_usb.c 2006-05-01 18:45:04.050100000 +0300
@@ -1,6 +1,6 @@
/*
* Written by Oron Peled <oron at actcom.co.il>
@@ -10363,9 +10363,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-XJ8JZx_dist/xpp/xpp_zap.c
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xpp_zap.c zaptel-xpp-8WuH7d_dist/xpp/xpp_zap.c
--- zaptel-1.2.6/xpp/xpp_zap.c 2006-04-03 10:08:13.000000000 +0300
-+++ zaptel-xpp-XJ8JZx_dist/xpp/xpp_zap.c 2006-06-27 11:46:37.045294178 +0300
++++ zaptel-xpp-8WuH7d_dist/xpp/xpp_zap.c 2006-06-27 19:12:43.273949228 +0300
@@ -33,40 +33,34 @@
#include <linux/kernel.h>
#include <linux/errno.h>
@@ -12652,9 +12652,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-XJ8JZx_dist/xpp/xpp_zap.h
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xpp_zap.h zaptel-xpp-8WuH7d_dist/xpp/xpp_zap.h
--- zaptel-1.2.6/xpp/xpp_zap.h 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/xpp_zap.h 2006-03-30 12:42:46.619481000 +0200
++++ zaptel-xpp-8WuH7d_dist/xpp/xpp_zap.h 2006-03-30 12:42:46.619481000 +0200
@@ -1,37 +1,44 @@
#ifndef XPP_ZAP_H
#define XPP_ZAP_H
@@ -12731,9 +12731,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-XJ8JZx_dist/xpp/xproto.c
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xproto.c zaptel-xpp-8WuH7d_dist/xpp/xproto.c
--- zaptel-1.2.6/xpp/xproto.c 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/xproto.c 2006-06-22 11:31:28.427315000 +0300
++++ zaptel-xpp-8WuH7d_dist/xpp/xproto.c 2006-06-22 11:31:28.427315000 +0300
@@ -1,6 +1,6 @@
/*
* Written by Oron Peled <oron at actcom.co.il>
@@ -12896,9 +12896,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-XJ8JZx_dist/xpp/xproto.h
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/xproto.h zaptel-xpp-8WuH7d_dist/xpp/xproto.h
--- zaptel-1.2.6/xpp/xproto.h 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/xproto.h 2006-06-22 11:31:28.427315000 +0300
++++ zaptel-xpp-8WuH7d_dist/xpp/xproto.h 2006-06-22 11:31:28.427315000 +0300
@@ -2,7 +2,7 @@
#define XPROTO_H
/*
@@ -13052,9 +13052,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-XJ8JZx_dist/xpp/zap_debug.c
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/zap_debug.c zaptel-xpp-8WuH7d_dist/xpp/zap_debug.c
--- zaptel-1.2.6/xpp/zap_debug.c 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/zap_debug.c 2006-03-30 12:42:46.619481000 +0200
++++ zaptel-xpp-8WuH7d_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>
@@ -13147,9 +13147,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-XJ8JZx_dist/xpp/zap_debug.h
+diff -uNr -x .svn -x debian zaptel-1.2.6/xpp/zap_debug.h zaptel-xpp-8WuH7d_dist/xpp/zap_debug.h
--- zaptel-1.2.6/xpp/zap_debug.h 2006-02-15 04:24:18.000000000 +0200
-+++ zaptel-xpp-XJ8JZx_dist/xpp/zap_debug.h 2006-06-19 10:36:29.741020000 +0300
++++ zaptel-xpp-8WuH7d_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
Modified: zaptel/trunk/debian/rules
===================================================================
--- zaptel/trunk/debian/rules 2006-06-29 16:44:20 UTC (rev 1981)
+++ zaptel/trunk/debian/rules 2006-06-29 17:20:09 UTC (rev 1982)
@@ -129,7 +129,7 @@
# driver source code
mkdir -p $(TARDIR)/debian
- cp -r debian/makefiles/* $(TARDIR)/
+ #cp -r debian/makefiles/* $(TARDIR)/
cp .version *.c *.h *.rbt $(TARDIR)/
for dir in build_tools cwain qozap vzaphfc xpp zaphfc ztgsm; do \
if [ -d $$dir ]; then cp -r $$dir $(TARDIR); fi; \
More information about the Pkg-voip-commits
mailing list