From: Antonio Ospite <ospite@studenti.unina.it>
Date: Thu, 21 Jun 2012 08:41:42 +0000 (+0200)
Subject: am7xxx-play: make the help about power mode more consistent
X-Git-Tag: v0.1.3~16^2~1
X-Git-Url: https://git.ao2.it/libam7xxx.git/commitdiff_plain/abc5e4d69e40d0edb62d4a084a33dc27f1aa712d?ds=sidebyside;hp=--cc

am7xxx-play: make the help about power mode more consistent

Use the same terminology used in the Doxygen documentation, "power mode"
instead of "power level".

Print values using "%d" instead of "%x".
---

abc5e4d69e40d0edb62d4a084a33dc27f1aa712d
diff --git a/doc/man/am7xxx-play.1.txt b/doc/man/am7xxx-play.1.txt
index 193835f..098e556 100644
--- a/doc/man/am7xxx-play.1.txt
+++ b/doc/man/am7xxx-play.1.txt
@@ -53,8 +53,8 @@ EXAMPLE:
 *-l* '<log level>'::
     the verbosity level of libam7xxx output (0-5)
 
-*-p* '<power level>'::
-    power level of device, between 0 (off) and 4 (maximum) +
+*-p* '<power mode>'::
+    the power mode of device, between 0 (off) and 4 (turbo) +
     WARNING: Level 2 and greater require the master AND
              the slave connector to be plugged in.
 
diff --git a/examples/am7xxx-play.c b/examples/am7xxx-play.c
index af15949..6d5d3c7 100644
--- a/examples/am7xxx-play.c
+++ b/examples/am7xxx-play.c
@@ -594,8 +594,10 @@ static void usage(char *name)
 	printf("\t\t\t\t\t2 - NV12\n");
 	printf("\t-q <quality>\t\tquality of jpeg sent to the device, between 1 and 100\n");
 	printf("\t-l <log level>\t\tthe verbosity level of libam7xxx output (0-5)\n");
-	printf("\t-p <power level>\tpower level of device, between %x (off) and %x (maximum)\n", AM7XXX_POWER_OFF, AM7XXX_POWER_TURBO);
-	printf("\t\t\t\tWARNING: Level 2 and greater require the master AND\n\t\t\t\t\t the slave connector to be plugged in.\n");
+	printf("\t-p <power mode>\t\tthe power mode of device, between %d (off) and %d (turbo)\n",
+	       AM7XXX_POWER_OFF, AM7XXX_POWER_TURBO);
+	printf("\t\t\t\tWARNING: Level 2 and greater require the master AND\n");
+	printf("\t\t\t\t         the slave connector to be plugged in.\n");
 	printf("\t-z <zoom mode>\t\tthe display zoom mode, between %d (original) and %d (test)\n",
 	       AM7XXX_ZOOM_ORIGINAL, AM7XXX_ZOOM_TEST);
 	printf("\t-h \t\t\tthis help message\n");
@@ -718,10 +720,11 @@ int main(int argc, char *argv[])
 			case AM7XXX_POWER_MIDDLE:
 			case AM7XXX_POWER_HIGH:
 			case AM7XXX_POWER_TURBO:
-				fprintf(stdout, "Power mode: %x\n", power_mode);
+				fprintf(stdout, "Power mode: %d\n", power_mode);
 				break;
 			default:
-				fprintf(stderr, "Invalid power mode value, must be between %x and %x\n", AM7XXX_POWER_OFF, AM7XXX_POWER_TURBO);
+				fprintf(stderr, "Invalid power mode value, must be between %d and %d\n",
+					AM7XXX_POWER_OFF, AM7XXX_POWER_TURBO);
 				ret = -EINVAL;
 				goto out;
 			}