ARM ABI requires stack to be aligned on a 64-bit boundary

[bertos.git] / bertos / algo / crc.h

diff --git a/bertos/algo/crc.h b/bertos/algo/crc.h
index 483f2192cf29916ba0e366ab604286b5c3e0d2a3..c2553dd563166b389e4e879aa74e90eea261b036 100644 (file)
--- a/bertos/algo/crc.h
+++ b/bertos/algo/crc.h
@@ -53,11 +53,9 @@
 #define ALGO_CRC_H
 
 #include <cfg/compiler.h>
+#include <cpu/pgm.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
+EXTERN_C_BEGIN
 
 /* CRC table */
 extern const uint16_t crc16tab[256];
@@ -72,7 +70,11 @@ extern const uint16_t crc16tab[256];
  * \param c New octet (range 0-255)
  * \param oldcrc Previous CRC16 value (referenced twice, beware of side effects)
  */
-#define UPDCRC16(c, oldcrc) (crc16tab[((oldcrc) >> 8) ^ ((unsigned char)(c))] ^ ((oldcrc) << 8))
+#if CPU_AVR
+       #define UPDCRC16(c, oldcrc) (pgm_read_uint16_t(&crc16tab[((oldcrc) >> 8) ^ ((unsigned char)(c))]) ^ ((oldcrc) << 8))
+#else
+       #define UPDCRC16(c, oldcrc) ((crc16tab[((oldcrc) >> 8) ^ ((unsigned char)(c))]) ^ ((oldcrc) << 8))
+#endif
 
 
 #ifdef INLINE
@@ -81,7 +83,11 @@ extern const uint16_t crc16tab[256];
  */
 INLINE uint16_t updcrc16(uint8_t c, uint16_t oldcrc)
 {
+#if CPU_AVR
+       return pgm_read_uint16_t(&crc16tab[(oldcrc >> 8) ^ c]) ^ (oldcrc << 8);
+#else
        return crc16tab[(oldcrc >> 8) ^ c] ^ (oldcrc << 8);
+#endif
 }
 #endif // INLINE
 
@@ -97,8 +103,6 @@ INLINE uint16_t updcrc16(uint8_t c, uint16_t oldcrc)
  */
 extern uint16_t crc16(uint16_t crc, const void *buf, size_t len);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+EXTERN_C_END
 
 #endif /* ALGO_CRC_H */