Version 2.9.2: added S100 protocol, some minor corrections

[irmp.git] / irmp.h

diff --git a/irmp.h b/irmp.h
index 74a54f33858b5f58aa57ba3116639119bce47876..8e906e06f0418f79d02dd0e58986796b6f58a838 100644 (file)
--- a/irmp.h
+++ b/irmp.h
@@ -3,7 +3,7 @@
  *\r
  * Copyright (c) 2009-2015 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irmp.h,v 1.94 2015/05/07 06:51:10 fm Exp $\r
+ * $Id: irmp.h,v 1.95 2015/05/29 08:23:56 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
@@ -96,6 +96,20 @@
 #  define IRMP_SUPPORT_ORTEK_PROTOCOL           0\r
 #endif\r
 \r
+#if IRMP_SUPPORT_RC5_PROTOCOL == 1 && IRMP_SUPPORT_S100_PROTOCOL == 1\r
+#  warning RC5 protocol conflicts wih S100, please enable only one of both protocols\r
+#  warning S100 protocol disabled\r
+#  undef IRMP_SUPPORT_S100_PROTOCOL\r
+#  define IRMP_SUPPORT_S100_PROTOCOL            0\r
+#endif\r
+\r
+#if IRMP_SUPPORT_NUBERT_PROTOCOL == 1 && IRMP_SUPPORT_FAN_PROTOCOL == 1\r
+#  warning NUBERT protocol conflicts wih FAN, please enable only one of both protocols\r
+#  warning FAN protocol disabled\r
+#  undef IRMP_SUPPORT_FAN_PROTOCOL\r
+#  define IRMP_SUPPORT_FAN_PROTOCOL             0\r
+#endif\r
+\r
 #if IRMP_SUPPORT_FDC_PROTOCOL == 1 && IRMP_SUPPORT_ORTEK_PROTOCOL == 1\r
 #  warning FDC protocol conflicts wih ORTEK, please enable only one of both protocols\r
 #  warning ORTEK protocol disabled\r