X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/f76ca346168afe6cf68127934765a61bd477380e..292f0519ea34caacfd03d3c752fd830056f1b342:/avr/env.c?ds=sidebyside diff --git a/avr/env.c b/avr/env.c index 5d1c5c0..b2b4e6f 100644 --- a/avr/env.c +++ b/avr/env.c @@ -1,15 +1,16 @@ -#include "common.h" -#include -#include +/* + * (C) Copyright 2014 Leo C. + * + * SPDX-License-Identifier: GPL-2.0 + */ + +#include "env.h" #include #include "config.h" #include "debug.h" -#include "xmalloc.h" #include "crc.h" -#include "command.h" - -#include "env.h" +#include "getopt-min.h" #define ENV_SIZE (CONFIG_ENV_SIZE - sizeof(uint16_t) -1) @@ -26,13 +27,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 */ @@ -74,35 +80,43 @@ char env_get_char(uint16_t index) } +static const FLASH char *comp_key; + static int comp_env_items(const void *m1, const void *m2) { env_item_t *ep1 = (env_item_t *) m1; env_item_t *ep2 = (env_item_t *) m2; - return strcmp(ep1->envvar, ep2->envvar); + if (ep1 == NULL) + return - strcmp_P(ep2->envvar, comp_key); + else + return strcmp(ep1->envvar, ep2->envvar); } env_item_t *envlist_search(const MEMX char *name) { - env_item_t e; - - e.envvar = (char *) name; - #ifdef __MEMX - char buf[CONFIG_SYS_ENV_NAMELEN+1]; - if (__builtin_avr_flash_segment(name) != -1) { - char *p = buf; - while ((*p++ = *name++) != '\0') - ; - e.envvar = buf; + comp_key = name; + return bsearch(0, env_list, entrycount, + sizeof(env_item_t), comp_env_items); + } else { + + env_item_t e; + e.envvar = (char *) name; + + return bsearch(&e, env_list, entrycount, + sizeof(env_item_t), comp_env_items); } -#endif /* __MEMX */ +#else + env_item_t e; + e.envvar = (char *) name; return bsearch(&e, env_list, entrycount, sizeof(env_item_t), comp_env_items); +#endif /* __MEMX */ } @@ -148,14 +162,9 @@ int env_item_delete(env_item_t *ep) } static -int envlist_delete(const char *name) +int envlist_delete(const MEMX char *name) { - env_item_t e; - - e.envvar = (char *) name; - - env_item_t *ep = bsearch(&e, env_list, entrycount, - sizeof(env_item_t), comp_env_items); + env_item_t *ep = envlist_search(name); if (ep != NULL) return env_item_delete(ep); @@ -185,7 +194,7 @@ int envlist_import(uint8_t flags) return -1; } - np = (char *) xmalloc(len+1); + np = (char *) malloc(len+1); if (np == NULL) { printf_P(PSTR("## Can't malloc %d bytes\n"), len+1); return 1; @@ -304,7 +313,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; @@ -384,14 +393,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; } @@ -402,7 +415,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; @@ -410,12 +423,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; @@ -437,14 +450,13 @@ int env_print(const MEMX char *name) * @return 0 if ok, 1 on error */ static -command_ret_t _do_env_set(int flag, int argc, char * const argv[]) +command_ret_t _do_env_set(uint_fast8_t flag, int argc, char * const argv[]) { int i, len; char *name, *value, *valp, *p; env_item_t e, *ep; (void) flag; - debug("Initial value for argc=%d\n", argc); name = argv[1]; value = argv[2]; @@ -475,7 +487,7 @@ command_ret_t _do_env_set(int flag, int argc, char * const argv[]) for (i = 2, len += 1; i < argc; ++i) len += strlen(argv[i]) + 1; - value = xmalloc(len); + value = malloc(len); if (value == NULL) { printf_P(PSTR("## Can't malloc %d bytes\n"), len); return CMD_RET_FAILURE; @@ -511,15 +523,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; } /** @@ -593,36 +625,71 @@ unsigned long getenv_ulong(const MEMX char *name, int base, unsigned long defaul } -command_ret_t do_env_print(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +/* + * Read an environment variable as a boolean + */ +bool getenv_yesno(const MEMX char *name) { - command_ret_t rc = CMD_RET_SUCCESS; + 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, uint_fast8_t flag, int argc, char * const argv[]) +{ (void) cmdtp; (void) flag; - if (argc == 1) { + 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) { + case 's': + mode = 1; + break; + default: /* '?' */ + return CMD_RET_USAGE; + } + } + + 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; } -command_ret_t do_env_set(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +command_ret_t do_env_set(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[]) { (void) cmdtp; @@ -633,7 +700,7 @@ command_ret_t do_env_set(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv } -command_ret_t do_env_default(cmd_tbl_t *cmdtp, int flag, +command_ret_t do_env_default(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[]) { (void) cmdtp; (void) flag; (void) argc; (void) argv; @@ -651,7 +718,7 @@ command_ret_t do_env_default(cmd_tbl_t *cmdtp, int flag, } -command_ret_t do_env_save(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +command_ret_t do_env_save(cmd_tbl_t *cmdtp, uint_fast8_t flag, int argc, char * const argv[]) { (void) cmdtp; (void) flag; (void) argc; (void) argv;