X-Git-Url: http://cloudbase.mooo.com/gitweb/irmp.git/blobdiff_plain/956ea3ea733ead7da9cf5584b9a0dc1c1d98d548..7fe8188d6871371baf83a08d1ab42c094525c04b:/irmp.c

diff --git a/irmp.c b/irmp.c
index cd12f29..5b25eea 100644
--- a/irmp.c
+++ b/irmp.c
@@ -1,9 +1,9 @@
 /*---------------------------------------------------------------------------------------------------------------------------------------------------
  * irmp.c - infrared multi-protocol decoder, supports several remote control protocols
  *
- * Copyright (c) 2009-2013 Frank Meyer - frank(at)fli4l.de
+ * Copyright (c) 2009-2014 Frank Meyer - frank(at)fli4l.de
  *
- * $Id: irmp.c,v 1.158 2014/07/09 15:03:49 fm Exp $
+ * $Id: irmp.c,v 1.161 2014/07/21 08:58:58 fm Exp $
  *
  * ATMEGA88 @ 8 MHz
  *
@@ -498,7 +498,7 @@ static void                                     (*irmp_callback_ptr) (uint8_t);
  *---------------------------------------------------------------------------------------------------------------------------------------------------
  */
 #if defined(UNIX_OR_WINDOWS) || IRMP_PROTOCOL_NAMES == 1
-char *
+const char *
 irmp_protocol_names[IRMP_N_PROTOCOLS + 1] =
 {
     "UNKNOWN",
@@ -2302,6 +2302,9 @@ irmp_ISR (void)
 #if IRMP_SUPPORT_KASEIKYO_PROTOCOL == 1
                     genre2                  = 0;
 #endif
+#if IRMP_SUPPORT_SAMSUNG_PROTOCOL == 1
+                    irmp_tmp_id = 0;
+#endif
 
 #if IRMP_SUPPORT_RC5_PROTOCOL == 1 && (IRMP_SUPPORT_FDC_PROTOCOL == 1 || IRMP_SUPPORT_RCCAR_PROTOCOL == 1) || IRMP_SUPPORT_NEC42_PROTOCOL == 1
                     irmp_tmp_command2       = 0;
@@ -3721,7 +3724,6 @@ irmp_ISR (void)
                             ANALYZE_PRINTF ("SYNC\n");
 #endif // ANALYZE
                             wait_for_space = 0;
-                            irmp_tmp_id = 0;
                             irmp_bit++;
                         }
                         else  if (irmp_pulse_time >= SAMSUNG_PULSE_LEN_MIN && irmp_pulse_time <= SAMSUNG_PULSE_LEN_MAX)