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 abe269200a988cb68099b476556c7f11933f69f3..cb1c8d1e3b9fadbb0027835d21ba0f34fca4d218 100644 (file)
--- 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 c7a0c48190c0aa660f6ae54444220b427ba8d1c9..5ba8afee800d56e6c31a8a5eb9ef2ef0dece3731 100644 (file)
--- 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 e4ea6374c160a718157198c3697150f55b1d5f72..96a6e72090c16eb646a912a3c5dea65800c5b87e 100644 (file)
--- 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);