state-master: unify master and pre-master

This saves 50 bytes in wrpc-sw (and more in x86 builds) Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

state-master: unify master and pre-master
This saves 50 bytes in wrpc-sw (and more in x86 builds) Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
7a80b4b1 · Alessandro Rubini · 8c1dfbcd · 7a80b4b1 · 7a80b4b1 · 7a80b4b1
Commit 7a80b4b1 authored Sep 06, 2016 by Alessandro Rubini
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 14 deletions

ppsi.h include/ppsi/ppsi.h +1 -1

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

state-master.c proto-standard/state-master.c +3 -12

No files found.
--- a/include/ppsi/ppsi.h
+++ b/include/ppsi/ppsi.h
@@ -402,7 +402,7 @@ extern struct pp_state_table_item pp_state_table[]; /* 0-terminated */
 /* Standard state-machine functions */
 extern pp_action pp_initializing, pp_faulty, pp_disabled, pp_listening,
-		 pp_pre_master, pp_master, pp_passive, pp_uncalibrated,
+		 pp_master, pp_passive, pp_uncalibrated,
 		 pp_slave, pp_pclock;;
 /* The engine */

--- a/proto-standard/fsm-table.c
+++ b/proto-standard/fsm-table.c
@@ -18,7 +18,7 @@ struct pp_state_table_item pp_state_table[] __attribute__((weak)) = {
 	{ PPS_FAULTY,		"faulty",	pp_faulty,},
 	{ PPS_DISABLED,		"disabled",	pp_disabled,},
 	{ PPS_LISTENING,	"listening",	pp_listening,},
-	{ PPS_PRE_MASTER,	"pre-master",	pp_pre_master,},
+	{ PPS_PRE_MASTER,	"pre-master",	pp_master,},
 	{ PPS_MASTER,		"master",	pp_master,},
 	{ PPS_PASSIVE,		"passive",	pp_passive,},
 	{ PPS_UNCALIBRATED,	"uncalibrated",	pp_uncalibrated,},

--- a/proto-standard/state-master.c
+++ b/proto-standard/state-master.c
@@ -11,12 +11,12 @@
 /*
 * MASTER and PRE_MASTER have many things in common. This function implements
- * both states. It is invoked by pp_master and pp_pre_master with pre
+ * both states. We set "pre" internally to 0 or 1.
- * respectively equal to 0 and 1.
 */
-static int _pp_master(struct pp_instance *ppi, uint8_t *pkt, int plen, int pre)
+int pp_master(struct pp_instance *ppi, uint8_t *pkt, int plen)
 {
 	int msgtype;
+	int pre = (ppi->state == PPS_MASTER);
 	int e = 0; /* error var, to check errors in msg handling */
 	if (pre && pp_timeout(ppi, PP_TO_QUALIFICATION)) {
@@ -121,12 +121,3 @@ out_fault:
 	return e;
 }
-int pp_master(struct pp_instance *ppi, uint8_t *pkt, int plen)
-{
-	return _pp_master(ppi, pkt, plen, 0);
-}
-int pp_pre_master(struct pp_instance *ppi, unsigned char *pkt, int plen)
-{
-	return _pp_master(ppi, pkt, plen, 1);
-}