patch-2.1.43 linux/drivers/net/soundmodem/sm_afsk1200.c

• Lines: 326
• Date: Thu Jun 12 16:22:07 1997
• Orig file: v2.1.42/linux/drivers/net/soundmodem/sm_afsk1200.c
• Orig date: Thu May 29 21:53:07 1997

diff -u --recursive --new-file v2.1.42/linux/drivers/net/soundmodem/sm_afsk1200.c linux/drivers/net/soundmodem/sm_afsk1200.c
@@ -38,174 +38,176 @@
 	int dcd_sum0, dcd_sum1, dcd_sum2;
 	unsigned int dcd_time;
 	unsigned char last_rxbit;
-	union {
-		signed char c[8];
-		float f[8];
-	} filt;
 };
 
 struct mod_state_afsk12 {
 	unsigned int shreg;
 	unsigned char tx_bit;
 	unsigned int bit_pll;
+	unsigned int dds_inc;
+	unsigned int txphase;
 };
 
 /* --------------------------------------------------------------------- */
 
-static void modulator_1200(struct sm_state *sm, unsigned char *buf, int buflen)
+static const int dds_inc[2] = { 
+	AFSK12_TX_FREQ_LO*0x10000/AFSK12_SAMPLE_RATE,
+	AFSK12_TX_FREQ_HI*0x10000/AFSK12_SAMPLE_RATE 
+};
+
+static void modulator_1200_u8(struct sm_state *sm, unsigned char *buf, 
+			      unsigned int buflen)
 {
 	struct mod_state_afsk12 *st = (struct mod_state_afsk12 *)(&sm->m);
-	static const int dds_inc[2] = { AFSK12_TX_FREQ_LO*0x10000/AFSK12_SAMPLE_RATE,
-					AFSK12_TX_FREQ_HI*0x10000/AFSK12_SAMPLE_RATE };
-	int j, k;
-
-	for (; buflen >= 8; buflen -= 8) {
-		if (st->shreg <= 1)
-			st->shreg = hdlcdrv_getbits(&sm->hdrv) | 0x10000;
-		st->tx_bit = (st->tx_bit ^ 
-				       (!(st->shreg & 1))) & 1;
-		st->shreg >>= 1;
-		k = dds_inc[st->tx_bit & 1];
-		for (j = 0; j < 8; j++) {
-			*buf++ = OFFSCOS(st->bit_pll);
-			st->bit_pll += k;
+
+	for (; buflen > 0; buflen--) {
+		if (!((st->txphase++) & 7)) {
+			if (st->shreg <= 1)
+				st->shreg = hdlcdrv_getbits(&sm->hdrv) | 0x10000;
+			st->tx_bit = (st->tx_bit ^ (!(st->shreg & 1))) & 1;
+			st->shreg >>= 1;
 		}
+		st->dds_inc = dds_inc[st->tx_bit & 1];
+		*buf++ = OFFSCOS(st->bit_pll);
+		st->bit_pll += st->dds_inc;
 	}
 }
 
 /* --------------------------------------------------------------------- */
 
+static void modulator_1200_s16(struct sm_state *sm, short *buf, unsigned int buflen)
+{
+	struct mod_state_afsk12 *st = (struct mod_state_afsk12 *)(&sm->m);
 
-/*
- * should eventually move to an asm header file
- */
-
-
-#if defined (CONFIG_SOUNDMODEM__AFSK1200_FP) && (defined(CONFIG_M586) || defined(CONFIG_M686))
-
-
-
-#define ENV_STORAGE unsigned char fpu_save[108];
-
-#define ENV_SAVE asm("fsave %0;\n\tfninit;\n\t" : "=m" (*fpu_save) : : "memory");
-#define ENV_RESTORE asm("frstor %0;\n\t" : : "m" (*fpu_save));
-
-static inline float convolution8(const float *st, const float *coeff)
-{
-	float f;
-
-	/*
-	 * from Phil Karn, KA9Q's home page
-	 */
-	asm volatile ("flds (%1);\n\t"
-	    "fmuls (%2);\n\t"
-	    "flds 4(%1);\n\t"
-	    "fmuls 4(%2);\n\t"
-	    "flds 8(%1);\n\t"
-	    "fmuls 8(%2);\n\t"
-	    "fxch %%st(2);\n\t"
-	    "faddp;\n\t"
-	    "flds 12(%1);\n\t"
-	    "fmuls 12(%2);\n\t"
-	    "fxch %%st(2);\n\t"
-	    "faddp;\n\t"
-	    "flds 16(%1);\n\t"
-	    "fmuls 16(%2);\n\t"
-	    "fxch %%st(2);\n\t"
-	    "faddp;\n\t"
-	    "flds 20(%1);\n\t"
-	    "fmuls 20(%2);\n\t"
-	    "fxch %%st(2);\n\t"
-	    "faddp;\n\t"
-	    "flds 24(%1);\n\t"
-	    "fmuls 24(%2);\n\t"
-	    "fxch %%st(2);\n\t"
-	    "faddp;\n\t"
-	    "flds 28(%1);\n\t"
-	    "fmuls 28(%2);\n\t"
-	    "fxch %%st(2);\n\t"
-	    "faddp;\n\t"
-	    "faddp;\n\t"
-	    "fmul %%st(0),%%st;\n\t" :
-	    "=t" (f) :
-	    "r" (st),
-	    "r" (coeff) : "memory");
-
-	return f;
-}
-
-static inline int do_filter_1200(struct demod_state_afsk12 *st, unsigned char newval)
-{
-	float sum;
-
-	memmove(st->filt.f+1, st->filt.f,sizeof(st->filt.f) - sizeof(st->filt.f[0]));
-	st->filt.f[0] = (((int)newval)-0x80);
-
-	sum = convolution8(st->filt.f, afsk12_tx_lo_i_f);
-	sum += convolution8(st->filt.f, afsk12_tx_lo_q_f);
-	sum -= convolution8(st->filt.f, afsk12_tx_hi_i_f);
-	sum -= convolution8(st->filt.f, afsk12_tx_hi_q_f);
-	return sum;
+	for (; buflen > 0; buflen--) {
+		if (!((st->txphase++) & 7)) {
+			if (st->shreg <= 1)
+				st->shreg = hdlcdrv_getbits(&sm->hdrv) | 0x10000;
+			st->tx_bit = (st->tx_bit ^ (!(st->shreg & 1))) & 1;
+			st->shreg >>= 1;
+		}
+		st->dds_inc = dds_inc[st->tx_bit & 1];
+		*buf++ = COS(st->bit_pll);
+		st->bit_pll += st->dds_inc;
+	}
 }
 
-#else /* defined (CONFIG_SOUNDMODEM__AFSK1200_FP) && (defined(CONFIG_M586) || defined(CONFIG_M686)) */
-
-#define ENV_STORAGE 
-#define ENV_SAVE
-#define ENV_RESTORE
+/* --------------------------------------------------------------------- */
 
-static inline void datamove8(signed char *st, unsigned char newval)
+extern __inline__ int convolution8_u8(const unsigned char *st, const int *coeff, int csum)
 {
-	memmove(st+1, st, 7);
-	*st = newval - 0x80;
+	int sum = -0x80 * csum;
+	
+	sum += (st[0] * coeff[0]);
+	sum += (st[-1] * coeff[1]);
+	sum += (st[-2] * coeff[2]);
+	sum += (st[-3] * coeff[3]);
+	sum += (st[-4] * coeff[4]);
+	sum += (st[-5] * coeff[5]);
+	sum += (st[-6] * coeff[6]);
+	sum += (st[-7] * coeff[7]);
+
+	sum >>= 7;
+	return sum * sum;
 }
 
-static inline int convolution8(const signed char *st, const signed char *coeff)
+extern __inline__ int convolution8_s16(const short *st, const int *coeff, int csum)
 {
-	int sum = (st[0] * coeff[0]);
+	int sum = 0;
 	
-	sum += (st[1] * coeff[1]);
-	sum += (st[2] * coeff[2]);
-	sum += (st[3] * coeff[3]);
-	sum += (st[4] * coeff[4]);
-	sum += (st[5] * coeff[5]);
-	sum += (st[6] * coeff[6]);
-	sum += (st[7] * coeff[7]);
+	sum += (st[0] * coeff[0]);
+	sum += (st[-1] * coeff[1]);
+	sum += (st[-2] * coeff[2]);
+	sum += (st[-3] * coeff[3]);
+	sum += (st[-4] * coeff[4]);
+	sum += (st[-5] * coeff[5]);
+	sum += (st[-6] * coeff[6]);
+	sum += (st[-7] * coeff[7]);
 
-	sum >>= 7;
+	sum >>= 15;
 	return sum * sum;
 }
 
-static inline int do_filter_1200(struct demod_state_afsk12 *st, unsigned char newval)
+extern __inline__ int do_filter_1200_u8(const unsigned char *buf)
 {
-	int sum;
+	int sum = convolution8_u8(buf, afsk12_tx_lo_i, SUM_AFSK12_TX_LO_I);
+	sum += convolution8_u8(buf, afsk12_tx_lo_q, SUM_AFSK12_TX_LO_Q);
+	sum -= convolution8_u8(buf, afsk12_tx_hi_i, SUM_AFSK12_TX_HI_I);
+	sum -= convolution8_u8(buf, afsk12_tx_hi_q, SUM_AFSK12_TX_HI_Q);
+	return sum;
+}
 
-	datamove8(st->filt.c, newval);
-	
-	sum = convolution8(st->filt.c, afsk12_tx_lo_i);
-	sum += convolution8(st->filt.c, afsk12_tx_lo_q);
-	sum -= convolution8(st->filt.c, afsk12_tx_hi_i);
-	sum -= convolution8(st->filt.c, afsk12_tx_hi_q);
+extern __inline__ int do_filter_1200_s16(const short *buf)
+{
+	int sum = convolution8_s16(buf, afsk12_tx_lo_i, SUM_AFSK12_TX_LO_I);
+	sum += convolution8_s16(buf, afsk12_tx_lo_q, SUM_AFSK12_TX_LO_Q);
+	sum -= convolution8_s16(buf, afsk12_tx_hi_i, SUM_AFSK12_TX_HI_I);
+	sum -= convolution8_s16(buf, afsk12_tx_hi_q, SUM_AFSK12_TX_HI_Q);
 	return sum;
 }
 
-#endif /* defined (CONFIG_SOUNDMODEM__AFSK1200_FP) && (defined(CONFIG_M586) || defined(CONFIG_M686)) */
+/* --------------------------------------------------------------------- */
 
+static const int pll_corr[2] = { -0x1000, 0x1000 };
+
+static void demodulator_1200_u8(struct sm_state *sm, const unsigned char *buf, unsigned int buflen)
+{
+	struct demod_state_afsk12 *st = (struct demod_state_afsk12 *)(&sm->d);
+	int j;
+	int sum;
+	unsigned char newsample;
+
+	for (; buflen > 0; buflen--, buf++) {
+		sum = do_filter_1200_u8(buf);
+		st->dcd_shreg <<= 1;
+		st->bit_pll += 0x2000;
+		newsample = (sum > 0);
+		if (st->last_sample ^ newsample) {
+			st->last_sample = newsample;
+			st->dcd_shreg |= 1;
+			st->bit_pll += pll_corr
+				[st->bit_pll < 0x9000];
+			j = 4 * hweight8(st->dcd_shreg & 0x38)
+				- hweight16(st->dcd_shreg & 0x7c0);
+			st->dcd_sum0 += j;
+		}
+		hdlcdrv_channelbit(&sm->hdrv, st->last_sample);
+		if ((--st->dcd_time) <= 0) {
+			hdlcdrv_setdcd(&sm->hdrv, (st->dcd_sum0 + 
+						   st->dcd_sum1 + 
+						   st->dcd_sum2) < 0);
+			st->dcd_sum2 = st->dcd_sum1;
+			st->dcd_sum1 = st->dcd_sum0;
+			st->dcd_sum0 = 2; /* slight bias */
+			st->dcd_time = 120;
+		}
+		if (st->bit_pll >= 0x10000) {
+			st->bit_pll &= 0xffff;
+			st->shreg >>= 1;
+			st->shreg |= (!(st->last_rxbit ^
+					st->last_sample)) << 16;
+			st->last_rxbit = st->last_sample;
+			diag_trigger(sm);
+			if (st->shreg & 1) {
+				hdlcdrv_putbits(&sm->hdrv, st->shreg >> 1);
+				st->shreg = 0x10000;
+			}
+		}
+		diag_add(sm, (((int)*buf)-0x80) << 8, sum);
+	}
+}
 
 /* --------------------------------------------------------------------- */
 
-static void demodulator_1200(struct sm_state *sm, unsigned char *buf, int buflen)
+static void demodulator_1200_s16(struct sm_state *sm, const short *buf, unsigned int buflen)
 {
 	struct demod_state_afsk12 *st = (struct demod_state_afsk12 *)(&sm->d);
-	static const int pll_corr[2] = { -0x1000, 0x1000 };
 	int j;
 	int sum;
 	unsigned char newsample;
-	ENV_STORAGE;
 
-	ENV_SAVE;
 	for (; buflen > 0; buflen--, buf++) {
-		sum = do_filter_1200(st, *buf);
+		sum = do_filter_1200_s16(buf);
 		st->dcd_shreg <<= 1;
 		st->bit_pll += 0x2000;
 		newsample = (sum > 0);
@@ -240,9 +242,8 @@
 				st->shreg = 0x10000;
 			}
 		}
-		diag_add(sm, (((int)*buf)-0x80) << 8, sum);
+		diag_add(sm, *buf, sum);
 	}
-	ENV_RESTORE;
 }
 
 /* --------------------------------------------------------------------- */
@@ -259,13 +260,13 @@
 
 const struct modem_tx_info sm_afsk1200_tx = {
 	"afsk1200", sizeof(struct mod_state_afsk12), 
-	AFSK12_SAMPLE_RATE, 1200, AFSK12_SAMPLE_RATE/1200, modulator_1200, NULL
+	AFSK12_SAMPLE_RATE, 1200, modulator_1200_u8, modulator_1200_s16, NULL
 };
 
 const struct modem_rx_info sm_afsk1200_rx = {
 	"afsk1200", sizeof(struct demod_state_afsk12), 
-	AFSK12_SAMPLE_RATE, 1200, AFSK12_SAMPLE_RATE/1200, 
-	AFSK12_SAMPLE_RATE/1200, demodulator_1200, demod_init_1200
+	AFSK12_SAMPLE_RATE, 1200, 8, AFSK12_SAMPLE_RATE/1200, 
+	demodulator_1200_u8, demodulator_1200_s16, demod_init_1200
 };
 
 /* --------------------------------------------------------------------- */