From: Geoff Levand <geoffrey.levand@am.sony.com>
Date: Thu, 9 Jul 2009 17:40:44 +0000 (-0700)
Subject: Add PS3 reset default option
X-Git-Tag: v1.0.0~847
X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=aea1d55d7e09f4544f96ccc54196c674d52420e8

Add PS3 reset default option

Add a --reset-defaults option to the PS3 CUI program.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
---

diff --git a/ui/common/ps3.c b/ui/common/ps3.c
index abe2692..cb1c8d1 100644
--- a/ui/common/ps3.c
+++ b/ui/common/ps3.c
@@ -111,12 +111,6 @@ int ps3_flash_get_values(struct ps3_flash_values *values)
 	struct ps3_flash_ctx fc;
 	uint64_t tmp;
 
-	/* Set default values. */
-
-	values->default_item = 0;
-	values->timeout = ps3_timeout_forever;
-	values->video_mode = 1;
-
 	result = ps3_flash_open(&fc, "r");
 
 	if (result)
diff --git a/ui/common/ps3.h b/ui/common/ps3.h
index c7a0c48..5ba8afe 100644
--- a/ui/common/ps3.h
+++ b/ui/common/ps3.h
@@ -52,6 +52,12 @@ struct ps3_flash_values {
 	uint8_t timeout;
 };
 
+static const struct ps3_flash_values ps3_flash_defaults = {
+	.default_item = 0,
+	.video_mode = 1,
+	.timeout = ps3_timeout_forever,
+};
+
 int ps3_flash_get_values(struct ps3_flash_values *values);
 int ps3_flash_set_values(const struct ps3_flash_values *values);
 
diff --git a/ui/ncurses/ps3-cui.c b/ui/ncurses/ps3-cui.c
index e4ea637..96a6e72 100644
--- a/ui/ncurses/ps3-cui.c
+++ b/ui/ncurses/ps3-cui.c
@@ -52,7 +52,8 @@ static void print_usage(void)
 {
 	print_version();
 	printf(
-"Usage: pb-cui [-h, --help] [-l, --log log-file] [-V, --version]\n");
+"Usage: pb-cui [-h, --help] [-l, --log log-file] [-r, --reset-defaults]\n"
+"              [-V, --version]\n");
 }
 
 /**
@@ -68,6 +69,7 @@ enum opt_value {opt_undef = 0, opt_yes, opt_no};
 struct opts {
 	enum opt_value show_help;
 	const char *log_file;
+	enum opt_value reset_defaults;
 	enum opt_value show_version;
 };
 
@@ -78,12 +80,13 @@ struct opts {
 static int opts_parse(struct opts *opts, int argc, char *argv[])
 {
 	static const struct option long_options[] = {
-		{"help",    no_argument,       NULL, 'h'},
-		{"log",     required_argument, NULL, 'l'},
-		{"version", no_argument,       NULL, 'V'},
-		{ NULL,     0,                 NULL, 0},
+		{"help",           no_argument,       NULL, 'h'},
+		{"log",            required_argument, NULL, 'l'},
+		{"reset-defaults", no_argument,       NULL, 'r'},
+		{"version",        no_argument,       NULL, 'V'},
+		{ NULL, 0, NULL, 0},
 	};
-	static const char short_options[] = "hl:V";
+	static const char short_options[] = "hl:rV";
 	static const struct opts default_values = {
 		.log_file = "pb-cui.log",
 	};
@@ -104,6 +107,9 @@ static int opts_parse(struct opts *opts, int argc, char *argv[])
 		case 'l':
 			opts->log_file = optarg;
 			break;
+		case 'r':
+			opts->reset_defaults = opt_yes;
+			break;
 		case 'V':
 			opts->show_version = opt_yes;
 			break;
@@ -520,7 +526,10 @@ int main(int argc, char *argv[])
 		return EXIT_FAILURE;
 	}
 
-	ps3.dirty_values = ps3_flash_get_values(&ps3.values);
+	ps3.values = ps3_flash_defaults;
+
+	if (opts.reset_defaults != opt_yes)
+		ps3.dirty_values = ps3_flash_get_values(&ps3.values);
 
 	result = ps3_get_video_mode(&mode);