[asterisk-commits] oej: branch oej/codename-pineapple r48218 - in
/team/oej/codename-pineapple: ...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Sat Dec 2 14:04:37 MST 2006
Author: oej
Date: Sat Dec 2 15:04:36 2006
New Revision: 48218
URL: http://svn.digium.com/view/asterisk?view=rev&rev=48218
Log:
Update to trunk
Removed:
team/oej/codename-pineapple/main/coef_in.h
team/oej/codename-pineapple/main/coef_out.h
Modified:
team/oej/codename-pineapple/ (props changed)
team/oej/codename-pineapple/apps/app_sms.c
team/oej/codename-pineapple/channels/chan_sip3.c
team/oej/codename-pineapple/channels/sip3/sip3.h
team/oej/codename-pineapple/main/callerid.c
team/oej/codename-pineapple/main/fskmodem.c
team/oej/codename-pineapple/main/tdd.c
Propchange: team/oej/codename-pineapple/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Dec 2 15:04:36 2006
@@ -1,1 +1,1 @@
-/trunk:1-48201
+/trunk:1-48206
Modified: team/oej/codename-pineapple/apps/app_sms.c
URL: http://svn.digium.com/view/asterisk/team/oej/codename-pineapple/apps/app_sms.c?view=diff&rev=48218&r1=48217&r2=48218
==============================================================================
--- team/oej/codename-pineapple/apps/app_sms.c (original)
+++ team/oej/codename-pineapple/apps/app_sms.c Sat Dec 2 15:04:36 2006
@@ -119,59 +119,59 @@
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
};
-#define SMSLEN 160 /* max SMS length */
+#define SMSLEN 160 /*!< max SMS length */
typedef struct sms_s
{
- unsigned char hangup; /* we are done... */
- unsigned char err; /* set for any errors */
- unsigned char smsc:1; /* we are SMSC */
- unsigned char rx:1; /* this is a received message */
- char queue[30]; /* queue name */
- char oa[20]; /* originating address */
- char da[20]; /* destination address */
- time_t scts; /* time stamp, UTC */
- unsigned char pid; /* protocol ID */
- unsigned char dcs; /* data coding scheme */
- short mr; /* message reference - actually a byte, but usde -1 for not set */
- int udl; /* user data length */
- int udhl; /* user data header length */
- unsigned char srr:1; /* Status Report request */
- unsigned char udhi:1; /* User Data Header required, even if length 0 */
- unsigned char rp:1; /* Reply Path */
- unsigned int vp; /* validity period in minutes, 0 for not set */
- unsigned short ud[SMSLEN]; /* user data (message), UCS-2 coded */
- unsigned char udh[SMSLEN]; /* user data header */
- char cli[20]; /* caller ID */
- unsigned char ophase; /* phase (0-79) for 0 and 1 frequencies (1300Hz and 2100Hz) */
- unsigned char ophasep; /* phase (0-79) for 1200 bps */
- unsigned char obyte; /* byte being sent */
- unsigned int opause; /* silent pause before sending (in sample periods) */
- unsigned char obitp; /* bit in byte */
- unsigned char osync; /* sync bits to send */
- unsigned char obytep; /* byte in data */
- unsigned char obyten; /* bytes in data */
- unsigned char omsg[256]; /* data buffer (out) */
- unsigned char imsg[200]; /* data buffer (in) */
+ unsigned char hangup; /*!< we are done... */
+ unsigned char err; /*!< set for any errors */
+ unsigned char smsc:1; /*!< we are SMSC */
+ unsigned char rx:1; /*!< this is a received message */
+ char queue[30]; /*!< queue name */
+ char oa[20]; /*!< originating address */
+ char da[20]; /*!< destination address */
+ time_t scts; /*!< time stamp, UTC */
+ unsigned char pid; /*!< protocol ID */
+ unsigned char dcs; /*!< data coding scheme */
+ short mr; /*!< message reference - actually a byte, but usde -1 for not set */
+ int udl; /*!< user data length */
+ int udhl; /*!< user data header length */
+ unsigned char srr:1; /*!< Status Report request */
+ unsigned char udhi:1; /*!< User Data Header required, even if length 0 */
+ unsigned char rp:1; /*!< Reply Path */
+ unsigned int vp; /*!< validity period in minutes, 0 for not set */
+ unsigned short ud[SMSLEN]; /*!< user data (message), UCS-2 coded */
+ unsigned char udh[SMSLEN]; /*!< user data header */
+ char cli[20]; /*!< caller ID */
+ unsigned char ophase; /*!< phase (0-79) for 0 and 1 frequencies (1300Hz and 2100Hz) */
+ unsigned char ophasep; /*!< phase (0-79) for 1200 bps */
+ unsigned char obyte; /*!< byte being sent */
+ unsigned int opause; /*!< silent pause before sending (in sample periods) */
+ unsigned char obitp; /*!< bit in byte */
+ unsigned char osync; /*!< sync bits to send */
+ unsigned char obytep; /*!< byte in data */
+ unsigned char obyten; /*!< bytes in data */
+ unsigned char omsg[256]; /*!< data buffer (out) */
+ unsigned char imsg[200]; /*!< data buffer (in) */
signed long long ims0,
imc0,
ims1,
- imc1; /* magnitude averages sin/cos 0/1 */
+ imc1; /*!< magnitude averages sin/cos 0/1 */
unsigned int idle;
- unsigned short imag; /* signal level */
+ unsigned short imag; /*!< signal level */
unsigned char ips0,
ips1,
ipc0,
- ipc1; /* phase sin/cos 0/1 */
- unsigned char ibitl; /* last bit */
- unsigned char ibitc; /* bit run length count */
- unsigned char iphasep; /* bit phase (0-79) for 1200 bps */
- unsigned char ibitn; /* bit number in byte being received */
- unsigned char ibytev; /* byte value being received */
- unsigned char ibytep; /* byte pointer in messafe */
- unsigned char ibytec; /* byte checksum for message */
- unsigned char ierr; /* error flag */
- unsigned char ibith; /* history of last bits */
+ ipc1; /*!< phase sin/cos 0/1 */
+ unsigned char ibitl; /*!< last bit */
+ unsigned char ibitc; /*!< bit run length count */
+ unsigned char iphasep; /*!< bit phase (0-79) for 1200 bps */
+ unsigned char ibitn; /*!< bit number in byte being received */
+ unsigned char ibytev; /*!< byte value being received */
+ unsigned char ibytep; /*!< byte pointer in messafe */
+ unsigned char ibytec; /*!< byte checksum for message */
+ unsigned char ierr; /*!< error flag */
+ unsigned char ibith; /*!< history of last bits */
unsigned char ibitt; /* total of 1's in last 3 bites */
/* more to go here */
} sms_t;
Modified: team/oej/codename-pineapple/channels/chan_sip3.c
URL: http://svn.digium.com/view/asterisk/team/oej/codename-pineapple/channels/chan_sip3.c?view=diff&rev=48218&r1=48217&r2=48218
==============================================================================
--- team/oej/codename-pineapple/channels/chan_sip3.c (original)
+++ team/oej/codename-pineapple/channels/chan_sip3.c Sat Dec 2 15:04:36 2006
@@ -1318,11 +1318,16 @@
return 0;
}
/* If the call is not UP, we need to send CANCEL instead of BYE */
- if (ast->_state == AST_STATE_RING || ast->_state == AST_STATE_RINGING) {
+ /*! \note XXX This need to check invitestate to handle early media !!!*/
+ if (p->state < INV_STATE_COMPLETED) {
needcancel = TRUE;
- if (option_debug > 3)
- ast_log(LOG_DEBUG, "Hanging up channel in state %s (not UP)\n", ast_state2str(ast->_state));
- }
+ if (option_debug > 3) {
+ ast_log(LOG_DEBUG, "Hanging up channel in AST state %s (not UP)\n", ast_state2str(ast->_state));
+ ast_log(LOG_DEBUG, "Hanging up channel in SIP state %s\n", dialogstate2str(p->state));
+ }
+ }
+
+ if (option_debug > 2)
/* Disconnect */
if (p->vad)
@@ -1340,7 +1345,7 @@
*/
if (ast_test_flag(&p->flags[0], SIP_ALREADYGONE))
needdestroy = 1; /* Set destroy flag at end of this function */
- else
+ else /* ONLY do this if we're in UP state */
sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
/* Start the process if it's not already started */
@@ -1405,6 +1410,7 @@
but we can't send one while we have "INVITE" outstanding. */
ast_set_flag(&p->flags[0], SIP_PENDINGBYE);
ast_clear_flag(&p->flags[0], SIP_NEEDREINVITE);
+ sip_clear_destroy(p);
}
}
}
@@ -1660,6 +1666,7 @@
/* Send 180 ringing if out-of-band seems reasonable */
transmit_response(p, "180 Ringing", &p->initreq);
ast_set_flag(&p->flags[0], SIP_RINGING);
+ dialogstatechange(p, DIALOG_STATE_PROCEEDING);
if (ast_test_flag(&p->flags[0], SIP_PROG_INBAND) != SIP_PROG_INBAND_YES)
break;
} else {
@@ -1672,6 +1679,7 @@
if (ast->_state != AST_STATE_UP) {
transmit_final_response(p, "486 Busy Here", &p->initreq, XMIT_RELIABLE);
ast_softhangup_nolock(ast, AST_SOFTHANGUP_DEV);
+ dialogstatechange(p, DIALOG_STATE_CONFIRMED);
break;
}
res = -1;
@@ -1680,6 +1688,7 @@
if (ast->_state != AST_STATE_UP) {
transmit_final_response(p, "503 Service Unavailable", &p->initreq, XMIT_RELIABLE);
ast_softhangup_nolock(ast, AST_SOFTHANGUP_DEV);
+ dialogstatechange(p, DIALOG_STATE_CONFIRMED);
break;
}
res = -1;
@@ -1689,6 +1698,7 @@
!ast_test_flag(&p->flags[0], SIP_PROGRESS_SENT) &&
!ast_test_flag(&p->flags[0], SIP_OUTGOING)) {
transmit_response(p, "100 Trying", &p->initreq);
+ dialogstatechange(p, DIALOG_STATE_PROCEEDING);
break;
}
res = -1;
@@ -1699,6 +1709,7 @@
!ast_test_flag(&p->flags[0], SIP_OUTGOING)) {
transmit_response_with_attachment(WITH_SDP, p, "183 Session Progress", &p->initreq, XMIT_UNRELIABLE);
ast_set_flag(&p->flags[0], SIP_PROGRESS_SENT);
+ dialogstatechange(p, DIALOG_STATE_PROCEEDING);
break;
}
res = -1;
Modified: team/oej/codename-pineapple/channels/sip3/sip3.h
URL: http://svn.digium.com/view/asterisk/team/oej/codename-pineapple/channels/sip3/sip3.h?view=diff&rev=48218&r1=48217&r2=48218
==============================================================================
--- team/oej/codename-pineapple/channels/sip3/sip3.h (original)
+++ team/oej/codename-pineapple/channels/sip3/sip3.h Sat Dec 2 15:04:36 2006
@@ -321,13 +321,14 @@
/*!< SIP RFC 3261 states for the INVITE transaction */
enum invitetrans_state {
- INV_STATE_CALLING, /*!< Early state. Invite sent (only for client) */
- INV_STATE_PROCEEDING, /*!< Sent/Got 1xx message */
- INV_STATE_COMPLETED, /*!< Sent/Got 300-699 message, Waiting for ACK, Then CONFIRMED */
- INV_STATE_CONFIRMED, /*!< For server transactions: We got an ACK (no more retries) */
- INV_STATE_TERMINATED, /*!< Sent/Got Transaction completed, finished, over and out buddy
+ INV_STATE_CALLING = 1, /*!< Early state. Invite sent (only for client) */
+ INV_STATE_PROCEEDING = 2, /*!< Sent/Got 1xx message */
+ INV_STATE_PROCEEDING_EARLY_MEDIA = 3, /*!< Sent/Got 18x message */
+ INV_STATE_COMPLETED = 3, /*!< Sent/Got 300-699 message, Waiting for ACK, Then CONFIRMED */
+ INV_STATE_CONFIRMED = 4, /*!< For server transactions: We got an ACK (no more retries) */
+ INV_STATE_TERMINATED = 5, /*!< Sent/Got Transaction completed, finished, over and out buddy
- We might have a call or not - check p->owner->_state */
- INV_STATE_CANCELLED, /*!< Sent/Got CANCEL or BYE in non-TERMINATED state */
+ INV_STATE_CANCELLED = 6, /*!< Sent/Got CANCEL or BYE in non-TERMINATED state */
};
/*! \brief Transaction state for non-invite transactions */
Modified: team/oej/codename-pineapple/main/callerid.c
URL: http://svn.digium.com/view/asterisk/team/oej/codename-pineapple/main/callerid.c?view=diff&rev=48218&r1=48217&r2=48218
==============================================================================
--- team/oej/codename-pineapple/main/callerid.c (original)
+++ team/oej/codename-pineapple/main/callerid.c Sat Dec 2 15:04:36 2006
@@ -81,7 +81,7 @@
{
int x;
float t;
- for (x=0;x<len;x++) {
+ for (x = 0; x < len; x++) {
t = *cr1 * ddr1 - *ci1 * ddi1;
*ci1 = *cr1 * ddi1 + *ci1 * ddr1;
*cr1 = t;
@@ -103,7 +103,7 @@
{
int x;
float t;
- for (x=0;x<len;x++) {
+ for (x = 0; x < len; x++) {
t = *cr1 * ddr1 - *ci1 * ddi1;
*ci1 = *cr1 * ddi1 + *ci1 * ddr1;
*cr1 = t;
@@ -226,8 +226,8 @@
}
number[i] = 0;
} else {
- ast_log(LOG_DEBUG, "Unknown CID protocol, start digit '%c'\n",
- cidstring[0]);
+ if (option_debug)
+ ast_log(LOG_DEBUG, "Unknown CID protocol, start digit '%c'\n", cidstring[0]);
*flags = CID_UNKNOWN_NUMBER;
}
}
@@ -235,11 +235,12 @@
int ast_gen_cas(unsigned char *outbuf, int sendsas, int len, int codec)
{
int pos = 0;
- int saslen=2400;
+ int saslen = 2400;
float cr1 = 1.0;
float ci1 = 0.0;
float cr2 = 1.0;
float ci2 = 0.0;
+
if (sendsas) {
if (len < saslen)
return -1;
@@ -262,12 +263,11 @@
for (i = 0; i < CHAR_BIT; i++) {
org <<= 1;
dst >>= 1;
- if (org & 0x100) {
+ if (org & 0x100)
dst |= 0x80;
- }
- }
- data = (unsigned char)dst;
- crc ^= (unsigned int)data << (16 - CHAR_BIT);
+ }
+ data = (unsigned char) dst;
+ crc ^= (unsigned int) data << (16 - CHAR_BIT);
for (j = 0; j < CHAR_BIT; j++) {
if (crc & 0x8000U)
crc = (crc << 1) ^ 0x1021U ;
@@ -290,7 +290,7 @@
buf = alloca(2 * len + cid->oldlen);
memcpy(buf, cid->oldstuff, cid->oldlen);
- mylen += cid->oldlen/2;
+ mylen += cid->oldlen / 2;
for (x = 0; x < len; x++)
buf[x+cid->oldlen/2] = AST_XLAW(ubuf[x]);
@@ -344,24 +344,20 @@
}
break;
case 1: /* SOH */
- if (b == 0x01) {
+ if (b == 0x01)
cid->sawflag = 2;
- }
break ;
case 2: /* HEADER */
- if (b == 0x07) {
+ if (b == 0x07)
cid->sawflag = 3;
- }
break;
case 3: /* STX */
- if (b == 0x02) {
+ if (b == 0x02)
cid->sawflag = 4;
- }
break;
case 4: /* SERVICE TYPE */
- if (b == 0x40) {
+ if (b == 0x40)
cid->sawflag = 5;
- }
break;
case 5: /* Frame Length */
cid->sawflag = 6;
@@ -401,7 +397,7 @@
return -1;
}
/* extract caller id data */
- for (x=0; x<cid->pos;) {
+ for (x = 0; x < cid->pos;) {
switch (cid->rawdata[x++]) {
case 0x02: /* caller id number */
cid->number[0] = '\0';
@@ -690,7 +686,8 @@
struct tm tm;
char *ptr;
int res;
- int i,x;
+ int i, x;
+
/* Get the time */
time(&t);
localtime_r(&t,&tm);
@@ -715,7 +712,8 @@
} else {
/* Send up to 16 digits of number MAX */
i = strlen(number);
- if (i > 16) i = 16;
+ if (i > 16)
+ i = 16;
res = snprintf(ptr, size, "\002%c", i);
size -= res;
ptr += res;
@@ -739,11 +737,12 @@
} else {
/* Send up to 16 digits of name MAX */
i = strlen(name);
- if (i > 16) i = 16;
+ if (i > 16)
+ i = 16;
res = snprintf(ptr, size, "\007%c", i);
size -= res;
ptr += res;
- for (x=0;x<i;x++)
+ for (x = 0; x < i; x++)
ptr[x] = name[x];
ptr[i] = '\0';
ptr += i;
@@ -763,6 +762,7 @@
float cr = 1.0;
float ci = 0.0;
float scont = 0.0;
+
if (mdmf) {
/* MDMF Message waiting */
msg[len++] = 0x82;
Modified: team/oej/codename-pineapple/main/fskmodem.c
URL: http://svn.digium.com/view/asterisk/team/oej/codename-pineapple/main/fskmodem.c?view=diff&rev=48218&r1=48217&r2=48218
==============================================================================
--- team/oej/codename-pineapple/main/fskmodem.c (original)
+++ team/oej/codename-pineapple/main/fskmodem.c Sat Dec 2 15:04:36 2006
@@ -25,6 +25,9 @@
* \author Mark Spencer <markster at digium.com>
*
* \arg Includes code and algorithms from the Zapata library.
+ *
+ * \todo - REMOVE ALL SPANISH COMMENTS AND TRANSLATE THEM TO ENGLISH. Thank you.
+ * Swedish will work too :-)
*/
#include "asterisk.h"
@@ -52,83 +55,113 @@
(*buffer)++;
(*len)--;
return retval;
-}
+};
#define GET_SAMPLE get_sample(&buffer, len)
/* Coeficientes para filtros de entrada */
/* Tabla de coeficientes, generada a partir del programa "mkfilter" */
/* Formato: coef[IDX_FREC][IDX_BW][IDX_COEF] */
-/* IDX_COEF=0 => 1/GAIN */
-/* IDX_COEF=1-6 => Coeficientes y[n] */
-
-static double coef_in[NF][NBW][8]={
-#include "coef_in.h"
+/* IDX_COEF = 0 => 1/GAIN */
+/* IDX_COEF = 1-6 => Coeficientes y[n] */
+
+static double coef_in[NF][NBW][8] = {
+ {
+ { 1.8229206611e-04,-7.8997325866e-01,2.2401819940e+00,-4.6751353581e+00,5.5080745712e+00,-5.0571565772e+00,2.6215820004e+00,0.0000000000e+00, },
+ { 9.8532175289e-02,-5.6297236492e-02,3.3146713415e-01,-9.2239200436e-01,1.4844365184e+00,-2.0183258642e+00,2.0074154497e+00,0.0000000000e+00, },
+ },
+ {
+ { 1.8229206610e-04,-7.8997325866e-01,7.7191410839e-01,-2.8075643964e+00,1.6948618347e+00,-3.0367273700e+00,9.0333559408e-01,0.0000000000e+00, } ,
+ { 9.8531161839e-02,-5.6297236492e-02,1.1421579050e-01,-4.8122536483e-01,4.0121072432e-01,-7.4834487567e-01,6.9170822332e-01,0.0000000000e+00, },
+ },
+ {
+ { 1.8229206611e-04,-7.8997325866e-01,2.9003821430e+00,-6.1082779024e+00,7.7169345751e+00,-6.6075999680e+00,3.3941838836e+00,0.0000000000e+00, },
+ { 9.8539686961e-02,-5.6297236492e-02,4.2915323820e-01,-1.2609358633e+00,2.2399213250e+00,-2.9928879142e+00,2.5990173742e+00,0.0000000000e+00, },
+ },
+ {
+ { 1.8229206610e-04,-7.8997325866e-01,-7.7191410839e-01,-2.8075643964e+00,-1.6948618347e+00,-3.0367273700e+00,-9.0333559408e-01,0.0000000000e+00, },
+ { 9.8531161839e-02,-5.6297236492e-02,-1.1421579050e-01,-4.8122536483e-01,-4.0121072432e-01,-7.4834487567e-01,-6.9170822332e-01,0.0000000000e+00, },
+ },
+ {
+ { 1.8229206611e-04,-7.8997325866e-01,2.5782298908e+00,-5.3629717478e+00,6.5890882172e+00,-5.8012914776e+00,3.0171839130e+00,0.0000000000e+00, },
+ { 9.8534230718e-02,-5.6297236492e-02,3.8148618075e-01,-1.0848760410e+00,1.8441165168e+00,-2.4860666655e+00,2.3103384142e+00,0.0000000000e+00, },
+ },
+ {
+ { 1.8229206610e-04,-7.8997325866e-01,-3.8715051001e-01,-2.6192408538e+00,-8.3977994034e-01,-2.8329897913e+00,-4.5306444352e-01,0.0000000000e+00, },
+ { 9.8531160936e-02,-5.6297236492e-02,-5.7284484199e-02,-4.3673866734e-01,-1.9564766257e-01,-6.2028156584e-01,-3.4692356122e-01,0.0000000000e+00, },
+ },
};
/* Coeficientes para filtro de salida */
/* Tabla de coeficientes, generada a partir del programa "mkfilter" */
/* Formato: coef[IDX_BW][IDX_COEF] */
-/* IDX_COEF=0 => 1/GAIN */
-/* IDX_COEF=1-6 => Coeficientes y[n] */
-
-static double coef_out[NBW][8]={
-#include "coef_out.h"
+/* IDX_COEF = 0 => 1/GAIN */
+/* IDX_COEF = 1-6 => Coeficientes y[n] */
+
+static double coef_out[NBW][8] = {
+ { 1.3868644653e-08,-6.3283665042e-01,4.0895057217e+00,-1.1020074592e+01,1.5850766191e+01,-1.2835109292e+01,5.5477477340e+00,0.0000000000e+00, },
+ { 3.1262119724e-03,-7.8390522307e-03,8.5209627801e-02,-4.0804129163e-01,1.1157139955e+00,-1.8767603680e+00,1.8916395224e+00,0.0000000000e+00, },
};
/*! Filtro pasa-banda para frecuencia de MARCA */
static inline float filtroM(fsk_data *fskd,float in)
{
- int i,j;
+ int i, j;
double s;
double *pc;
- pc=&coef_in[fskd->f_mark_idx][fskd->bw][0];
- fskd->fmxv[(fskd->fmp+6)&7]=in*(*pc++);
-
- s=(fskd->fmxv[(fskd->fmp+6)&7] - fskd->fmxv[fskd->fmp]) + 3 * (fskd->fmxv[(fskd->fmp+2)&7] - fskd->fmxv[(fskd->fmp+4)&7]);
- for (i=0,j=fskd->fmp;i<6;i++,j++) s+=fskd->fmyv[j&7]*(*pc++);
- fskd->fmyv[j&7]=s;
- fskd->fmp++; fskd->fmp&=7;
+ pc = &coef_in[fskd->f_mark_idx][fskd->bw][0];
+ fskd->fmxv[(fskd->fmp+6)&7] = in*(*pc++);
+
+ s = (fskd->fmxv[(fskd->fmp + 6) & 7] - fskd->fmxv[fskd->fmp]) + 3 * (fskd->fmxv[(fskd->fmp + 2) & 7] - fskd->fmxv[(fskd->fmp + 4) & 7]);
+ for (i = 0, j = fskd->fmp; i < 6; i++, j++)
+ s += fskd->fmyv[j&7]*(*pc++);
+ fskd->fmyv[j&7] = s;
+ fskd->fmp++;
+ fskd->fmp &= 7;
return s;
}
/*! Filtro pasa-banda para frecuencia de ESPACIO */
static inline float filtroS(fsk_data *fskd,float in)
{
- int i,j;
+ int i, j;
double s;
double *pc;
- pc=&coef_in[fskd->f_space_idx][fskd->bw][0];
- fskd->fsxv[(fskd->fsp+6)&7]=in*(*pc++);
-
- s=(fskd->fsxv[(fskd->fsp+6)&7] - fskd->fsxv[fskd->fsp]) + 3 * (fskd->fsxv[(fskd->fsp+2)&7] - fskd->fsxv[(fskd->fsp+4)&7]);
- for (i=0,j=fskd->fsp;i<6;i++,j++) s+=fskd->fsyv[j&7]*(*pc++);
- fskd->fsyv[j&7]=s;
- fskd->fsp++; fskd->fsp&=7;
+ pc = &coef_in[fskd->f_space_idx][fskd->bw][0];
+ fskd->fsxv[(fskd->fsp+6)&7] = in*(*pc++);
+
+ s = (fskd->fsxv[(fskd->fsp + 6) & 7] - fskd->fsxv[fskd->fsp]) + 3 * (fskd->fsxv[(fskd->fsp + 2) & 7] - fskd->fsxv[(fskd->fsp + 4) & 7]);
+ for (i = 0, j = fskd->fsp; i < 6; i++, j++)
+ s += fskd->fsyv[j&7]*(*pc++);
+ fskd->fsyv[j&7] = s;
+ fskd->fsp++;
+ fskd->fsp &= 7;
return s;
}
/*! Filtro pasa-bajos para datos demodulados */
static inline float filtroL(fsk_data *fskd,float in)
{
- int i,j;
+ int i, j;
double s;
double *pc;
- pc=&coef_out[fskd->bw][0];
- fskd->flxv[(fskd->flp + 6) & 7]=in * (*pc++);
-
- s= (fskd->flxv[fskd->flp] + fskd->flxv[(fskd->flp+6)&7]) +
+ pc = &coef_out[fskd->bw][0];
+ fskd->flxv[(fskd->flp + 6) & 7] = in * (*pc++);
+
+ s = (fskd->flxv[fskd->flp] + fskd->flxv[(fskd->flp+6)&7]) +
6 * (fskd->flxv[(fskd->flp+1)&7] + fskd->flxv[(fskd->flp+5)&7]) +
15 * (fskd->flxv[(fskd->flp+2)&7] + fskd->flxv[(fskd->flp+4)&7]) +
20 * fskd->flxv[(fskd->flp+3)&7];
- for (i=0,j=fskd->flp;i<6;i++,j++) s+=fskd->flyv[j&7]*(*pc++);
- fskd->flyv[j&7]=s;
- fskd->flp++; fskd->flp&=7;
+ for (i = 0,j = fskd->flp;i<6;i++,j++)
+ s += fskd->flyv[j&7]*(*pc++);
+ fskd->flyv[j&7] = s;
+ fskd->flp++;
+ fskd->flp &= 7;
return s;
}
@@ -136,20 +169,20 @@
{
float xS,xM;
- fskd->cola_in[fskd->pcola]=x;
-
- xS=filtroS(fskd,x);
- xM=filtroM(fskd,x);
-
- fskd->cola_filtro[fskd->pcola]=xM-xS;
-
- x=filtroL(fskd,xM*xM - xS*xS);
-
- fskd->cola_demod[fskd->pcola++]=x;
- fskd->pcola &= (NCOLA-1);
+ fskd->cola_in[fskd->pcola] = x;
+
+ xS = filtroS(fskd,x);
+ xM = filtroM(fskd,x);
+
+ fskd->cola_filtro[fskd->pcola] = xM-xS;
+
+ x = filtroL(fskd,xM*xM - xS*xS);
+
+ fskd->cola_demod[fskd->pcola++] = x;
+ fskd->pcola &= (NCOLA-1);
*retval = x;
- return(0);
+ return 0;
}
static int get_bit_raw(fsk_data *fskd, short *buffer, int *len)
@@ -158,36 +191,42 @@
float x,spb,spb2,ds;
int f;
- spb=fskd->spb;
- if (fskd->spb == 7) spb = 8000.0 / 1200.0;
- ds=spb/32.;
- spb2=spb/2.;
-
- for (f=0;;){
- if (demodulador(fskd,&x, GET_SAMPLE)) return(-1);
- if ((x*fskd->x0)<0) { /* Transicion */
+ spb = fskd->spb;
+ if (fskd->spb == 7)
+ spb = 8000.0 / 1200.0;
+ ds = spb/32.;
+ spb2 = spb/2.;
+
+ for (f = 0;;) {
+ if (demodulador(fskd, &x, GET_SAMPLE))
+ return -1;
+ if ((x * fskd->x0) < 0) { /* Transicion */
if (!f) {
- if (fskd->cont<(spb2)) fskd->cont+=ds; else fskd->cont-=ds;
- f=1;
+ if (fskd->cont<(spb2))
+ fskd->cont += ds;
+ else
+ fskd->cont -= ds;
+ f = 1;
}
}
- fskd->x0=x;
- fskd->cont+=1.;
- if (fskd->cont>spb) {
- fskd->cont-=spb;
+ fskd->x0 = x;
+ fskd->cont += 1.;
+ if (fskd->cont > spb) {
+ fskd->cont -= spb;
break;
}
}
- f=(x>0)?0x80:0;
- return(f);
+ f = (x > 0) ? 0x80 : 0;
+ return f;
}
int fsk_serie(fsk_data *fskd, short *buffer, int *len, int *outbyte)
{
int a;
int i,j,n1,r;
- int samples=0;
+ int samples = 0;
int olen;
+
switch(fskd->state) {
/* Pick up where we left off */
case STATE_SEARCH_STARTBIT2:
@@ -199,54 +238,59 @@
}
/* Esperamos bit de start */
do {
-/* this was jesus's nice, reasonable, working (at least with RTTY) code
-to look for the beginning of the start bit. Unfortunately, since TTY/TDD's
-just start sending a start bit with nothing preceding it at the beginning
-of a transmission (what a LOSING design), we cant do it this elegantly */
-/*
+ /* this was jesus's nice, reasonable, working (at least with RTTY) code
+ to look for the beginning of the start bit. Unfortunately, since TTY/TDD's
+ just start sending a start bit with nothing preceding it at the beginning
+ of a transmission (what a LOSING design), we cant do it this elegantly */
+ /*
if (demodulador(zap,&x1)) return(-1);
for(;;) {
if (demodulador(zap,&x2)) return(-1);
if (x1>0 && x2<0) break;
- x1=x2;
- }
-*/
-/* this is now the imprecise, losing, but functional code to detect the
-beginning of a start bit in the TDD sceanario. It just looks for sufficient
-level to maybe, perhaps, guess, maybe that its maybe the beginning of
-a start bit, perhaps. This whole thing stinks! */
- if (demodulador(fskd,&fskd->x1,GET_SAMPLE)) return(-1);
+ x1 = x2;
+ }
+ */
+ /* this is now the imprecise, losing, but functional code to detect the
+ beginning of a start bit in the TDD sceanario. It just looks for sufficient
+ level to maybe, perhaps, guess, maybe that its maybe the beginning of
+ a start bit, perhaps. This whole thing stinks! */
+ if (demodulador(fskd,&fskd->x1,GET_SAMPLE))
+ return -1;
samples++;
- for(;;)
- {
+ for(;;) {
search_startbit2:
if (!*len) {
- fskd->state = STATE_SEARCH_STARTBIT2;
+ fskd->state = STATE_SEARCH_STARTBIT2;
return 0;
}
samples++;
- if (demodulador(fskd,&fskd->x2,GET_SAMPLE)) return(-1);
+ if (demodulador(fskd,&fskd->x2,GET_SAMPLE))
+ return(-1);
#if 0
- printf("x2 = %5.5f ", fskd->x2);
+ printf("x2 = %5.5f ", fskd->x2);
#endif
- if (fskd->x2 < -0.5) break;
- }
+ if (fskd->x2 < -0.5)
+ break;
+ }
search_startbit3:
/* Esperamos 0.5 bits antes de usar DPLL */
- i=fskd->spb/2;
+ i = fskd->spb/2;
if (*len < i) {
fskd->state = STATE_SEARCH_STARTBIT3;
return 0;
}
- for(;i;i--) { if (demodulador(fskd,&fskd->x1,GET_SAMPLE)) return(-1);
+ for(;i;i--) {
+ if (demodulador(fskd,&fskd->x1,GET_SAMPLE))
+ return(-1);
#if 0
printf("x1 = %5.5f ", fskd->x1);
#endif
- samples++; }
+ samples++;
+ }
/* x1 debe ser negativo (confirmación del bit de start) */
- } while (fskd->x1>0);
+ } while (fskd->x1 > 0);
fskd->state = STATE_GET_BYTE;
getbyte:
@@ -261,38 +305,47 @@
return 0;
}
/* Leemos ahora los bits de datos */
- j=fskd->nbit;
- for (a=n1=0;j;j--) {
+ j = fskd->nbit;
+ for (a = n1 = 0; j; j--) {
olen = *len;
- i=get_bit_raw(fskd, buffer, len);
+ i = get_bit_raw(fskd, buffer, len);
buffer += (olen - *len);
- if (i == -1) return(-1);
- if (i) n1++;
- a>>=1; a|=i;
- }
- j=8-fskd->nbit;
- a>>=j;
+ if (i == -1)
+ return(-1);
+ if (i)
+ n1++;
+ a >>= 1;
+ a |= i;
+ }
+ j = 8-fskd->nbit;
+ a >>= j;
/* Leemos bit de paridad (si existe) y la comprobamos */
if (fskd->paridad) {
olen = *len;
- i=get_bit_raw(fskd, buffer, len);
+ i = get_bit_raw(fskd, buffer, len);
buffer += (olen - *len);
- if (i == -1) return(-1);
- if (i) n1++;
- if (fskd->paridad==1) { /* paridad=1 (par) */
- if (n1&1) a|=0x100; /* error */
- } else { /* paridad=2 (impar) */
- if (!(n1&1)) a|=0x100; /* error */
+ if (i == -1)
+ return(-1);
+ if (i)
+ n1++;
+ if (fskd->paridad == 1) { /* paridad = 1 (par) */
+ if (n1&1)
+ a |= 0x100; /* error */
+ } else { /* paridad = 2 (impar) */
+ if (!(n1&1))
+ a |= 0x100; /* error */
}
}
/* Leemos bits de STOP. Todos deben ser 1 */
- for (j=fskd->nstop;j;j--) {
+ for (j = fskd->nstop;j;j--) {
r = get_bit_raw(fskd, buffer, len);
- if (r == -1) return(-1);
- if (!r) a|=0x200;
+ if (r == -1)
+ return(-1);
+ if (!r)
+ a |= 0x200;
}
/* Por fin retornamos */
Modified: team/oej/codename-pineapple/main/tdd.c
URL: http://svn.digium.com/view/asterisk/team/oej/codename-pineapple/main/tdd.c?view=diff&rev=48218&r1=48217&r2=48218
==============================================================================
--- team/oej/codename-pineapple/main/tdd.c (original)
+++ team/oej/codename-pineapple/main/tdd.c Sat Dec 2 15:04:36 2006
@@ -174,7 +174,8 @@
if (b > 0x7f)
continue;
c = tdd_decode_baudot(tdd,b);
- if ((c < 1) || (c > 126)) continue; /* if not valid */
+ if ((c < 1) || (c > 126))
+ continue; /* if not valid */
break;
}
}
More information about the asterisk-commits
mailing list