Remove compiler warnings

[z180-stamp.git] / avr / env.c

diff --git a/avr/env.c b/avr/env.c
index add281c26e36c64d922329930e4b1d7ca8526cc1..671d1c4c9c88a267ca577713d446a32131e9570b 100644 (file)
--- a/avr/env.c
+++ b/avr/env.c
@@ -14,7 +14,7 @@
 
 #define DEBUG_ENV      0       /* set to 1 to debug */
 
-#define debug_env(fmt, args...)                                                              \
+#define debug_env(fmt, args...)                                                \
        debug_cond(DEBUG_ENV, fmt, ##args)
 
 
@@ -25,13 +25,12 @@
 #define DELIM          "\0"
 
 const FLASH char default_env[] = {
-       ENV_BAUDRATE      "=" "115200" DELIM
-       ENV_BOOTDELAY     "=" "3" DELIM
+       ENV_BAUDRATE      "=" stringify(CONFIG_BAUDRATE) DELIM
+       ENV_BOOTDELAY     "=" stringify(CONFIG_BOOTDELAY) DELIM
        ENV_BOOTCMD               "=" "pin ${pins};loadcpm3;go ${startaddress}" DELIM
        ENV_CPM3_SYSFILE  "=" CONFIG_CPM3_SYSFILE DELIM
        ENV_PINALIAS      "=" "0:PG5,1:PG4,2:PB4,3:PB5,4:PB6,5:PB7,"
                                                  "6:PG3,7:PG2,8:PG1,9:PG0,10:PE7" DELIM
-       //ENV_STARTADDRESS  "=" "0" DELIM
        "pins"                    "=" "2,8 low 9 high 3 2" DELIM
        DELIM
 };
@@ -693,9 +692,6 @@ command_ret_t do_env_print(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED,
        bool mode = 0;
        command_ret_t rc = CMD_RET_SUCCESS;
 
-       /* reset getopt() */
-       optind = 0;
-
        int opt;
        while ((opt = getopt(argc, argv, PSTR("s"))) != -1) {
                switch (opt) {
@@ -720,8 +716,8 @@ command_ret_t do_env_print(cmd_tbl_t *cmdtp UNUSED, uint_fast8_t flag UNUSED,
 
        /* print selected env vars */
        while (optind < argc) {
-               int rc = env_print(argv[optind], mode);
-               if (rc < 0) {
+               int len = env_print(argv[optind], mode);
+               if (len < 0) {
                        printf_P(PSTR("## Error: \"%s\" not defined\n"), argv[optind]);
                        rc = CMD_RET_FAILURE;
                }