Move static varibles in the Afsk structure in order to allow multiple modem instances.

[bertos.git] / bertos / net / afsk.h

diff --git a/bertos/net/afsk.h b/bertos/net/afsk.h
index dc2cf73a81dcf69ec8669c7c9499f6dcd99ebade..2f1a2e08cecf56b99790b2e57aef45f843b71043 100644 (file)
--- a/bertos/net/afsk.h
+++ b/bertos/net/afsk.h
@@ -44,13 +44,81 @@
 #ifndef DRV_AFSK_H
 #define DRV_AFSK_H
 
+#include "cfg/cfg_afsk.h"
+#include "hw/hw_afsk.h"
+
 #include <kern/kfile.h>
 #include <cfg/compiler.h>
-#include "hw/hw_afsk.h"
+#include <struct/fifobuf.h>
+
+
+// Demodulator constants
+#define SAMPLERATE 9600
+#define BITRATE    1200
+
+#define SAMPLEPERBIT (SAMPLERATE / BITRATE)
+
 
 typedef struct Afsk
 {
-  KFile fd;
+       KFile fd;
+
+       /** Current sample of bit for output data. */
+       uint8_t sample_count;
+
+       /** Current character to be modulated */
+       uint8_t curr_out;
+
+       /** Mask of current modulated bit */
+       uint8_t tx_bit;
+
+       /** True if bit stuff is allowed, false otherwise */
+       bool bit_stuff;
+
+       /** Counter for bit stuffing */
+       uint8_t stuff_cnt;
+       /**
+        * DDS phase accumulator for generating modulated data.
+        */
+       uint16_t phase_acc;
+
+       /** Current phase increment for current modulated bit */
+       uint16_t phase_inc;
+
+       /** Delay line used to delay samples by (SAMPLEPERBIT / 2) */
+       FIFOBuffer delay_fifo;
+
+       /**
+        * Buffer for delay FIFO.
+        * The 1 is added because the FIFO macros need
+        * 1 byte more to handle a buffer (SAMPLEPERBIT / 2) bytes long.
+        */
+       int8_t delay_buf[SAMPLEPERBIT / 2 + 1];
+
+       FIFOBuffer rx_fifo;
+       uint8_t rx_buf[CONFIG_AFSK_RX_BUFLEN];
+
+       FIFOBuffer tx_fifo;
+       uint8_t tx_buf[CONFIG_AFSK_TX_BUFLEN];
+
+       int16_t iir_x[2];
+       int16_t iir_y[2];
+
+       uint8_t sampled_bits;
+       uint8_t found_bits;
+       int8_t curr_phase;
+
+       /* True while modem sends data */
+       volatile bool sending;
+
+
+       bool hdlc_rxstart;
+       uint8_t hdlc_currchar;
+       uint8_t hdlc_bit_idx;
+       uint8_t hdlc_demod_bits;
+
+       uint16_t preamble_len;
+       uint16_t trailer_len;
 } Afsk;
 
 #define KFT_AFSK MAKE_ID('A', 'F', 'S', 'K')
@@ -61,8 +129,11 @@ INLINE Afsk *AFSK_CAST(KFile *fd)
   return (Afsk *)fd;
 }
 
+void afsk_adc_isr(Afsk *af, int8_t curr_sample);
+void afsk_dac_isr(Afsk *af);
 void afsk_init(Afsk *af);
 
+
 /**
  * \name afsk filter type
  * $WIZ$ afsk_filter_list = "AFSK_BUTTERWORTH", "AFSK_CHEBYSHEV"