p2p: removing #elif from fsm-table

In order to choose between P2P or E2E we used #ifdef and #elif which was not correct, now #elif has been removed.

p2p: removing #elif from fsm-table
In order to choose between P2P or E2E we used #ifdef and #elif which was not correct, now #elif has been removed.
1a437d32 · José Luis Gutiérrez · a1a89b39 · 1a437d32 · 1a437d32
Commit 1a437d32 authored Jun 16, 2015 by José Luis Gutiérrez
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

fsm-table.c proto-ext-whiterabbit/fsm-table.c +2 -1

fsm-table.c proto-standard/fsm-table.c +2 -1

No files found.
--- a/proto-ext-whiterabbit/fsm-table.c
+++ b/proto-ext-whiterabbit/fsm-table.c
@@ -23,7 +23,8 @@ struct pp_state_table_item pp_state_table[] = {
 	{ PPS_UNCALIBRATED,	"uncalibrated",	pp_uncalibrated,},
 #ifdef CONFIG_E2E
 	{ PPS_SLAVE,		"slave",	pp_slave,},
-#elif CONFIG_P2P
+#endif
+#ifdef CONFIG_P2P
 	{ PPS_SLAVE,		"pclocks",	pp_pclock,},
 #endif
 	{ WRS_PRESENT,		"uncalibrated/wr-present",	wr_present,},

--- a/proto-standard/fsm-table.c
+++ b/proto-standard/fsm-table.c
@@ -24,7 +24,8 @@ struct pp_state_table_item pp_state_table[] __attribute__((weak)) = {
 	{ PPS_UNCALIBRATED,	"uncalibrated",	pp_uncalibrated,},
 #ifdef CONFIG_E2E
 	{ PPS_SLAVE,		"slave",	pp_slave,},
-#elif CONFIG_P2P
+#endif
+#ifdef CONFIG_P2P
 	{ PPS_SLAVE,		"pclocks",	pp_pclock,},
 #endif
 	{ PPS_END_OF_TABLE,}