Refactor to latest requirements

Author: zvecr

mdloader_common.c

@@ -33,7 +33,7 @@ char verbose;
 char testmode;
 char first_device;
 int restart_after_program;
-int force_smarteeprom_config;
+int ignore_smarteeprom_config;
 int hex_cols;
 int hex_colw;
 
@@ -487,19 +487,9 @@ uint8_t configure_smarteeprom(void)
         return 1;
     }
 
-    uint8_t should_reconfigure;
-    if(force_smarteeprom_config == FORCE_NONE)
+    if(ignore_smarteeprom_config)
     {
-        should_reconfigure = prompt_yes_no("SmartEEPROM: Your settings do not match the recommended values. Update setting?");
-    }
-    else
-    {
-        should_reconfigure = (force_smarteeprom_config == FORCE_YES);
-    }
-
-    if(!should_reconfigure)
-    {
-        printf("SmartEEPROM: Skipped!\n");
+        printf("SmartEEPROM: Your settings do not match the recommended values. Skipped!");
         return 1;
     }
 
@@ -531,21 +521,6 @@ void strupper(char *str)
     }
 }
 
-//Prompt for Yy/Nn with message
-uint8_t prompt_yes_no(const char* msg)
-{
-    printf(msg);
-    printf(" (y/n):\n");
-
-    char c;
-    do {
-        scanf(" %c", &c);
-        c = toupper(c);
-    } while(c != 'N' && c != 'Y');
-
-    return c == 'Y';
-}
-
 //Return file size of given file
 int filesize(char *fname)
 {
@@ -637,7 +612,7 @@ void display_help(void)
     printf("  -s --size size                 Read firmware size of <size>\n");
     printf("  -D --download file             Write firmware from <file> into device\n");
     printf("  -t --test                      Test mode (download/upload writes disabled, upload outputs data to stdout, restart disabled)\n");
-    printf("     --forceeep answer           Automatic answer to Smart EEPROM re-configuration prompt <y/n>\n");
+    printf("     --ignore-eep                Ignore differences in SmartEEPROM configuration\n");
     printf("     --cols count                Hex listing column count <count> [%i]\n", COLS);
     printf("     --colw width                Hex listing column width <width> [%i]\n", COLW);
     printf("     --restart                   Restart device after successful programming\n");
@@ -646,12 +621,12 @@ void display_help(void)
 
 #define SW_COLS     1000
 #define SW_COLW     1001
-#define SW_FORCEEEP 1002
 
 //Program command line options
 struct option long_options[] = {
     //Flags
-    { "restart",        no_argument,        &restart_after_program, 1 },
+    { "restart",        no_argument,        &restart_after_program,     1 },
+    { "ignore-eep",     no_argument,        &ignore_smarteeprom_config, 1 },
     //Other
     { "verbose",        no_argument,        0,  'v' },
     { "help",           no_argument,        0,  'h' },
@@ -666,7 +641,6 @@ struct option long_options[] = {
     { "test",           no_argument,        0,  't' },
     { "cols",           required_argument,  0,  SW_COLS },
     { "colw",           required_argument,  0,  SW_COLW },
-    { "forceeep",       required_argument,  0,  SW_FORCEEEP },
     { 0, 0, 0, 0 }
 };
 
@@ -676,7 +650,7 @@ int main(int argc, char *argv[])
     testmode = 0;
     first_device = 0;
     restart_after_program = 0;
-    force_smarteeprom_config = FORCE_NONE;
+    ignore_smarteeprom_config = 0;
     hex_cols = COLS;
     hex_colw = COLW;
 
@@ -797,11 +771,6 @@ int main(int argc, char *argv[])
                 }
                 break;
 
-            case SW_FORCEEEP:
-                strlower(optarg);
-                force_smarteeprom_config = (strstr(optarg, "y") != NULL) ? FORCE_YES : FORCE_NO;
-                break;
-
             default:
                 command = CMD_ABORT;
                 break;

mdloader_common.h

@@ -187,7 +187,6 @@ void list_devices(char *first);
 // helpers
 void strupper(char *str);
 void strlower(char *str);
-uint8_t prompt_yes_no(const char* msg);
 
 // Smart EEPROM specific
 #define NVMCTRL 0x41004000
@@ -205,12 +204,6 @@ uint8_t prompt_yes_no(const char* msg);
 
 #define SLEEP_BETWEEN_WRITES 200
 
-enum eep_force_type {
-    FORCE_NONE = 0,
-    FORCE_NO,
-    FORCE_YES,
-};
-
 typedef union {
     struct {
         uint32_t SBLK          : 4; /* bit: 35:32 - Number of NVM Blocks composing a SmartEEPROM sector   */