[Pkg-voip-commits] r5780 - /asterisk/trunk/debian/patches/bristuff/zapata-gsm
paravoid at alioth.debian.org
paravoid at alioth.debian.org
Sun May 25 18:01:18 UTC 2008
Author: paravoid
Date: Sun May 25 18:01:17 2008
New Revision: 5780
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5780
Log:
Fix offsets in zapata-gsm that resulted in patch breakage
Modified:
asterisk/trunk/debian/patches/bristuff/zapata-gsm
Modified: asterisk/trunk/debian/patches/bristuff/zapata-gsm
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/zapata-gsm?rev=5780&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-gsm (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-gsm Sun May 25 18:01:17 2008
@@ -55,7 +55,7 @@
static struct zt_pri pris[NUM_SPANS];
-@@ -392,6 +411,7 @@ struct zt_pri;
+@@ -392,6 +412,7 @@ struct zt_pri;
#define POLARITY_REV 1
@@ -63,7 +63,7 @@
static struct zt_distRings drings;
struct distRingData {
-@@ -604,6 +624,9 @@ static struct zt_pvt {
+@@ -604,6 +625,9 @@ static struct zt_pvt {
int prioffset;
int logicalspan;
#endif
@@ -99,7 +99,7 @@
case 0:
return "Pseudo";
default:
-@@ -1683,7 +1708,7 @@ static inline int zt_confmute(struct zt_
+@@ -1683,7 +1710,7 @@ static inline int zt_confmute(struct zt_
{
int x, y, res;
x = muted;
@@ -108,7 +108,7 @@
y = 1;
res = ioctl(p->subs[SUB_REAL].zfd, ZT_AUDIOMODE, &y);
if (res)
-@@ -2098,6 +2123,25 @@ static int zt_call(struct ast_channel *a
+@@ -2098,6 +2125,25 @@ static int zt_call(struct ast_channel *a
p->dialdest[0] = '\0';
disable_dtmf_detect(p);
break;
@@ -134,7 +134,7 @@
default:
ast_log(LOG_DEBUG, "not yet implemented\n");
ast_mutex_unlock(&p->lock);
-@@ -2737,7 +2781,13 @@ static int zt_hangup(struct ast_channel
+@@ -2737,7 +2783,13 @@ static int zt_hangup(struct ast_channel
}
}
#endif
@@ -149,7 +149,7 @@
res = zt_set_hook(p->subs[SUB_REAL].zfd, ZT_ONHOOK);
if (res < 0) {
ast_log(LOG_WARNING, "Unable to hangup line %s\n", ast->name);
-@@ -2914,6 +2964,13 @@ static int zt_answer(struct ast_channel
+@@ -2914,6 +2966,13 @@ static int zt_answer(struct ast_channel
zt_train_ec(p);
break;
#endif
@@ -163,7 +163,7 @@
case 0:
ast_mutex_unlock(&p->lock);
return 0;
-@@ -7297,6 +7354,10 @@ static int pri_create_spanmap(int span,
+@@ -7297,6 +7356,10 @@ static int pri_create_spanmap(int span,
#endif
@@ -174,7 +174,7 @@
static struct zt_pvt *mkintf(int channel, struct zt_chan_conf conf, struct zt_pri *pri, int reloading)
{
/* Make a zt_pvt structure for this interface (or CRV if "pri" is specified) */
-@@ -7525,6 +7586,37 @@ static struct zt_pvt *mkintf(int channel
+@@ -7525,6 +7588,37 @@ static struct zt_pvt *mkintf(int channel
tmp->prioffset = 0;
}
#endif
@@ -212,7 +212,7 @@
} else {
conf.chan.sig = tmp->sig;
conf.chan.radio = tmp->radio;
-@@ -7814,6 +7906,12 @@ static inline int available(struct zt_pv
+@@ -7814,6 +7908,12 @@ static inline int available(struct zt_pv
return 1;
}
#endif
@@ -225,7 +225,7 @@
if (!(p->radio || (p->oprmode < 0)))
{
if (!p->sig || (p->sig == SIG_FXSLS))
-@@ -8171,6 +8269,235 @@ next:
+@@ -8171,6 +8271,235 @@ next:
return tmp;
}
@@ -461,7 +461,7 @@
#ifdef HAVE_PRI
static struct zt_pvt *pri_find_crv(struct zt_pri *pri, int crv)
{
-@@ -8450,6 +8777,18 @@ static void zt_pri_error(char *s, int sp
+@@ -8450,6 +8779,18 @@ static void zt_pri_error(char *s, int sp
ast_log(LOG_WARNING, "%d %s", span, s);
}
@@ -480,7 +480,7 @@
static int pri_check_restart(struct zt_pri *pri)
{
if ((pri->nodetype != PRI_NETWORK) && (pri->nodetype != PRI_CPE)) {
-@@ -10887,6 +11226,243 @@ static int app_zapInband(struct ast_chan
+@@ -10887,6 +11228,243 @@ static int app_zapInband(struct ast_chan
#endif /* HAVE_PRI */
@@ -724,7 +724,7 @@
static int app_zapEC(struct ast_channel *chan, void *data)
{
int res=-1;
-@@ -11508,6 +12084,12 @@ static int __unload_module(void)
+@@ -11508,6 +12086,12 @@ static int __unload_module(void)
ast_unregister_application(zapCD_app);
ast_unregister_application(zapInband_app);
#endif
@@ -737,7 +737,7 @@
ast_cli_unregister_multiple(zap_cli, sizeof(zap_cli) / sizeof(struct ast_cli_entry));
ast_unregister_application(zapEC_app);
ast_manager_unregister( "ZapDialOffhook" );
-@@ -12028,6 +12610,11 @@ static int process_zap(struct zt_chan_co
+@@ -12028,6 +12612,11 @@ static int process_zap(struct zt_chan_co
confp->chan.radio = 0;
confp->pri.nodetype = BRI_CPE;
#endif
@@ -749,7 +749,7 @@
} else {
ast_log(LOG_ERROR, "Unknown signalling method '%s'\n", v->value);
}
-@@ -12170,6 +12757,10 @@ static int process_zap(struct zt_chan_co
+@@ -12170,6 +12759,10 @@ static int process_zap(struct zt_chan_co
ast_copy_string(confp->pri.nocid, v->value, sizeof(confp->pri.nocid));
} else if (!strcasecmp(v->name, "withheldcid")) {
ast_copy_string(confp->pri.withheldcid, v->value, sizeof(confp->pri.withheldcid));
@@ -760,7 +760,7 @@
} else if (!strcasecmp(v->name, "resetinterval")) {
if (!strcasecmp(v->value, "never"))
confp->pri.resetinterval = -1;
-@@ -12524,6 +13115,10 @@ static int load_module(void)
+@@ -12524,6 +13117,10 @@ static int load_module(void)
ast_register_application(zap_send_keypad_facility_app, zap_send_keypad_facility_exec,
zap_send_keypad_facility_synopsis, zap_send_keypad_facility_descrip);
#endif
@@ -771,7 +771,7 @@
res = setup_zap(0);
/* Make sure we can register our Zap channel type */
if (res)
-@@ -12542,6 +13137,12 @@ static int load_module(void)
+@@ -12542,6 +13139,12 @@ static int load_module(void)
#endif
ast_register_application(zapEC_app, app_zapEC, zapEC_synopsis, zapEC_tdesc);
ast_cli_register_multiple(zap_cli, sizeof(zap_cli) / sizeof(struct ast_cli_entry));
@@ -784,7 +784,7 @@
memset(round_robin, 0, sizeof(round_robin));
ast_manager_register( "ZapTransfer", 0, action_transfer, "Transfer Zap Channel" );
-@@ -12555,7 +13156,48 @@ static int load_module(void)
+@@ -12555,7 +13158,66 @@ static int load_module(void)
return res;
}
More information about the Pkg-voip-commits
mailing list