New command 'loadcpm3' - load 'CPM3.SYS' file. setenv() bugfix

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

diff --git a/avr/env.c b/avr/env.c
index 7be7d03501f102a7fbed6367262272859d3f8ead..a947583a6fe273ce4b3710c5b642e616fb216534 100644 (file)
--- a/avr/env.c
+++ b/avr/env.c
@@ -31,13 +31,17 @@
 #define DELIM          "\0"
 
 const FLASH char default_env[] = {
-       "bootdelay="    "3"             DELIM
-       "bootcmd="      "reset; loadf; go ${startaddr}" DELIM
-       "baudrate="     "115200"        DELIM
-       "startaddr="    "0"             DELIM
+       ENV_BAUDRATE      "=" "115200" DELIM
+       ENV_BOOTDELAY     "=" "3" DELIM
+       ENV_BOOTCMD               "=" "reset; loadf; go ${startaddr}" DELIM
+       ENV_PATH_CPM3SYS  "=" CONFIG_PATH_CPM3SYS 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
        DELIM
 };
 
+
 /* EEPROM storage */
 typedef struct environment_s {
        uint16_t        crc;            /* CRC16 over data bytes        */
@@ -452,7 +456,6 @@ command_ret_t _do_env_set(int flag, int argc, char * const argv[])
        env_item_t e, *ep;
 
        (void) flag;
-       debug("Initial value for argc=%d\n", argc);
 
        name = argv[1];
        value = argv[2];
@@ -519,15 +522,35 @@ command_ret_t _do_env_set(int flag, int argc, char * const argv[])
  * @return 0 if ok, 1 on error
  */
 static
-int setenv(const char *varname, const char *varvalue)
+int setenv(const MEMX char *varname, const char *varvalue)
 {
-       const char * const argv[3] = { NULL, varname, varvalue };
+       int rc;
+
+#ifdef __MEMX
+       char *tmpname = NULL;
+       if (__builtin_avr_flash_segment(varname) != -1) {
+               tmpname = malloc(strlen_P(varname)+1);
+               if (tmpname == NULL) {
+                       printf_P(PSTR("setenv: Out of Memory!\n"));
+                       return 1;
+               }
+               strcpy_P(tmpname, varname);
+       } else
+               tmpname = (char *) varname;
+#endif
+
+       const char * const argv[3] = { NULL, tmpname, varvalue };
        int argc = 3;
 
        if (varvalue == NULL || varvalue[0] == '\0')
                --argc;
 
-       return (int) _do_env_set(0, argc, (char * const *)argv);
+       rc = (int) _do_env_set(0, argc, (char * const *)argv);
+
+#ifdef __MEMX
+       free(tmpname);
+#endif
+       return rc;
 }
 
 /**