Version 2.6.5: corrected PROGMEM access to irmp_protocol_names[]

[irmp.git] / irmp.h

diff --git a/irmp.h b/irmp.h
index 2ff7766c2fc4e0e2dfd2f98fe3499740b1227765..cda737c0d058f0bda03d317c51ed50428fe33893 100644 (file)
--- a/irmp.h
+++ b/irmp.h
@@ -1,11 +1,9 @@
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  * irmp.h\r
  *\r
- * Copyright (c) 2009-2013 Frank Meyer - frank(at)fli4l.de\r
+ * Copyright (c) 2009-2014 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irmp.h,v 1.85 2014/06/05 21:00:06 fm Exp $\r
- *\r
- * ATMEGA88 @ 8 MHz\r
+ * $Id: irmp.h,v 1.89 2014/09/15 10:27:38 fm Exp $\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
@@ -128,6 +126,12 @@
 #  define IRMP_SUPPORT_LEGO_PROTOCOL            0\r
 #endif\r
 \r
+#if IRMP_SUPPORT_SAMSUNG48_PROTOCOL == 1 && IRMP_SUPPORT_SAMSUNG_PROTOCOL == 0\r
+#  warning SAMSUNG48 protocol needs also SAMSUNG protocol, SAMSUNG protocol enabled\r
+#  undef IRMP_SUPPORT_SAMSUNG_PROTOCOL\r
+#  define IRMP_SUPPORT_SAMSUNG_PROTOCOL         1\r
+#endif\r
+\r
 #if IRMP_SUPPORT_JVC_PROTOCOL == 1 && IRMP_SUPPORT_NEC_PROTOCOL == 0\r
 #  warning JVC protocol needs also NEC protocol, NEC protocol enabled\r
 #  undef IRMP_SUPPORT_NEC_PROTOCOL\r
@@ -172,7 +176,7 @@ extern uint8_t                          irmp_is_busy (void);
 extern uint8_t                          irmp_ISR (void);\r
 \r
 #if IRMP_PROTOCOL_NAMES == 1\r
-extern char *                           irmp_protocol_names[IRMP_N_PROTOCOLS + 1];\r
+extern const char * const               irmp_protocol_names[IRMP_N_PROTOCOLS + 1] PROGMEM;\r
 #endif\r
 \r
 #if IRMP_USE_CALLBACK == 1\r