ppsi_monitor.c: restored "mode: WR Slave / Master" indication

Signed-off-by: Aurelio Colosimo <aurelio@aureliocolosimo.it>

ppsi_monitor.c: restored "mode: WR Slave / Master" indication
Signed-off-by: Aurelio Colosimo <aurelio@aureliocolosimo.it>
a0943281 · Aurelio Colosimo · Alessandro Rubini · ac229317 · a0943281 · a0943281
Commit a0943281 authored Jan 10, 2013 by Aurelio Colosimo Committed by Alessandro Rubini Feb 20, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 8 deletions

monitor_ppsi.c monitor/monitor_ppsi.c +7 -5

wrc_ptp.h wrc_ptp.h +1 -0

wrc_ptp_noposix.c wrc_ptp_noposix.c +2 -1

wrc_ptp_ppsi.c wrc_ptp_ppsi.c +3 -2

No files found.
--- a/monitor/monitor_ppsi.c
+++ b/monitor/monitor_ppsi.c
@@ -18,6 +18,7 @@
 #include <pps_gen.h>
 #include <onewire.h>
 #include <util.h>
+#include "wrc_ptp.h"

 #define UI_REFRESH_PERIOD TICS_PER_SECOND	/* 1 sec */

@@ -63,16 +64,17 @@ void wrc_mon_gui(void)
 		minic_get_stats(&tx, &rx);
 		cprintf(C_GREY, "(RX: %d, TX: %d), mode: ", rx, tx);

-		/* FIXME: define HEXP_PORT_MODE_WR_MASTER/SLAVE somewhere
-		switch (ps.mode) {
-		case HEXP_PORT_MODE_WR_MASTER:
+		switch (ptp_mode) {
+		case WRC_MODE_GM:
+		case WRC_MODE_MASTER:
 			cprintf(C_WHITE, "WR Master  ");
 			break;
-		case HEXP_PORT_MODE_WR_SLAVE:
+		case WRC_MODE_SLAVE:
 			cprintf(C_WHITE, "WR Slave   ");
 			break;
+		default:
+			cprintf(C_RED, "WR Unknown   ");
 		}
-		*/

 		if (ps.is_locked)
 			cprintf(C_GREEN, "Locked  ");

--- a/wrc_ptp.h
+++ b/wrc_ptp.h
@@ -5,6 +5,7 @@
 #define WRC_MODE_GM 1
 #define WRC_MODE_MASTER 2
 #define WRC_MODE_SLAVE 3
+extern int ptp_mode;

 int wrc_ptp_init();
 int wrc_ptp_set_mode(int mode);

--- a/wrc_ptp_noposix.c
+++ b/wrc_ptp_noposix.c
@@ -58,7 +58,8 @@ static RunTimeOpts rtOpts = {

 static PtpPortDS *ptpPortDS;
 static PtpClockDS ptpClockDS;
-static int ptp_enabled = 0, ptp_mode = WRC_MODE_UNKNOWN;
+int ptp_mode = WRC_MODE_UNKNOWN;
+static int ptp_enabled = 0;

 int wrc_ptp_init()
 {

--- a/wrc_ptp_ppsi.c
+++ b/wrc_ptp_ppsi.c
@@ -16,13 +16,14 @@
 #include <ppsi/ppsi.h>
 #include <wr-constants.h>
 #include "syscon.h"
+#include "endpoint.h"
 #include "softpll_ng.h"
 #include "wrc_ptp.h"
 #include "pps_gen.h"
 #include "uart.h"

-static int ptp_enabled = 0, ptp_mode = WRC_MODE_UNKNOWN,
-	ptp_forced_stop = 0;
+int ptp_mode = WRC_MODE_UNKNOWN;
+static int ptp_enabled = 0, ptp_forced_stop = 0;
 struct pp_instance ppi_static; /* FIXME: no more static, because used in
 				   tests/measure_t24p.c */
 CONST_VERBOSITY int pp_diag_verbosity = CONFIG_PPSI_VERBOSITY;