kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bug fixes to tdd support in zaptel.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@89042 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Olle Johansson
2007-11-06 18:53:37 +00:00
parent 3946288786
commit 044aa79799
1 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
main/tdd.c
View File

@@ -53,6 +53,7 @@ struct tdd_state {
int pos;
int modo;
int mode;
int charnum;
};
static float dr[4], di[4];
@@ -67,10 +68,10 @@ static int tdd_decode_baudot(struct tdd_state *tdd,unsigned char data) /* covert
'\n','D','R','J','N','F','C','K',
'T','Z','L','W','H','Y','P','Q',
'O','B','G','^','M','X','V','^' };
static char figs[32] = { '<','3','\n','-',' ',',','8','7',
'\n','$','4','\'',',','<EFBFBD>',':','(',
'5','+',')','2','<EFBFBD>','6','0','1',
'9','7','<EFBFBD>','^','.','/','=','^' };
static char figs[32] = { '<','3','\n','-',' ','\'','8','7',
'\n','$','4','\'',',','!',':','(',
'5','\"',')','2','=','6','0','1',
'9','?','+','^','.','/',';','^' };
int d = 0; /* return 0 if not decodeable */
switch (data) {
case 0x1f:
@@ -101,9 +102,8 @@ void tdd_init(void)
struct tdd_state *tdd_new(void)
{
struct tdd_state *tdd;
tdd = malloc(sizeof(struct tdd_state));
tdd = calloc(1, sizeof(*tdd));
if (tdd) {
memset(tdd, 0, sizeof(struct tdd_state));
tdd->fskd.spb = 176; /* 45.5 baud */
tdd->fskd.hdlc = 0; /* Async */
tdd->fskd.nbit = 5; /* 5 bits */
@@ -117,7 +117,8 @@ struct tdd_state *tdd_new(void)
tdd->fskd.x0 = 0.0;
tdd->fskd.state = 0;
tdd->pos = 0;
tdd->mode = 2;
tdd->mode = 0;
tdd->charnum = 0;
} else
ast_log(LOG_WARNING, "Out of memory\n");
return tdd;
@@ -143,13 +144,12 @@ int tdd_feed(struct tdd_state *tdd, unsigned char *ubuf, int len)
int b = 'X';
int res;
int c,x;
short *buf = malloc(2 * len + tdd->oldlen);
short *buf = calloc(1, 2 * len + tdd->oldlen);
short *obuf = buf;
if (!buf) {
ast_log(LOG_WARNING, "Out of memory\n");
return -1;
}
memset(buf, 0, 2 * len + tdd->oldlen);
memcpy(buf, tdd->oldstuff, tdd->oldlen);
mylen += tdd->oldlen/2;
for (x = 0; x < len; x++)
@@ -159,13 +159,13 @@ int tdd_feed(struct tdd_state *tdd, unsigned char *ubuf, int len)
olen = mylen;
res = fsk_serie(&tdd->fskd, buf, &mylen, &b);
if (mylen < 0) {
ast_log(LOG_ERROR, "fsk_serie made mylen < 0 (%d) (olen was %d)\n", mylen, olen);
ast_log(LOG_ERROR, "fsk_serial made mylen < 0 (%d) (olen was %d)\n", mylen, olen);
free(obuf);
return -1;
}
buf += (olen - mylen);
if (res < 0) {
ast_log(LOG_NOTICE, "fsk_serie failed\n");
ast_log(LOG_NOTICE, "fsk_serial failed\n");
free(obuf);
return -1;
}
@@ -174,7 +174,8 @@ int tdd_feed(struct tdd_state *tdd, unsigned char *ubuf, int len)
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;
}
}
@@ -185,7 +186,8 @@ int tdd_feed(struct tdd_state *tdd, unsigned char *ubuf, int len)
tdd->oldlen = 0;
free(obuf);
if (res) {
tdd->mode = 2; /* put it in mode where it
tdd->mode = 2;
/* put it in mode where it
reliably puts teleprinter in correct shift mode */
return(c);
}
@@ -229,7 +231,7 @@ static inline float tdd_getcarrier(float *cr, float *ci, int bit)
} while(0)
#define PUT_TDD_BAUD(bit) do { \
while(scont < tddsb) { \
while (scont < tddsb) { \
PUT_AUDIO_SAMPLE(tdd_getcarrier(&cr, &ci, bit)); \
scont += 1.0; \
} \
@@ -237,7 +239,7 @@ static inline float tdd_getcarrier(float *cr, float *ci, int bit)
} while(0)
#define PUT_TDD_STOP do { \
while(scont < (tddsb * 1.5)) { \
while (scont < (tddsb * 1.5)) { \
PUT_AUDIO_SAMPLE(tdd_getcarrier(&cr, &ci, 1)); \
scont += 1.0; \
} \
@@ -261,14 +263,20 @@ int tdd_generate(struct tdd_state *tdd, unsigned char *buf, const char *str)
int bytes=0;
int i,x;
char c;
/*! Baudot letters */
static unsigned char lstr[31] = "\000E\nA SIU\rDRJNFCKTZLWHYPQOBG\000MXV";
static unsigned char fstr[31] = "\0003\n- \00787\r$4',!:(5\")2\0006019?&\000./;";
/*! Baudot figures */
static unsigned char fstr[31] = "\0003\n- \00787\r$4',!:(5\")2\0006019?+\000./;";
/* Initial carriers (real/imaginary) */
float cr = 1.0;
float ci = 0.0;
float scont = 0.0;
for(x = 0; str[x]; x++) {
/* Do synch for each 72th character */
if ( (tdd->charnum++) % 72 == 0)
PUT_TDD(tdd->mode ? 27 /* FIGS */ : 31 /* LTRS */);
c = toupper(str[x]);
#if 0
printf("%c",c); fflush(stdout);