Merge pull request #40 from arthursimchaev/dev

Changes for 3.11.1 version

options.c

@@ -14,6 +14,8 @@
 #include "ufs_rpmb.h"
 #include "ufs_hmr.h"
 
+char gl_pr_type = VERBOSE;
+
 static int verify_and_set_idn(struct tool_options *options);
 static int verify_read(struct tool_options *options);
 static int verify_write(struct tool_options *options);
@@ -36,6 +38,7 @@ static int verify_and_set_hmr_method(struct tool_options *options);
 static int verify_and_set_hmr_unit(struct tool_options *options);
 static int verify_sg_struct(struct tool_options *options);
 static int verify_output_data(struct tool_options *options);
+static int verify_output_mode(struct tool_options *options);
 
 #define MAX_ADDRESS 0xFFFF
 
@@ -51,9 +54,10 @@ int init_options(int opt_cnt, char *opt_arr[], struct tool_options *options)
 		{"local", no_argument, NULL, 'l'}, /* UFS host*/
 		/* output file for the descriptor file store */
 		{"output_file", required_argument, NULL, 'D'},
+		{"output_mode", required_argument, NULL, 'P'},
 		{NULL, 0, NULL, 0}
 	};
-	static char *short_opts = "t:p:w:i:s:O:L:n:k:m:d:x:y:g:D:rocea";
+	static char *short_opts = "t:p:w:i:s:O:L:n:k:m:d:x:y:g:D:P:rocea";
 
 	while (-1 !=
 	      (curr_opt = getopt_long(opt_cnt, opt_arr, short_opts,
@@ -138,6 +142,9 @@ int init_options(int opt_cnt, char *opt_arr[], struct tool_options *options)
 		case 'D':
 			rc = verify_output_data(options);
 			break;
+		case 'P':
+			rc = verify_output_mode(options);
+			break;
 		default:
 			rc = -EINVAL;
 			break;
@@ -760,10 +767,8 @@ static int verify_write(struct tool_options *options)
 		}
 
 		options->data = (char *)malloc(QUERY_DESC_STRING_MAX_SIZE);
-		if (!options->data) {
-			print_error("Memory Allocation problem");
-			goto out;
-		}
+		if (!options->data)
+			goto out_mem_problem;
 
 		strcpy(options->data, optarg);
 	}
@@ -776,10 +781,8 @@ static int verify_write(struct tool_options *options)
 	if (options->config_type_inx == ATTR_TYPE ||
 	    options->config_type_inx == UIC_TYPE) {
 		options->data = (__u32 *)calloc(1, sizeof(__u32));
-		if (!options->data) {
-			print_error("Memory Allocation problem");
-			goto out;
-		}
+		if (!options->data)
+			goto out_mem_problem;
 
 		*(__u32 *)options->data = strtol(optarg, &endptr, 16);
 
@@ -798,15 +801,16 @@ static int verify_write(struct tool_options *options)
 			goto out;
 		}
 		options->data = (char *)calloc(1, len);
-		if (options->data == NULL) {
-			print_error("Memory Allocation problem");
-			goto out;
-		} else
+		if (options->data == NULL)
+			goto out_mem_problem;
+		else
 			strcpy(options->data, optarg);
 	}
 
 	return OK;
 
+out_mem_problem:
+	print_error("Memory Allocation problem");
 out:
 	return ERROR;
 }
@@ -870,3 +874,18 @@ static int verify_output_data(struct tool_options *options)
 	return ERROR;
 }
 
+static int verify_output_mode(struct tool_options *options)
+{
+	if (!strcmp(optarg, "raw")) {
+		gl_pr_type = RAW_VALUE;
+	} else if (!strcmp(optarg, "json")) {
+		gl_pr_type = JSON;
+	} else if (!strcmp(optarg, "verbose")) {
+		gl_pr_type = VERBOSE;
+	} else {
+		print_error("Wrong output mode");
+		return ERROR;
+	}
+
+	return OK;
+}

options.h

@@ -54,5 +54,13 @@ struct tool_options {
 	char path[PATH_MAX];
 };
 
+enum print_type {
+	VERBOSE =	0,
+	JSON,
+	RAW_VALUE
+};
+
+extern char gl_pr_type;
+
 int init_options(int opt_cnt, char **opt_arr, struct tool_options *options);
 #endif /* OPTIONS_H_ */

ufs.c

@@ -21,7 +21,8 @@
 #include "ufs_rpmb.h"
 #include "ufs_hmr.h"
 
-#define UFS_BSG_UTIL_VERSION	"3.11.2"
+#define UFS_BSG_UTIL_VERSION	"3.11.3"
+
 typedef int (*command_function)(struct tool_options *opt);
 
 struct tool_command {
@@ -84,7 +85,7 @@ static void initialized_options(struct tool_options *options)
 }
 
 static int parse_args(int argc, char **argv, command_function *func,
-		struct tool_options *options)
+		      struct tool_options *options)
 {
 	int rc = OK;
 	struct tool_command *cp;