env.c needs getopt-min.h

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

diff --git a/avr/env.c b/avr/env.c
index 017053c24817a8af3de7c4d0d13361bc8de74a8b..70209ca00fae6e170f5cfaeeddaf856a77c6e5c9 100644 (file)
--- a/avr/env.c
+++ b/avr/env.c
@@ -1,14 +1,21 @@
+/*
+ * (C) Copyright 2014 Leo C. <erbl259-lmu@yahoo.de>
+ *
+ * SPDX-License-Identifier:    GPL-2.0
+ */
+
 #include "common.h"
 #include <string.h>
 #include <stdlib.h>
+#include <stdbool.h>
 #include <avr/eeprom.h>
 
 #include "config.h"
 #include "debug.h"
 #include "xmalloc.h"
 #include "crc.h"
+#include "getopt-min.h"
 #include "command.h"
-
 #include "env.h"
 
 
@@ -26,13 +33,18 @@
 #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               "=" "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
 };
 
+
 /* EEPROM storage */
 typedef struct environment_s {
        uint16_t        crc;            /* CRC16 over data bytes        */
@@ -307,7 +319,7 @@ int env_init(void)
 }
 
 
-char *getenv(const MEMX char *name)
+char *getenv_str(const MEMX char *name)
 {
        env_item_t *ep;
        char *ret = NULL;
@@ -387,14 +399,18 @@ int saveenv(void)
 
 
 static
-int env_item_print(env_item_t *ep)
+int env_item_print(env_item_t *ep, bool mode)
 {
        int len;
        char *ev = ep->envvar;
 
+       if (mode) {
+               len = printf_P(PSTR("setenv %s "), ev) - 7;
+               len += printf_P(PSTR("'%s'\n"), ev + len) - 2;
+       } else {
        len = printf_P(PSTR("%s="), ev);
        len += printf_P(PSTR("%s\n"), ev + len);
-
+       }
        return len;
 }
 
@@ -405,7 +421,7 @@ int env_item_print(env_item_t *ep)
  * Returns -1 in case of error, or length of printed string
  */
 static
-int env_print(const MEMX char *name)
+int env_print(const MEMX char *name, bool mode)
 {
        int len = -1;
 
@@ -413,12 +429,12 @@ int env_print(const MEMX char *name)
 
                env_item_t *ep = envlist_search(name);
                if (ep != NULL)
-                       len = env_item_print(ep);
+                       len = env_item_print(ep, mode);
 
        } else {                /* print whole list */
                len = 0;
                for (int i = 0 ; i < entrycount; i++) {
-                       len += env_item_print(&env_list[i]);
+                       len += env_item_print(&env_list[i], mode);
                }
        }
        return len;
@@ -447,7 +463,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];
@@ -514,15 +529,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;
 }
 
 /**
@@ -596,29 +631,64 @@ unsigned long getenv_ulong(const MEMX char *name, int base, unsigned long defaul
 }
 
 
+/*
+ * Read an environment variable as a boolean
+ */
+bool getenv_yesno(const MEMX char *name)
+{
+       char *s = getenv_str(name);
+
+       if (s == NULL)
+               return false;
+
+       return strchr_P(PSTR("1yYtT"), *s) != NULL;
+
+/*
+       return *s == '1' || *s == 'y' || *s == 'Y' || *s == 't' || *s == 'T' ?
+               1 : 0;
+*/
+}
+
 command_ret_t do_env_print(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
+       (void) cmdtp; (void) flag;
+
+       bool mode = 0;
        command_ret_t rc = CMD_RET_SUCCESS;
 
-       (void) cmdtp; (void) flag;
+       /* reset getopt() */
+       optind = 0;
+
+       int opt;
+       while ((opt = getopt(argc, argv, PSTR("s"))) != -1) {
+               switch (opt) {
+               case 's':
+                       mode = 1;
+                       break;
+               default: /* '?' */
+                       return CMD_RET_USAGE;
+               }
+       }
 
-       if (argc == 1) {
+       if (optind == argc) {
                /* print all env vars */
-               int size = env_print(NULL);
+               int size = env_print(NULL, mode);
                if (size < 0)
                        return CMD_RET_FAILURE;
-               printf_P(PSTR("\nEnvironment size: %d/%d bytes\n"),
-                       size, ENV_SIZE);
+               if (mode == 0)
+                       printf_P(PSTR("\nEnvironment size: %d/%d bytes\n"),
+                               size, ENV_SIZE);
                return CMD_RET_SUCCESS;
        }
 
        /* print selected env vars */
-       for (int i = 1; i < argc; ++i) {
-               int rc = env_print(argv[i]);
+       while (optind < argc) {
+               int rc = env_print(argv[optind], mode);
                if (rc < 0) {
-                       printf_P(PSTR("## Error: \"%s\" not defined\n"), argv[i]);
+                       printf_P(PSTR("## Error: \"%s\" not defined\n"), argv[optind]);
                        rc = CMD_RET_FAILURE;
                }
+               optind++;
        }
 
        return rc;