Remove unneeded macros.

[bertos.git] / bertos / net / afsk_test.c

diff --git a/bertos/net/afsk_test.c b/bertos/net/afsk_test.c
index d835d628d8263f7ff4238eed091dd902b0496dcc..09c1ffdb1d6b9eccb65459e12ed0af73e2375054 100644 (file)
--- a/bertos/net/afsk_test.c
+++ b/bertos/net/afsk_test.c
@@ -146,8 +146,7 @@ int afsk_testSetup(void)
        ASSERT(fwrite(snd_header, 1, sizeof(snd_header), fp_dac) == sizeof(snd_header));
 
        timer_init();
-       afsk_init(&afsk_fd);
-       afsk_fd.fd.error = kfile_genericClose;
+       afsk_init(&afsk_fd, 0 ,0);
        ax25_init(&ax25, &afsk_fd.fd, message_hook);
        return 0;
 }
@@ -171,8 +170,7 @@ int afsk_testRun(void)
        int c;
        while ((c = fgetc(fp_adc)) != EOF)
        {
-               afsk_adc_val = (int8_t)c;
-               afsk_adc_isr();
+               afsk_adc_isr(&afsk_fd, (int8_t)c);
 
                ax25_poll(&ax25);
        }
@@ -186,8 +184,11 @@ int afsk_testRun(void)
        ax25_send(&ax25, AX25_CALL("abcdef", 0), AX25_CALL("123456", 1), buf, sizeof(buf));
 
        while (afsk_tx_test)
-               afsk_dac_isr();
-
+       {
+               int8_t val = afsk_dac_isr(&afsk_fd) - 128;
+               ASSERT(fwrite(&val, 1, sizeof(val), fp_dac) == sizeof(val));
+               data_written++;
+       }
 
        #define SND_DATASIZE_OFF 8
        #if CPU_AVR
@@ -204,8 +205,7 @@ int afsk_testRun(void)
 
        while ((c = fgetc(fp_adc)) != EOF)
        {
-               afsk_adc_val = (int8_t)c;
-               afsk_adc_isr();
+               afsk_adc_isr(&afsk_fd, (int8_t)c);
 
                ax25_poll(&ax25);
        }