general: kill WRMODE and PPSI_SLAVE

This kills an ifdef that was due to die anyways. The only disadvantage is that bare-* architectures can't be passed arguments to force slave-only (while arch-gnu-linux can received it on the command line). Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

general: kill WRMODE and PPSI_SLAVE
This kills an ifdef that was due to die anyways. The only disadvantage is that bare-* architectures can't be passed arguments to force slave-only (while arch-gnu-linux can received it on the command line). Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
831965d1 · Alessandro Rubini · 7b289ccc · 831965d1 · 831965d1 · 831965d1
Commit 831965d1 authored Feb 27, 2013 by Alessandro Rubini
5 changed files
--- a/Makefile
+++ b/Makefile
@@ -51,16 +51,6 @@ ifdef PROTO_EXT
 endif
 include proto-standard/Makefile

-# WRMODE - Update 2012-11-24
-# obsolete compilation parameter. No used when ppsi is compiled inside wrpc-sw.
-# Still used only by ppsi standalone main. In this case, set WRMODE=master|slave
-WRMODE = none
-ifeq ($(WRMODE), master)
-CFLAGS += -DPPSI_MASTER
-else ifeq ($(WRMODE), slave)
-CFLAGS += -DPPSI_SLAVE
-endif
-
 # VERB_LOG_MSGS: uncomment if you want very verbose msg when log verbosity=2.
 # As default, they are not even compiled, in order to save space in the final
 # binary executable

--- a/arch-bare-i386/bare-startup.c
+++ b/arch-bare-i386/bare-startup.c
@@ -61,9 +61,5 @@ void ppsi_main(void)

 	OPTS(ppi)->iface_name = "eth0";

-#ifdef PPSI_SLAVE
-	OPTS(ppi)->slave_only = 1;
-#endif
-
 	bare_main_loop(ppi);
 }
--- a/arch-bare-x86-64/bare-startup.c
+++ b/arch-bare-x86-64/bare-startup.c
@@ -60,9 +60,5 @@ void ppsi_main(void)

 	OPTS(ppi)->iface_name = "eth0";

-#ifdef PPSI_SLAVE
-	OPTS(ppi)->slave_only = 1;
-#endif
-
 	bare_main_loop(ppi);
 }
--- a/arch-gnu-linux/posix-startup.c
+++ b/arch-gnu-linux/posix-startup.c
@@ -56,10 +56,6 @@ int main(int argc, char **argv)

 	OPTS(ppi)->iface_name = ifname;

-#ifdef PPSI_SLAVE
-	OPTS(ppi)->slave_only = 1;
-#endif
-
 	if (pp_parse_cmdline(ppi, argc, argv) != 0)
 		return -1;


--- a/doc/Documentation
+++ b/doc/Documentation
@@ -67,8 +67,6 @@ environment:
    PROTO_EXT                   "whiterabbit" or empty
    ARCH                        name of you arch (default: gnu-linux)
    PPSI_NO_DIAG                if set, prevents diagnostics from being there
-    WRMODE (spec only)          set to "master" for m/s autodetect; set to
-                                "slave" for slave only configuration

 If none of the variables are specified, the default Makefile compiles
 with standard gcc, over gnu-linux architecture, with no protocol