X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=bertos%2Fnet%2Fafsk_test.c;h=cb7d2cd13feb02838192f61720390a1a7026ae7c;hb=HEAD;hp=09c1ffdb1d6b9eccb65459e12ed0af73e2375054;hpb=84970fa56eb2168c2d564ac17b1fa21b9e4daef4;p=bertos.git

diff --git a/bertos/net/afsk_test.c b/bertos/net/afsk_test.c
index 09c1ffdb..cb7d2cd1 100644
--- a/bertos/net/afsk_test.c
+++ b/bertos/net/afsk_test.c
@@ -32,7 +32,6 @@
  *
  * \brief AFSK demodulator test.
  *
- * \version $Id$
  * \author Francesco Sacchi <batt@develer.com>
  * $test$: cp bertos/cfg/cfg_ax25.h $cfgdir/
  * $test$: echo "#undef AX25_LOG_LEVEL" >> $cfgdir/cfg_ax25.h
@@ -51,6 +50,7 @@
 
 #include <cfg/test.h>
 #include <cfg/debug.h>
+#include <cfg/kfile_debug.h>
 
 #include <cpu/byteorder.h>
 
@@ -61,16 +61,15 @@ FILE *fp_adc;
 FILE *fp_dac;
 uint32_t data_size;
 uint32_t data_written;
-bool afsk_tx_test;
 Afsk afsk_fd;
 AX25Ctx ax25;
-
-int8_t afsk_adc_val;
+KFileDebug dbg;
 
 int msg_cnt;
-static void message_hook(UNUSED_ARG(struct AX25Msg *, msg))
+static void message_hook(struct AX25Msg *msg)
 {
 	msg_cnt++;
+	ax25_print(&dbg.fd, msg);
 }
 
 static FILE *afsk_fileOpen(const char *name)
@@ -129,6 +128,7 @@ static FILE *afsk_fileOpen(const char *name)
 int afsk_testSetup(void)
 {
 	kdbg_init();
+	kfiledebug_init(&dbg);
 	fp_adc = afsk_fileOpen("test/afsk_test.au");
 	#if CPU_AVR
 		#warning TODO: open the file?
@@ -183,12 +183,13 @@ int afsk_testRun(void)
 
 	ax25_send(&ax25, AX25_CALL("abcdef", 0), AX25_CALL("123456", 1), buf, sizeof(buf));
 
-	while (afsk_tx_test)
+	do
 	{
 		int8_t val = afsk_dac_isr(&afsk_fd) - 128;
 		ASSERT(fwrite(&val, 1, sizeof(val), fp_dac) == sizeof(val));
 		data_written++;
 	}
+	while (afsk_fd.sending);
 
 	#define SND_DATASIZE_OFF 8
 	#if CPU_AVR