X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Falgo%2Fcrc.h;h=c5c1eefddb5b161061bb66e9c7e4d53385f91ef0;hb=f8e4f3c7c1fec67b18126ee082f964cf9ceb14c7;hp=4be0602e94273bc3c5b6a93c11bf3d75be4b0971;hpb=d0c447e9524da37a437874a1049c524ba00e0087;p=bertos.git

diff --git a/bertos/algo/crc.h b/bertos/algo/crc.h
index 4be0602e..c5c1eefd 100644
--- a/bertos/algo/crc.h
+++ b/bertos/algo/crc.h
@@ -71,7 +71,7 @@ extern const uint16_t crc16tab[256];
  * \param c New octet (range 0-255)
  * \param oldcrc Previous CRC16 value (referenced twice, beware of side effects)
  */
-#if CPU_HARVARD && !(ARCH & ARCH_BOOT)
+#if CPU_HARVARD && !(defined(ARCH_BOOT) && (ARCH & ARCH_BOOT))
 	#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))
@@ -86,7 +86,7 @@ extern const uint16_t crc16tab[256];
  */
 INLINE uint16_t updcrc16(uint8_t c, uint16_t oldcrc)
 {
-#if CPU_HARVARD  && !(ARCH & ARCH_BOOT)
+#if CPU_HARVARD && !(defined(ARCH_BOOT) && (ARCH & ARCH_BOOT))
 	return pgm_read_uint16_t(&crc16tab[(oldcrc >> 8) ^ c]) ^ (oldcrc << 8);
 #else
 	return crc16tab[(oldcrc >> 8) ^ c] ^ (oldcrc << 8);