retronetworking
/
isdnfax
13
0
Fork 0
Code Pull Requests Releases Activity

*** empty log message ***

This commit is contained in:
Oliver Eichler 1999-02-21 12:19:37 +00:00
parent d9da365a39
commit fbbf7b3116
11 changed files with 4604 additions and 328 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/ifax/ifax.h
View File

@ -23,6 +23,7 @@
#include <ifax/isdn.h>
#include <ifax/g711.h>
#include <ifax/atan.h>
#include <ifax/sqrt.h>

2
include/ifax/modules/V.29_demod.h
View File

@ -5,7 +5,7 @@
* Copyright (C) 1999 Oliver Eichler [Oliver.Eichler@regensburg.netsurf.de]
*/
int modulator_V21_construct (ifax_modp self, va_list args);
/*int modulator_V21_construct (ifax_modp self, va_list args);*/
#ifndef __V29_DEMOD
#define __V29_DEMOD

28
include/ifax/sqrt.h Normal file
View File

@ -0,0 +1,28 @@
/*
******************************************************************************
Fax program for ISDN.
Copyright (C) 1999 Oliver Eichler [oliver.eichler@regensburg.netsurf.de
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************************
*/
extern unsigned short intsqrt (short x);

2
lib/Makefile
View File

@ -2,7 +2,7 @@ LDFLAGS=-lm
CFLAGS=-O2 -g -Wall -pedantic -I../include
LIBOBJS = bitreverse.o debug.o int2alaw.o module.o sincos.o isdn.o g711.o \
rate-7k2-8k-1.o atan.o atantbl.o
rate-7k2-8k-1.o atan.o atantbl.o sqrt.o sqrttbl.o
all: isdnlib.a

87
lib/sqrt.c Normal file
View File

@ -0,0 +1,87 @@
/*
******************************************************************************
Fax program for ISDN.
Copyright (C) 1999 Oliver Eichler [oliver.eichler@regensburg.netsurf.de
This function calculates the angle of a complex number x = real, y = imag.
The angle is represented as: 0..360° -> 0x0000..0xFFFFF
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
******************************************************************************
*/
#undef CALC_TBL
#ifdef CALC_TBL
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
#else
extern short sqrttbl[];
#endif
unsigned short intsqrt (short x)
{
short res;
if(x>=0){
res = sqrttbl[x];
}
else{
res = (short)0x0FFFF;
}
return res;
}
#ifdef CALC_TBL
void
gen_sqrt_tbl (void)
{
float x;
short y;
FILE *fid;
int n, i;
fid = fopen ("sqrttbl.c", "wt");
fprintf (fid, "short sqrttbl[] = \n");
fprintf (fid, "{\n");
n = 8;
for (i = 0; i < 32767; i++)
{
x = (float) i / 32768;
y = (short) (sqrt(x) * 32768);
fprintf (fid, "0x%04X, ", y & 0x0000FFFF);
n--;
if (!n)
{
fprintf (fid, "\n");
n = 8;
}
}
fprintf (fid, "};\n\n");
fclose (fid);
}
#endif

4099
lib/sqrttbl.c Normal file
View File

File diff suppressed because it is too large Load Diff

2
misc/watchdog.c
View File

@ -28,7 +28,7 @@
#include <stdio.h>
#include <signum.h>
/*#include <signum.h>*/
#include <signal.h>
#include <sys/time.h>

91
modules/V.29-demod.c
View File

@ -72,8 +72,24 @@
#define L_2 0x0013
#define NIL 0x0
#define LISTEN 0x1
#define PHASEHUNT 0x2
#define ESTIMATEGAIN 0x1
#define LISTEN 0x2
#define PHASEHUNT 0x3
#define TAU50
#undef TAU30
#ifdef TAU50
#define AGCESTDLY 50
#define TAU 0x0288
#endif
#ifdef TAU30
#define AGCESTDLY 30
#define TAU 0x0432
#endif
#define B 0x7FFF
#define LEVEL 0x16D6
#define LEVEL63 0x0E63
#define SQRT_LEVEL63 0x2AE9
typedef struct
{
@ -105,7 +121,7 @@
typedef struct
{
unsigned short agc_gain1;
unsigned short agc_gain;
unsigned short w;
int phi;
short a;
@ -134,8 +150,9 @@
short Demod (short s, V29demod_private * priv);
short FindSeq2(V29demod_private * priv);
short PhaseHuntSeq2(V29demod_private * priv);
short agc(short s, V29demod_private * priv);
short agc_dummy(short s, V29demod_private * priv);
short SymbolMapping(V29demod_private * priv);
void agc_estimate(V29demod_private *priv);
void
@ -160,20 +177,33 @@
V29demod_private *priv = (V29demod_private *) self->private;
int n;
short *ps_s = data;
static short max = 0;
for (n = 0; n < length; n++)
{
if(max<*ps_s){
max = *ps_s;
printf("max %i\n",max);
}
*ps_s = (*ps_s*0x1300)>>15;
switch (priv->state)
{
case NIL: /* idle and measure power */
DCD (*ps_s, priv);
ps_s++;
break;
case ESTIMATEGAIN: /* estimate initial input gain */
DCD (*ps_s, priv);
agc_estimate(priv);
ps_s++;
break;
case LISTEN: /* try to detect Segment 2 */
*ps_s = agc_dummy(*ps_s, priv);
DCD (*ps_s, priv);
Demod (*ps_s, priv);
FindSeq2(priv);
@ -182,7 +212,7 @@
break;
case PHASEHUNT: /* synchronize the carrier phase */
*ps_s = agc(*ps_s, priv);
*ps_s = agc_dummy(*ps_s, priv);
DCD (*ps_s, priv);
Demod (*ps_s, priv);
if(priv->smpl_cnt == 0){
@ -224,25 +254,40 @@
priv->w = 0; /* the carrier's omega */
priv->phi = 0; /* phi to achive carrier sync. */
priv->a = 0x0288; /* equals a tau of 50 for power measurement*/
priv->a = TAU;
priv->state = NIL; /* state variable for the demodulators statemachine*/
priv->dem_index = 0; /* index of the actual demodulated sample within
the demodulator buffers */
priv->smpl_cnt = -1; /* offset for symbol sync.
-1 stands for 'no symb. found' */
priv->agc_gain1 = 0x0D55; /* equals 0.8333 in (4:12) format */
/*priv->agc_gain1 = 0x1000; /* equals 1 in (4:12) format */
priv->agc_gain = 0x0D55; /* equals 0.8333 in (4:12) format */
return 0;
}
short agc(short s, V29demod_private * priv)
short agc_dummy(short s, V29demod_private * priv)
{
return (s*priv->agc_gain1)>>12;
return (s*priv->agc_gain)>>12;
}
void agc_estimate(V29demod_private *priv)
{
static int cnt;
long num;
short g;
cnt++;
if(cnt == AGCESTDLY){
num = intsqrt(LEVEL63);
num <<= 12;
g = num/intsqrt(priv->power);
priv->agc_gain = g;
printf("I would guess gain is %04X\n", g);
priv->state = LISTEN;
}
}
short Demod (short s, V29demod_private * priv)
{
static int cnt = 0;
@ -353,6 +398,7 @@
if(re < 0) point = ReMinusTbl[point];
if(im < 0) point = ImMinusTbl[point];
printf("%i\n",point);
return 0;
}
@ -447,15 +493,26 @@
short
PhaseHuntSeq2(V29demod_private * priv)
{
short e;
static int cnt = 0;
/* adjust phi by the current phase difference */
priv->phi +=
priv->current_symbol.angl -
priv->dem_angl[priv->dem_index];
/*printf("0x%04X\n",priv->dem_re[priv->dem_index]);*/
/* toggle symbol */
if(priv->current_symbol.angl == DEG180)
if(priv->current_symbol.angl == DEG180){
if(cnt > 10){
e = priv->current_symbol.Re - priv->dem_re[priv->dem_index];
/*printf("%04X ",e);*/
e = (e * B) >> 18;
priv->agc_gain -= e;
printf("agc gain: %04X\n",priv->agc_gain);
}
cnt++;
priv->current_symbol = V29_symb_tbl[B9600];
}
else
priv->current_symbol = V29_symb_tbl[A9600];
@ -466,6 +523,7 @@
DCD (short s, V29demod_private * priv)
{
int s_s;
/* Power Measurement s_s = a*(s[n] ) + s_s[n-1]*(1-a) */
s_s = (s * s) >> 15;
@ -474,13 +532,14 @@
s_s = s_s + priv->power;
priv->power = s_s;
printf("power: 0x%04X\n",s_s);
if (s_s < L_MIN){
priv->state = NIL;
return s_s;
}
if (s_s > L_2){
if(priv->state == NIL) priv->state = LISTEN;
if(priv->state == NIL) priv->state = ESTIMATEGAIN;
return s_s;
}
return s_s;

3
modules/linedriver.c
View File

@ -182,6 +182,7 @@ work (ifax_modp self)
ifax_uint32 up;
linedriver_private *priv = self->private;
short p;
int tmp;
/* Fill output queue by demanding data */
while (priv->output.size < ATOMICSAMPLES)
@ -237,6 +238,8 @@ work (ifax_modp self)
for (t = 0; t < ATOMICSAMPLES; t++)
{
p = (short) priv->tx_buffer[t];
tmp = (p*0x0D55);
p = tmp>>12;
fwrite (&p, sizeof (p), 1, priv->file_fd);
}
}

5
test.c
View File

@ -387,7 +387,7 @@ test_v29demod (void)
linedriver->sendto = v29demod;
ifax_command (modulator, CMD_GENERIC_INITIALIZE);
remaining = 20260;
remaining = 528;/*20260;*/
while (remaining > 0)
{
remaining -= ifax_command (linedriver, CMD_LINEDRIVER_WORK);
@ -399,8 +399,7 @@ test_v29demod (void)
void
main (int argc, char **argv)
void main (int argc, char **argv)
{
ifax_debugsetlevel (DEBUG_INFO);