@@ -96,6 +96,8 @@ enum Option {
OptSkipTestTunerControl,
OptSkipTestVendorSpecificCommands,
OptSkipTestStandbyResume,
+
+ OptVersion,
OptLast = 256
};
@@ -177,9 +179,27 @@ static struct option long_options[] = {
{"skip-test-tuner-control", no_argument, 0, OptSkipTestTunerControl},
{"skip-test-vendor-specific-commands", no_argument, 0, OptSkipTestVendorSpecificCommands},
{"skip-test-standby-resume", no_argument, 0, OptSkipTestStandbyResume},
+ {"version", no_argument, 0, OptVersion},
{0, 0, 0, 0}
};
+static void print_sha()
+{
+#ifdef SHA
+#define STR(x) #x
+#define STRING(x) STR(x)
+ printf("cec-compliance SHA : %s\n", STRING(SHA));
+#else
+ printf("cec-compliance SHA : not available\n");
+#endif
+
+}
+
+static void version()
+{
+ printf("cec-compliance " PACKAGE_VERSION "\n");
+}
+
static void usage()
{
printf("Usage:\n"
@@ -234,6 +254,7 @@ static void usage()
" -s, --skip-info Skip Driver Info output\n"
" -T, --trace Trace all called ioctls\n"
" -v, --verbose Turn on verbose reporting\n"
+ " --version Show version information\n"
" -w, --wall-clock Show timestamps as wall-clock time (implies -v)\n"
" -W, --exit-on-warn Exit on the first warning.\n"
);
@@ -1261,6 +1282,10 @@ int main(int argc, char **argv)
case OptVerbose:
show_info = true;
break;
+ case OptVersion:
+ version();
+ print_sha();
+ std::exit(EXIT_SUCCESS);
case ':':
fprintf(stderr, "Option '%s' requires a value\n",
argv[optind]);
@@ -1395,13 +1420,7 @@ int main(int argc, char **argv)
if (options[OptInteractive])
test_tags |= TAG_INTERACTIVE;
-#ifdef SHA
-#define STR(x) #x
-#define STRING(x) STR(x)
- printf("cec-compliance SHA : %s\n", STRING(SHA));
-#else
- printf("cec-compliance SHA : not available\n");
-#endif
+ print_sha();
node.phys_addr = CEC_PHYS_ADDR_INVALID;
doioctl(&node, CEC_ADAP_G_PHYS_ADDR, &node.phys_addr);
Add a --version option to cec-compliance to retrieve the version of cec-compliance. While at it, factor out printing the SHA. Signed-off-by: Paul Elder <paul.elder@ideasonboard.com> --- utils/cec-compliance/cec-compliance.cpp | 33 +++++++++++++++++++------ 1 file changed, 26 insertions(+), 7 deletions(-)