time-*: add function enable_timing_output

It is not checked in other parts of PPSi whether the pointer to enable_timing_output is not NULL. To avoid crashes add dummy function. Signed-off-by: Adam Wujek <dev_public@wujek.eu>

time-*: add function enable_timing_output
It is not checked in other parts of PPSi whether the pointer to enable_timing_output is not NULL. To avoid crashes add dummy function. Signed-off-by: Adam Wujek <dev_public@wujek.eu>
02702ff6 · Adam Wujek · 89b46691 · 02702ff6 · 02702ff6 · 02702ff6
Commit 02702ff6 authored Nov 08, 2022 by Adam Wujek
Hide whitespace changes
Inline Side-by-side

Showing with 50 additions and 1 deletion

bare-time.c time-bare/bare-time.c +16 -0

sim-time.c time-sim/sim-time.c +17 -0

unix-time.c time-unix/unix-time.c +17 -1

No files found.
--- a/time-bare/bare-time.c
+++ b/time-bare/bare-time.c
@@ -147,6 +147,21 @@ static unsigned long bare_calc_timeout(struct pp_instance *ppi, int millisec)
 	return now_ms + millisec;
 }

+static int bare_enable_timing_output(struct pp_globals *ppg, int enable)
+{
+	static int prev_enable = 0;
+
+	if (prev_enable != enable) {
+		pp_diag(NULL, time, 2, "%s dummy timing output\n",
+			enable ? "enable" : "disable");
+		prev_enable = enable;
+
+		return 0;
+	}
+
+	return 0;
+}
+
 struct pp_time_operations bare_time_ops = {
 	.get_utc_time = bare_time_get_utc_time,
 	.get_utc_offset = bare_time_get_utc_offset,
@@ -158,4 +173,5 @@ struct pp_time_operations bare_time_ops = {
 	.adjust_offset = bare_time_adjust_offset,
 	.adjust_freq = bare_time_adjust_freq,
 	.calc_timeout = bare_calc_timeout,
+	.enable_timing_output = bare_enable_timing_output
 };
--- a/time-sim/sim-time.c
+++ b/time-sim/sim-time.c
@@ -142,6 +142,22 @@ static unsigned long sim_calc_timeout(struct pp_instance *ppi, int millisec)
 	return millisec + SIM_PPI_ARCH(ppi)->time.current_ns / 1000LL / 1000LL;
 }

+
+static int sim_enable_timing_output(struct pp_globals *ppg, int enable)
+{
+	static int prev_enable = 0;
+
+	if (prev_enable != enable) {
+		pp_diag(NULL, time, 2, "%s dummy timing output\n",
+			enable ? "enable" : "disable");
+		prev_enable = enable;
+
+		return 0;
+	}
+
+	return 0;
+}
+
 struct pp_time_operations sim_time_ops = {
 	.get_utc_time = sim_time_get_utc_time,
 	.get_utc_offset = sim_time_get_utc_offset,
@@ -154,4 +170,5 @@ struct pp_time_operations sim_time_ops = {
 	.adjust_freq = sim_adjust_freq,
 	.init_servo = sim_init_servo,
 	.calc_timeout = sim_calc_timeout,
+	.enable_timing_output = sim_enable_timing_output
 };
--- a/time-unix/unix-time.c
+++ b/time-unix/unix-time.c
@@ -11,6 +11,7 @@
 #include <time.h>
 #include <sys/timex.h>
 #include <ppsi/ppsi.h>
+#include "../arch-unix/include/ppsi-unix.h"

 #ifndef MOD_TAI
 #define MOD_TAI 0x80
@@ -280,6 +281,21 @@ static unsigned long unix_calc_timeout(struct pp_instance *ppi, int millisec)
 	return now_ms + millisec;
 }

+static int unix_enable_timing_output(struct pp_globals *ppg, int enable)
+{
+	static int prev_enable = 0;
+
+	if (prev_enable != enable) {
+		pp_diag(NULL, time, 2, "%s dummy timing output\n",
+			enable ? "enable" : "disable");
+		prev_enable = enable;
+
+		return 0;
+	}
+
+	return 0;
+}
+
 struct pp_time_operations unix_time_ops = {
 	.get_utc_time = unix_time_get_utc_time,
 	.get_utc_offset = unix_time_get_utc_offset,
@@ -291,5 +307,5 @@ struct pp_time_operations unix_time_ops = {
 	.adjust_freq = unix_time_adjust_freq,
 	.init_servo = unix_time_init_servo,
 	.calc_timeout = unix_calc_timeout,
+	.enable_timing_output = unix_enable_timing_output
 };
-