Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package pps-tools for openSUSE:Factory checked in at 2024-10-15 14:57:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pps-tools (Old) and /work/SRC/openSUSE:Factory/.pps-tools.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pps-tools" Tue Oct 15 14:57:40 2024 rev:9 rq:1207864 version:1.0.3+git20240314 Changes: -------- --- /work/SRC/openSUSE:Factory/pps-tools/pps-tools.changes 2022-11-29 10:53:02.316699766 +0100 +++ /work/SRC/openSUSE:Factory/.pps-tools.new.19354/pps-tools.changes 2024-10-15 14:57:46.935127324 +0200 @@ -1,0 +2,7 @@ +Sat Oct 12 09:10:15 UTC 2024 - [email protected] + +- Update to version 1.0.3+git20240314: + * Add support for "echo" function of pps-gpio driver + * Use %lld in printf for 64-bit time_t + +------------------------------------------------------------------- Old: ---- pps-tools-0.0.0+git.20211122.obscpio New: ---- pps-tools-1.0.3+git20240314.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pps-tools.spec ++++++ --- /var/tmp/diff_new_pack.wsgLMT/_old 2024-10-15 14:57:47.727160263 +0200 +++ /var/tmp/diff_new_pack.wsgLMT/_new 2024-10-15 14:57:47.727160263 +0200 @@ -16,9 +16,9 @@ # -%define version_unconverted 0.0.0+git.20211122 +%define version_unconverted 1.0.3+git20240314 Name: pps-tools -Version: 0.0.0+git.20211122 +Version: 1.0.3+git20240314 Release: 0 Summary: Userspace tools for the Linux Pulse Per Second subsystem License: GPL-2.0-or-later ++++++ _service ++++++ --- /var/tmp/diff_new_pack.wsgLMT/_old 2024-10-15 14:57:47.763161760 +0200 +++ /var/tmp/diff_new_pack.wsgLMT/_new 2024-10-15 14:57:47.771162093 +0200 @@ -1,12 +1,13 @@ <services> - <service mode="disabled" name="obs_scm"> - <param name="url">https://github.com/ago/pps-tools.git</param> + <service name="obs_scm" mode="manual"> + <param name="url">https://github.com/redlab-i/pps-tools</param> <param name="scm">git</param> <param name="changesgenerate">enable</param> <param name="filename">pps-tools</param> - <param name="versionformat">0.0.0+git.%cd</param> + <param name="versionformat">@PARENT_TAG@+git%cd</param> + <param name="versionrewrite-pattern">v(.*)</param> </service> - <service mode="disabled" name="set_version"/> + <service name="set_version" mode="manual"/> <service name="tar" mode="buildtime"/> <service name="recompress" mode="buildtime"> <param name="file">*.tar</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.wsgLMT/_old 2024-10-15 14:57:47.795163091 +0200 +++ /var/tmp/diff_new_pack.wsgLMT/_new 2024-10-15 14:57:47.799163258 +0200 @@ -1,6 +1,8 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/ago/pps-tools.git</param> - <param name="changesrevision">c50cb7183e252b47308fa22f420e0a877277aa29</param></service></servicedata> + <param name="changesrevision">c50cb7183e252b47308fa22f420e0a877277aa29</param></service><service name="tar_scm"> + <param name="url">https://github.com/redlab-i/pps-tools</param> + <param name="changesrevision">e5083fe1481a34373dee2acfabb63001ee9c40e0</param></service></servicedata> (No newline at EOF) ++++++ pps-tools-0.0.0+git.20211122.obscpio -> pps-tools-1.0.3+git20240314.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pps-tools-0.0.0+git.20211122/ppsctl.c new/pps-tools-1.0.3+git20240314/ppsctl.c --- old/pps-tools-0.0.0+git.20211122/ppsctl.c 2021-11-22 08:48:49.000000000 +0100 +++ new/pps-tools-1.0.3+git20240314/ppsctl.c 2024-03-14 12:47:13.000000000 +0100 @@ -34,6 +34,7 @@ */ static int do_bind = 0; /* are we binding or unbinding? */ static int do_setflags = 0; /* should we manipulate kernel NTP PPS flags? */ +static int do_echo = 0; /* turn on/off PPS echo function*/ static int opt_edge = PPS_CAPTURECLEAR; /* which edge to use? */ static char *device; @@ -123,6 +124,56 @@ return 0; } +static inline int enable_echo(pps_handle_t handle, int edge) +{ + + pps_params_t params; + int ret; + int avail_mode; + + /* Find out what features are supported */ + ret = time_pps_getcap(handle, &avail_mode); + if (ret < 0) { + fprintf(stderr, "cannot get capabilities\n"); + return ret; + } + if ((avail_mode & edge) == 0) { + fprintf(stderr, "Echo on selected edge unsupported\n"); + return -1; + } + + ret = time_pps_getparams(handle, ¶ms); + if (ret < 0) + return ret; + + params.mode |= (edge == PPS_CAPTUREASSERT) ? PPS_ECHOASSERT : PPS_ECHOCLEAR; + + ret = time_pps_setparams(handle, ¶ms); + if (ret < 0) + return ret; + + return 0; +} + +static inline int disable_echo(pps_handle_t handle) +{ + pps_params_t params; + int ret; + + ret = time_pps_getparams(handle, ¶ms); + if (ret < 0) + return ret; + + params.mode &= ~(PPS_ECHOASSERT | PPS_ECHOCLEAR); + + ret = time_pps_setparams(handle, ¶ms); + if (ret < 0) + return ret; + + return 0; +} + + static inline void usage(char *name) { fprintf(stderr, "Usage: %s [-bBfFac] <ppsdev>\n" @@ -131,6 +182,8 @@ " -B unbind kernel PPS consumer\n" " -f set kernel NTP PPS flags\n" " -F unset kernel NTP PPS flags\n" + " -e enable PPS echo\n" + " -E disable PPS echo\n" "Options:\n" " -a use assert edge\n" " -c use clear edge (default)\n", @@ -150,13 +203,15 @@ {"unbind", no_argument, 0, 'B'}, {"set-flags", no_argument, 0, 'f'}, {"unset-flags", no_argument, 0, 'F'}, + {"enable-echo", no_argument, 0, 'e'}, + {"disable-echo", no_argument, 0, 'E'}, {"assert", no_argument, 0, 'a'}, {"clear", no_argument, 0, 'c'}, {"help", no_argument, 0, 'h'}, {0, 0, 0, 0} }; - c = getopt_long(argc, argv, "bBfFach", long_options, &option_index); + c = getopt_long(argc, argv, "bBfFeEach", long_options, &option_index); /* detect the end of the options. */ if (c == -1) @@ -180,6 +235,14 @@ do_setflags = 2; break; } + case 'e': { + do_echo = 1; + break; + } + case 'E': { + do_echo = 2; + break; + } case 'a': { opt_edge = PPS_CAPTUREASSERT; break; @@ -199,7 +262,7 @@ } } - if ((do_bind == 0) && (do_setflags == 0)) { + if ((do_bind == 0) && (do_setflags == 0) && (do_echo == 0)) { printf("No command specified!\n"); usage(argv[0]); exit(1); @@ -249,6 +312,19 @@ exit(EXIT_FAILURE); } + if (do_echo == 2) + if (disable_echo(handle) < 0) { + fprintf(stderr, "Disable echo failed: %s\n", strerror(errno)); + exit(EXIT_FAILURE); + } + + if (do_echo == 1) + if (enable_echo(handle, opt_edge) < 0) { + fprintf(stderr, "Enable echo failed: %s\n", strerror(errno)); + exit(EXIT_FAILURE); + } + + time_pps_destroy(handle); return 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pps-tools-0.0.0+git.20211122/ppstest.c new/pps-tools-1.0.3+git20240314/ppstest.c --- old/pps-tools-0.0.0+git.20211122/ppstest.c 2021-11-22 08:48:49.000000000 +0100 +++ new/pps-tools-1.0.3+git20240314/ppstest.c 2024-03-14 12:47:13.000000000 +0100 @@ -110,13 +110,13 @@ } printf("source %d - " - "assert %ld.%09ld, sequence: %ld - " - "clear %ld.%09ld, sequence: %ld\n", + "assert %lld.%09ld, sequence: %ld - " + "clear %lld.%09ld, sequence: %ld\n", i, - infobuf.assert_timestamp.tv_sec, + (long long)infobuf.assert_timestamp.tv_sec, infobuf.assert_timestamp.tv_nsec, infobuf.assert_sequence, - infobuf.clear_timestamp.tv_sec, + (long long)infobuf.clear_timestamp.tv_sec, infobuf.clear_timestamp.tv_nsec, infobuf.clear_sequence); fflush(stdout); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pps-tools-0.0.0+git.20211122/ppswatch.c new/pps-tools-1.0.3+git20240314/ppswatch.c --- old/pps-tools-0.0.0+git.20211122/ppswatch.c 2021-11-22 08:48:49.000000000 +0100 +++ new/pps-tools-1.0.3+git20240314/ppswatch.c 2024-03-14 12:47:13.000000000 +0100 @@ -148,7 +148,7 @@ if (max_divergence < div) max_divergence = div; if (div >= margin) { - printf("timestamp: %ld, sequence: %ld, offset: % 6ld\n", ts.tv_sec, seq, ts.tv_nsec); + printf("timestamp: %lld, sequence: %ld, offset: % 6ld\n", (long long)ts.tv_sec, seq, ts.tv_nsec); fflush(stdout); overflows++; curr_unsync++; ++++++ pps-tools.obsinfo ++++++ --- /var/tmp/diff_new_pack.wsgLMT/_old 2024-10-15 14:57:47.927168581 +0200 +++ /var/tmp/diff_new_pack.wsgLMT/_new 2024-10-15 14:57:47.931168747 +0200 @@ -1,5 +1,5 @@ name: pps-tools -version: 0.0.0+git.20211122 -mtime: 1637567329 -commit: c50cb7183e252b47308fa22f420e0a877277aa29 +version: 1.0.3+git20240314 +mtime: 1710416833 +commit: e5083fe1481a34373dee2acfabb63001ee9c40e0
