X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fnet%2Fafsk.c;h=d58758cd8397031613a1e8b9395f7421b5edc241;hb=fb5863ca8d0db3ff2e84721f7c902b031157ebb0;hp=2b7fe0bedaa5df37b4e18e8f6283cae1f13e2073;hpb=eea2624b23b44f93fb894a4c98689c683c3d60d9;p=bertos.git diff --git a/bertos/net/afsk.c b/bertos/net/afsk.c index 2b7fe0be..d58758cd 100644 --- a/bertos/net/afsk.c +++ b/bertos/net/afsk.c @@ -32,8 +32,7 @@ * * \brief AFSK1200 modem. * - * \version $Id$ - * \author Francesco Sacchi + * \author Francesco Sacchi */ #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; } @@ -477,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