diff options
Diffstat (limited to 'avr/env.c')
-rw-r--r-- | avr/env.c | 808 |
1 files changed, 808 insertions, 0 deletions
diff --git a/avr/env.c b/avr/env.c new file mode 100644 index 0000000..97bd2e3 --- /dev/null +++ b/avr/env.c @@ -0,0 +1,808 @@ +#include "common.h" +#include <string.h> +#include <stdlib.h> + +#include <avr/eeprom.h> + +#include "config.h" +#include "debug.h" +#include "xmalloc.h" +#include "crc.h" +#include "command.h" + +#include "env.h" + + + +#define DELIM "\0" +#define ENV_SIZE CONFIG_ENV_SIZE-2 + + +#define ENV_GET_VAL (1<<0) + + +/* + * Debugging + * + * TODO: move elsewhere + */ +#include <ctype.h> + +static void print_blanks(uint_fast8_t count) +{ + while(count--) + putchar(' '); +} + + +void dump_ram(const uint8_t *startaddr, int len, char *title) +{ + uint8_t llen = 16; + uint8_t pre = (size_t) startaddr % 16; + const uint8_t *addr = (uint8_t *) ((size_t) startaddr & ~0x0f); + len += pre; + uint8_t i; + + if (title && *title) + printf_P(PSTR("%s\n"),title); + + while (len) { + if (len < 16) + llen = len; + + printf_P(PSTR(" %.4x:"), (size_t) addr); + print_blanks(3 * pre); + for (i = pre; i < llen; i++) + printf_P(PSTR(" %.2x"), addr[i]); + print_blanks(3 * (16 - i + 1) + pre); + for (i = pre; i < llen; i++) + printf_P(PSTR("%c"), isprint(addr[i]) ? addr[i] : '.'); + putchar('\n'); + + pre = 0; + addr += 16; + len -= llen; + } +} + +void dump_heap(void) +{ + extern unsigned int __brkval; + + dump_ram((uint8_t *) __malloc_heap_start, + __brkval - (unsigned int) __malloc_heap_start, + "=== Heap:"); +} + +/* TODO: combine with dump_ram() */ +void dump_eep(const uint8_t *addr, int len) +{ + int i; + uint8_t buf[16]; + + printf_P(PSTR("eeprom dump:")); + while (len) { + printf_P(PSTR("\n 0x%.4x:"), (unsigned int) addr); + for (i = 0; i<16; i++) + buf[i] = eeprom_read_byte(addr + i); + for (i = 0; i<16; i++) + printf_P(PSTR(" %.2x"), buf[i]); + printf_P(PSTR(" ")); + for (i = 0; i<16; i++) + printf_P(PSTR("%c"), isprint(buf[i]) ? buf[i] : '.'); + + addr += 16; + len -= len > 16 ? 16 : len; + } + putchar('\n'); +} + + +const FLASH char default_env[] = { + "bootdelay=" "3" DELIM + "bootcmd=" "echo hallo" DELIM + "baudrate=" "115200" DELIM + DELIM +}; + + +typedef struct environment_s { + uint16_t crc; /* CRC16 over data bytes */ + char data[ENV_SIZE]; /* Environment data */ +} env_t; + + + +typedef struct env_item_s { +#define EF_N_EEP (1<<7) +#define EF_V_EEP (1<<6) +#define EF_DIRTY (1<<0) + uint8_t flags; + union { + uint16_t eep; + char *ram; + } name; + union { + uint16_t eep; + char *ram; + } val; +} env_item_t; + + +static env_item_t env_list[CONFIG_ENVVAR_MAX]; +static int entrycount; + + +static char env_get_char(uint16_t index) +{ + unsigned int off = CONFIG_ENV_OFFSET; + + return (char) eeprom_read_byte((const uint8_t *)off + index + + offsetof(env_t, data)); +} + + +uint16_t ee_name_get(char *buf, env_item_t *ep) +{ + int i = 0; + char c; + + if (ep->flags & EF_N_EEP) { + + while ((c = env_get_char(ep->name.eep + i)) != '=' && + c != '\0' && i < CONFIG_SYS_ENV_NAMELEN) { + + buf[i] = c; + i++; + } + if (i > 0 && c != '=') { + debug("** ee_name: '%s' not '=' terminated!\n", buf); + } + } else { + strncpy(buf, ep->name.ram, CONFIG_SYS_ENV_NAMELEN); + i = strnlen(buf, CONFIG_SYS_ENV_NAMELEN); + } + buf[i] = '\0'; + return i; +} + + +uint16_t ee_val_get(char *buf, uint16_t index, int len) +{ + int i = 0; + char c; + + while ((c = env_get_char (index + i)) != '\0' && i < len) { + buf[i] = c; + i++; + }; + + buf[i] = '\0'; + + /* TODO: len check */ + + return i; +} + +static +int comp_env_key_item(const void *key, const void *item) +{ + char buf[CONFIG_SYS_ENV_NAMELEN+1]; + env_item_t *ep = (env_item_t *) item; + + ee_name_get(buf, ep); + + return strcmp((char *) key, buf); +} + +static +int comp_env_items(const void *m1, const void *m2) +{ + char b1[CONFIG_SYS_ENV_NAMELEN+1]; + char b2[CONFIG_SYS_ENV_NAMELEN+1]; + + env_item_t *ep1 = (env_item_t *) m1; + env_item_t *ep2 = (env_item_t *) m2; + + ee_name_get(b1, ep1); + ee_name_get(b2, ep2); + + return strcmp(b1, b2); +} + +#if 0 +env_item_t * ee_entry_get(const char *s, env_item_t *ep, uint_fast8_t flag) +{ + char name[CONFIG_SYS_ENV_NAMELEN+1]; + uint16_t idx = 0; + int nlen; + +//printf_P(PSTR("*** ee_entry_get: >>>>>>>>> ENTER <<<<<<<<<\n")); + + + while ((nlen = ee_name_get(name, idx)) != 0 && idx < CONFIG_ENV_SIZE) { + +//printf_P(PSTR("** idx: %d, name: '%s', s: '%s', nlen: %d, cpres:%d\n"), +// idx, name, s, nlen, strncmp(name, s, nlen)); + + if (strncmp(name, s, nlen) == 0) + break; + + idx += nlen + 1; + while (env_get_char(idx++) != 0) + ; + } + + if (nlen) { + char *vp; + ep->flags = EF_N_EEP; + ep->name.eep = idx; + if (flag & ENV_GET_VAL) { + vp = xmalloc(CONFIG_SYS_CBSIZE); + nlen = ee_val_get(vp, idx + nlen + 1, CONFIG_SYS_CBSIZE); + ep->val = xrealloc(vp, nlen + 1); + } else + ep->val = NULL; + + +//printf_P(PSTR("*** ee_entry_get: >>>>>> LEAVE 0x%.4x <<<<<\n"), +// (unsigned int) ep); + return ep; + } + +//printf_P(PSTR("*** ee_entry_get: >>>>>> LEAVE <NULL> <<<<<\n")); + return NULL; +} +#endif + +#if 0 +static char p_env_name_buf[CONFIG_SYS_ENV_NAMELEN+1]; + +static char *dbg_p_env_name(env_item_t *p) +{ + if (p->flags & EF_N_EEP) { + if (ee_name_get(p_env_name_buf, p) != 0) + return p_env_name_buf; + else + return "<NULL>"; + } + return "<NO EEP_NAME>"; +} +#endif + +int env_item_print(env_item_t *ep) +{ + char buf[CONFIG_SYS_ENV_NAMELEN+1]; + int len; + env_item_t e = *ep; + + ee_name_get(buf, ep); + len = printf_P(PSTR("%s="), buf); + + if (e.val.ram != NULL) { + while (1) { + char c; + if (e.flags & EF_V_EEP) + c = env_get_char(e.val.eep++); + else + c = *e.val.ram++; + + if (c != '\0') { + putchar(c); + len++; + } else + break; + } + } + putchar('\n'); + len ++; + + return len; +} + + +static env_item_t *envlist_search(const char *name) +{ + return bsearch(name, env_list, entrycount, + sizeof(env_item_t), comp_env_key_item); +} + + +env_item_t *envlist_insert(const char *key, env_item_t *e) +{ + const size_t size = sizeof(env_item_t); + + if (entrycount < CONFIG_ENVVAR_MAX) { + env_list[entrycount++] = *e; + qsort(env_list, entrycount, size, comp_env_items); + + return bsearch(key, env_list, entrycount, + size, comp_env_key_item); + + } else + return NULL; +} + + +env_item_t *envlist_enter(env_item_t *e) +{ + char *key = e->name.ram; + const size_t size = sizeof(env_item_t); + env_item_t *ep; + + ep = bsearch(key, env_list, entrycount, + size, comp_env_key_item); + + if (ep == NULL) { + if (entrycount < CONFIG_ENVVAR_MAX) { + + env_list[entrycount++] = *e; + qsort(env_list, entrycount, size, comp_env_items); + ep = bsearch(key, env_list, entrycount, + size, comp_env_key_item); + } + } else { + if ((ep->flags & EF_V_EEP) == 0) { + free(ep->val.ram); + } + ep->val.ram = e->val.ram; + } + + if (ep != NULL) { + ep->flags |= EF_DIRTY; + ep->flags &= ~EF_V_EEP; + + if ((ep->flags & EF_N_EEP) == 0) { + int nlen = strnlen(key, CONFIG_SYS_ENV_NAMELEN); + char *name = xmalloc(nlen + 1); + if (name == NULL) { + printf_P(PSTR("## Can't malloc %d bytes\n"), + nlen + 1); + return NULL; + } + strcpy(name, key); + name[nlen] = '\0'; + ep->name.ram = name; + } + } + + return ep; +} + + +static env_item_t *envlist_get(const char *name, uint_fast8_t flag) +{ + env_item_t *ep; + + ep = envlist_search(name); + + if (ep != NULL && (flag & ENV_GET_VAL)) { + if (ep->flags & EF_V_EEP) { + char *vp; + uint_fast8_t len; + vp = xmalloc(CONFIG_SYS_CBSIZE); + len = ee_val_get(vp, ep->val.eep, CONFIG_SYS_CBSIZE); + ep->val.ram = xrealloc(vp, len + 1); + ep->flags &= ~EF_V_EEP; + } + } + + return ep; +} + + +static int envlist_delete(const char *name) +{ + size_t size = sizeof(env_item_t); + env_item_t *ep = bsearch(name, env_list, entrycount, + sizeof(env_item_t), comp_env_key_item); + int rc = 0; + + if (ep != NULL) { + + if ((ep->flags & EF_V_EEP) == 0) + free(ep->val.ram); + if ((ep->flags & EF_N_EEP) == 0) + free(ep->name.ram); + + entrycount--; +printf_P(PSTR("*** envlist_delete memmove: 0x%.4x, 0x%.4x, %d\n"), + (unsigned) ep, (unsigned) ep + size, + (env_list - ep)*size + entrycount*size); + memmove(ep, ep + 1, (env_list - ep)*size + entrycount*size); + + rc = 1; + } +#if 1 + dump_ram((uint8_t *) &env_list[0], entrycount * sizeof(env_item_t), + "=== env_list:"); + dump_heap(); + debug("** entrycount: %d\n", entrycount); + for (int i=0; i<entrycount; i++) { + printf_P(PSTR("** env var [%d] "), i); + env_item_print(&env_list[i]); + } +#endif + + return rc; +} + + +char *getenv(const char *name) +{ + env_item_t *ep; + char *ret = NULL; + + debug("** getenv: %s\n", name); + + ep = envlist_get(name, ENV_GET_VAL); + if (ep != NULL) + ret = ep->val.ram; + +#if 1 + dump_ram((uint8_t *) &env_list[0], entrycount * sizeof(env_item_t), + "=== env_list:"); + dump_heap(); + debug("** entrycount: %d\n", entrycount); + for (int i=0; i<entrycount; i++) { + printf_P(PSTR("** env var [%d] "), i); + env_item_print(&env_list[i]); + } +#endif + + return ret; +} + +int saveenv(void) +{ + int rc = 0; + + +// rc = env_export(&env_new); + if (rc) + return rc; + + +// rc = eeprom_bus_write(CONFIG_SYS_DEF_EEPROM_ADDR, +// off, (uchar *)&env_new, CONFIG_ENV_SIZE); + + return rc; +} + + +/*-----------------------------------------------------------------------------*/ + + +int set_default_env(void) +{ + char buf[64]; + uint16_t crc = 0xffff; + uint16_t eep = CONFIG_ENV_OFFSET + offsetof(env_t, data); + unsigned int len = CONFIG_ENV_SIZE - offsetof(env_t, data); + unsigned int i, src = 0; + char c = 0xff, c0 = c; + +printf_P(PSTR("\n\n** set_default_env()\n")); + + while (len) { + + memcpy_P(buf, default_env+src, sizeof(buf)); + + for (i=0; i < (len < sizeof(buf) ? len : sizeof(buf)) && + !(c == 0 && c0 == 0); + i++) + { + c0 = c; c = buf[i]; + crc = crc16(crc, c); + } + + eeprom_update_block(buf, (char *) eep, i); +/**/ printf_P(PSTR("eeprom_update_block: eep: 0x%.4x, i:%d\n"), + (unsigned int) eep, i); +/**/ dump_ram((uint8_t *) buf, i, "=== buf:"); +/**/ dump_eep((const uint8_t *) eep, i); + + if (c == 0 && c0 == 0) + len = 0; + if (len > sizeof(buf)) + len -= sizeof(buf); + src += sizeof(buf); + eep += sizeof(buf); + } + +printf_P(PSTR("** crc adr: 0x%.4x, crc: 0x%.4x\n"), + (unsigned int) (uint16_t *) CONFIG_ENV_OFFSET + offsetof(env_t,crc), crc); + + eeprom_update_word((uint16_t *) CONFIG_ENV_OFFSET + offsetof(env_t,crc), crc); + +/**/ dump_eep(0, 128); + return 0; +} + + +int env_check(void) +{ + uint16_t crc, stored_crc; + uint16_t i; + char c, c0; + + debug("\n\n** env_check()\n"); + + + /* read old CRC */ + stored_crc = eeprom_read_word((const uint16_t *) CONFIG_ENV_OFFSET + + offsetof(env_t, crc)); + crc = 0xffff; + c = 0xff; + for (i = offsetof(env_t, data); + !(c == 0 && c0 == 0) && i < CONFIG_ENV_SIZE; + i++) + { + c0 = c; + c = eeprom_read_byte((const uint8_t *) CONFIG_ENV_OFFSET + i); + crc = crc16(crc, c); + } + debug("** crc eep: 0x%.4x, crc new: 0x%.4x\n", stored_crc, crc); + + return crc == stored_crc; +} + +int env_init(void) +{ + char name[CONFIG_SYS_ENV_NAMELEN+1]; + uint16_t idx = 0; + int nlen; + env_item_t e; + + e.flags = EF_N_EEP | EF_V_EEP; + e.name.eep = idx; + while ((nlen = ee_name_get(name, &e)) != 0 && idx < ENV_SIZE) { + + if (entrycount <= CONFIG_ENVVAR_MAX) { + e.val.eep = idx + nlen + 1; + + env_list[entrycount++] = e; + + idx += nlen + 1; + while (env_get_char(idx++) != 0 && idx < ENV_SIZE) + ; + e.name.eep = idx; + } else { + debug("** Too many environment variables!\n"); + break; + } + } + qsort(env_list, entrycount, sizeof(env_item_t), comp_env_items); + + return 0; +} + + +/* + * Command interface: print one or all environment variables + * + * Returns -1 in case of error, or length of printed string + */ +static int env_print(char *name) +{ + int len = -1; + + if (name) { /* print a single name */ + + env_item_t *ep = envlist_search(name); + if (ep != NULL) + len = env_item_print(ep); + + } else { /* print whole list */ + len = 0; + for (int i = 0 ; i < entrycount; i++) { + len += env_item_print(&env_list[i]); + } + } + return len; +} + + + +int do_env_print(cmd_tbl_t *cmdtp, int flag, int argc, + char * const argv[]) +{ + int i; + int rcode = 0; + + (void) cmdtp; (void) flag; + + if (argc == 1) { + /* print all env vars */ + rcode = env_print(NULL); + if (rcode < 0) + return 1; + printf_P(PSTR("\nEnvironment size: %d/%d bytes\n"), + rcode, ENV_SIZE); + return 0; + } + + /* print selected env vars */ + for (i = 1; i < argc; ++i) { + int rc = env_print(argv[i]); + if (rc < 0) { + printf_P(PSTR("## Error: \"%s\" not defined\n"), argv[i]); + ++rcode; + } + } + + return rcode; +} + + +/* + * Set a new environment variable, + * or replace or delete an existing one. + */ +static int _do_env_set(int flag, int argc, char * const argv[]) +{ + int i, len; + char *name, *value, *s; + env_item_t e, *ep; + + (void) flag; + debug("Initial value for argc=%d\n", argc); + + name = argv[1]; + value = argv[2]; + + if (strchr(name, '=')) { + printf_P(PSTR("## Error: illegal character '='" + "in variable name \"%s\"\n"), name); + return 1; + } + if (strlen(name) > CONFIG_SYS_ENV_NAMELEN) { + printf_P(PSTR("## Error: Variable name \"%s\" too long. " + "(max %d characters)\n"), name, CONFIG_SYS_ENV_NAMELEN); + return 1; + } +/* + env_id++; +*/ + /* Delete only ? */ + if (argc < 3 || argv[2] == NULL) { + int rc = envlist_delete(name); + return !rc; + } + + /* + * Insert / replace new value + */ + for (i = 2, len = 0; i < argc; ++i) + len += strlen(argv[i]) + 1; + + value = xmalloc(len); + if (value == NULL) { + printf_P(PSTR("## Can't malloc %d bytes\n"), len); + return 1; + } + for (i = 2, s = value; i < argc; ++i) { + char *v = argv[i]; + + while ((*s++ = *v++) != '\0') + ; + *(s - 1) = ' '; + } + if (s != value) + *--s = '\0'; + + e.flags = EF_DIRTY; + e.name.ram = name; + e.val.ram = value; + ep = envlist_enter(&e); + if (!ep) { + printf_P(PSTR("## Error inserting \"%s\" variable.\n"), + name); + return 1; + } + + return 0; +} + +int setenv(const char *varname, const char *varvalue) +{ + const char * const argv[3] = { NULL, varname, varvalue }; + int argc = 3; + + if (varvalue == NULL || varvalue[0] == '\0') + --argc; + + return _do_env_set(0, argc, (char * const *)argv); +} + +#if 0 +/** + * Set an environment variable to an integer value + * + * @param varname Environment variable to set + * @param value Value to set it to + * @return 0 if ok, 1 on error + */ +int setenv_ulong(const char *varname, unsigned long value) +{ + /* TODO: this should be unsigned */ + char *str = simple_itoa(value); + + return setenv(varname, str); +} +#endif + + +/** + * Set an environment variable to an value in hex + * + * @param varname Environment variable to set + * @param value Value to set it to + * @return 0 if ok, 1 on error + */ +int setenv_hex(const char *varname, unsigned long value) +{ + char str[sizeof(unsigned long) *2 + 1]; + + sprintf_P(str, PSTR("%lx"), value); + return setenv(varname, str); +} + +unsigned long getenv_hex(const char *varname, unsigned long default_val) +{ + const char *s; + unsigned long value; + char *endp; + + s = getenv(varname); + if (s) + value = strtoul(s, &endp, 16); + if (!s || endp == s) + return default_val; + + return value; +} + +int do_env_set(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + (void) cmdtp; + + if (argc < 2) + return CMD_RET_USAGE; + + return _do_env_set(flag, argc, argv); +} + + +#if defined(CONFIG_AUTO_COMPLETE) +int env_complete(char *var, int maxv, char *cmdv[], int bufsz, char *buf) +{ + ENTRY *match; + int found, idx; + + idx = 0; + found = 0; + cmdv[0] = NULL; + + while ((idx = hmatch_r(var, idx, &match, &env_htab))) { + int vallen = strlen(match->key) + 1; + + if (found >= maxv - 2 || bufsz < vallen) + break; + + cmdv[found++] = buf; + memcpy(buf, match->key, vallen); + buf += vallen; + bufsz -= vallen; + } + + qsort(cmdv, found, sizeof(cmdv[0]), strcmp_compar); + + if (idx) + cmdv[found++] = "..."; + + cmdv[found] = NULL; + return found; +} +#endif + |