Document -v,--verbose and support multiple -v arguments for even more output

Author: raphnet

changelog.txt

@@ -1,3 +1,7 @@
+=== Next ===
+ - Command-line: Document the -v,--verbose command in the help page and
+   support multiple -v args to further increase verbosity.
+
 === Version 2.1.32 ===
  - Add PSX to USB adapter firmware version 1.0.3
 

src/main.c

@@ -57,6 +57,7 @@ static void printUsage(void)
 	printf("      --noconfirm       Skip asking the user for confirmation.\n");
 	printf("  -c, --channel chn     Specify channel to use where applicable (for multi-player adapters\n");
 	printf("                        and raw commands, development commands and GC2N64 I/O)\n");
+	printf("  -v, --verbose         Increase output verbosity.\n");
 	printf("\n");
 	printf("Configuration commands:\n");
 	printf("  --get_version                      Read adapter firmware version\n");
@@ -302,6 +303,7 @@ struct option longopts[] = {
 	{ "n64_crcd", required_argument, NULL, OPT_N64_CRCD },
 	{ "enable_highres", 0, NULL, OPT_HIGHRES },
 	{ "debug", 0, NULL, OPT_DEBUG },
+	{ "verbose", 0, NULL, 'v' },
 	{ },
 };
 
@@ -375,7 +377,7 @@ int main(int argc, char **argv)
 				use_first = 1;
 				break;
 			case 'v':
-				verbose = 1;
+				verbose++;
 				break;
 			case 'h':
 				printUsage();

src/rntlib/raphnetadapter.c

@@ -32,6 +32,7 @@ static int dusbr_verbose = 0;
 static int rnt_readSupportedFeatures(rnt_hdl_t hdl, struct rnt_dyn_features *dst_dynfeat);
 
 #define IS_VERBOSE()	(dusbr_verbose)
+#define IS_VERY_VERBOSE()	(dusbr_verbose>1)
 
 struct supported_adapter {
 	uint16_t vid, pid;
@@ -536,6 +537,7 @@ int rnt_send_cmd(rnt_hdl_t hdl, const unsigned char *cmd, int cmdlen)
 	buffer[0] = 0x00; // report ID set to 0 (device has only one)
 	memcpy(buffer + 1, cmd, cmdlen);
 
+
 	while (attempts_left--) {
 		n = hid_send_feature_report(hdev, buffer, sizeof(buffer));
 		if (n >= 0) {
@@ -596,6 +598,9 @@ int rnt_exchange(rnt_hdl_t hdl, unsigned char *outcmd, int outlen, unsigned char
 	int n;
 	uint64_t time_start, time_now;
 
+	if (IS_VERY_VERBOSE()) {
+		printf("Sending command."); fflush(stdout);
+	}
 	n = rnt_send_cmd(hdl, outcmd, outlen);
 	if (n<0) {
 		// only complain when this fails on non-legacy devices
@@ -605,6 +610,7 @@ int rnt_exchange(rnt_hdl_t hdl, unsigned char *outcmd, int outlen, unsigned char
 	}
 
 	time_start = getMilliseconds();
+	time_now = time_start;
 
 	/* Answer to the command comes later. For now, this is polled, but in
 	 * the future an interrupt-in transfer could be used. */
@@ -615,7 +621,9 @@ int rnt_exchange(rnt_hdl_t hdl, unsigned char *outcmd, int outlen, unsigned char
 			break;
 		}
 		if (n==0) {
-//			printf("."); fflush(stdout);
+//			if (IS_VERY_VERBOSE()) {
+//				printf("*"); fflush(stdout);
+//			}
 		}
 
 		time_now = getMilliseconds();
@@ -626,6 +634,10 @@ int rnt_exchange(rnt_hdl_t hdl, unsigned char *outcmd, int outlen, unsigned char
 
 	} while (n==0);
 
+	if (IS_VERY_VERBOSE()) {
+		printf("Done (%d ms)\n", (int)(time_now - time_start));
+	}
+
 	return n;
 }