X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fnet%2Fafsk.c;h=d58758cd8397031613a1e8b9395f7421b5edc241;hb=b30ca67e54f665181d85a49bff3af2862e86601e;hp=4a195891d9befe3e1a96c7d5b5dafc86fa854678;hpb=59e02d028bf407e4e2ccda823f5360d2e59f7ee4;p=bertos.git

diff --git a/bertos/net/afsk.c b/bertos/net/afsk.c
index 4a195891..d58758cd 100644
--- a/bertos/net/afsk.c
+++ b/bertos/net/afsk.c
@@ -32,8 +32,7 @@
  *
  * \brief AFSK1200 modem.
  *
- * \version $Id$
- * \author Francesco Sacchi <asterix@develer.com>
+ * \author Francesco Sacchi <batt@develer.com>
  */
 
 #include "afsk.h"
@@ -106,11 +105,7 @@ INLINE uint8_t sin_sample(uint16_t idx)
 	uint16_t new_idx = idx % (SIN_LEN / 2);
 	new_idx = (new_idx >= (SIN_LEN / 4)) ? (SIN_LEN / 2 - new_idx - 1) : new_idx;
 
-	#if CPU_HARVARD
-		uint8_t data = pgm_read_char(&sin_table[new_idx]);
-	#else
-		uint8_t data = sin_table[new_idx];
-	#endif
+	uint8_t data = pgm_read8(&sin_table[new_idx]);
 
 	return (idx >= (SIN_LEN / 2)) ? (255 - data) : data;
 }
@@ -127,7 +122,7 @@ INLINE uint8_t sin_sample(uint16_t idx)
  * \param bit  current bit to be parsed.
  * \param fifo FIFO buffer used to push characters.
  *
- * \return True if all is ok, False if the fifo is full.
+ * \return true if all is ok, false if the fifo is full.
  */
 static bool hdlc_parse(Hdlc *hdlc, bool bit, FIFOBuffer *fifo)
 {
@@ -209,7 +204,7 @@ static bool hdlc_parse(Hdlc *hdlc, bool bit, FIFOBuffer *fifo)
  * ADC ISR callback.
  * This function has to be called by the ADC ISR when a sample of the configured
  * channel is available.
- * \param af Afsk context to operate one (\see Afsk).
+ * \param af Afsk context to operate on.
  * \param curr_sample current sample from the ADC.
  */
 void afsk_adc_isr(Afsk *af, int8_t curr_sample)
@@ -340,13 +335,14 @@ static void afsk_txStart(Afsk *af)
  * This function has to be called by the DAC ISR when a sample of the configured
  * channel has been converted out.
  *
- * \param af Afsk context to operate one (\see Afsk).
+ * \param af Afsk context to operate on.
  *
- * \note The next DAC output sample is supplied by the Afsk driver through calling
- *        the AFSK_DAC_SET() callback.
+ * \return The next DAC output sample.
  */
-void afsk_dac_isr(Afsk *af)
+uint8_t afsk_dac_isr(Afsk *af)
 {
+	AFSK_STROBE_ON();
+
 	/* Check if we are at a start of a sample cycle */
 	if (af->sample_count == 0)
 	{
@@ -357,7 +353,8 @@ void afsk_dac_isr(Afsk *af)
 			{
 				AFSK_DAC_IRQ_STOP(af->dac_ch);
 				af->sending = false;
-				return;
+				AFSK_STROBE_OFF();
+				return 0;
 			}
 			else
 			{
@@ -396,7 +393,8 @@ void afsk_dac_isr(Afsk *af)
 					{
 						AFSK_DAC_IRQ_STOP(af->dac_ch);
 						af->sending = false;
-						return;
+						AFSK_STROBE_OFF();
+						return 0;
 					}
 					else
 						af->curr_out = fifo_pop(&af->tx_fifo);
@@ -453,8 +451,9 @@ void afsk_dac_isr(Afsk *af)
 	af->phase_acc += af->phase_inc;
 	af->phase_acc %= SIN_LEN;
 
-	AFSK_DAC_SET(af->dac_ch, sin_sample(af->phase_acc));
 	af->sample_count--;
+	AFSK_STROBE_OFF();
+	return sin_sample(af->phase_acc);
 }
 
 
@@ -473,7 +472,7 @@ static size_t afsk_read(KFile *fd, void *_buf, size_t size)
 		ticks_t start = timer_clock();
 		#endif
 
-		while (fifo_isempty_locked(&af->rx_fifo));
+		while (fifo_isempty_locked(&af->rx_fifo))
 		{
 			cpu_relax();
 			#if CONFIG_AFSK_RXTIMEOUT != -1
@@ -531,7 +530,7 @@ static void afsk_clearerr(KFile *fd)
 
 /**
  * Initialize an AFSK1200 modem.
- * \param af Afsk context to operate one (\see Afsk).
+ * \param af Afsk context to operate on.
  * \param adc_ch  ADC channel used by the demodulator.
  * \param dac_ch  DAC channel used by the modulator.
  */