irq-demo: Use gateware leap seconds if valid instead of kernel one

767b56cf · Miguel Jimenez Lopez · 6cd25a19 · 767b56cf
Commit 767b56cf authored Oct 21, 2020 by Miguel Jimenez Lopez
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 1 deletion

fmc-dio-device.c sw/irq-demo/dep/fmc-dio-device.c +11 -1

No files found.
--- a/sw/irq-demo/dep/fmc-dio-device.c
+++ b/sw/irq-demo/dep/fmc-dio-device.c
@@ -227,6 +227,9 @@ int get_utc_ts_from_fmc_dio_device(fmc_dio_device dev, int ch,
 				struct usr_timestamp **ts, unsigned int *nts)
 {
 	int ret;
+	int kernel_tai;
+	int usr_tai;
+	int usr_tai_valid;
 	int tai;
 	struct timespec *t;

@@ -234,10 +237,17 @@ int get_utc_ts_from_fmc_dio_device(fmc_dio_device dev, int ch,
 	if(ret)
 		return ret;

-	tai = get_kernel_leaps_info(dev);
+	kernel_tai = get_kernel_leaps_info(dev);

 	for(int i = 0 ; i < *nts ; i++) {
 		t = &((*ts)[i].t);
+		usr_tai = (*ts)[i].leap_second;
+#if defined(IGNORE_USR_LEAPSECOND)
+		usr_tai_valid = 0;
+#else
+		usr_tai_valid = (*ts)[i].leap_second_valid;
+#endif
+		tai = (usr_tai_valid) ? usr_tai : kernel_tai;
 		t->tv_sec -= tai;
 	}