X-Git-Url: http://cloudbase.mooo.com/gitweb/z180-stamp.git/blobdiff_plain/534e1dfcb2f6cdfa1cd62913045b832f2189b7aa..d0581f881c4072ef0ac453167a98dc3bc0d87d86:/avr/env.c diff --git a/avr/env.c b/avr/env.c index 48413f3..8487c6f 100644 --- a/avr/env.c +++ b/avr/env.c @@ -13,16 +13,18 @@ #include "env.h" - -#define DELIM "\0" - - +#define ENV_SIZE (CONFIG_ENV_SIZE - sizeof(uint16_t) -1) +#define ACTIVE_FLAG 1 +#define OBSOLETE_FLAG 0 #define ENV_GET_VAL (1<<0) /* * Default Environment */ + +#define DELIM "\0" + const FLASH char default_env[] = { "bootdelay=" "3" DELIM "bootcmd=" "reset; loadf; go $(startaddr)" DELIM @@ -31,91 +33,15 @@ const FLASH char default_env[] = { DELIM }; - -/* - * Debugging - * - * TODO: move elsewhere - */ -#include - -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'); -} - -#define ENV_SIZE CONFIG_ENV_SIZE-2 +/* EEPROM storage */ typedef struct environment_s { uint16_t crc; /* CRC16 over data bytes */ + uint8_t flags; /* active/obsolete flags */ char data[ENV_SIZE]; /* Environment data */ } env_t; - +/* */ typedef struct env_item_s { #define EF_N_EEP (1<<7) /* Variable name is in EEPROM */ #define EF_V_EEP (1<<6) /* Variable value is in EEPROM */ @@ -132,20 +58,26 @@ typedef struct env_item_s { } env_item_t; +static uint8_t env_valid; static env_item_t env_list[CONFIG_ENVVAR_MAX]; static int entrycount; -static char env_get_char(uint16_t index) +static +char env_get_char(uint16_t index) { unsigned int off = CONFIG_ENV_OFFSET; + if (env_valid == 2) + off = CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE; + 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) +static +uint16_t varname_get(char *buf, env_item_t *ep) { int i = 0; char c; @@ -170,7 +102,8 @@ uint16_t ee_name_get(char *buf, env_item_t *ep) } -uint16_t ee_val_get(char *buf, uint16_t index, int len) +static +uint16_t varval_get(char *buf, uint16_t index, int len) { int i = 0; char c; @@ -193,7 +126,7 @@ 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); + varname_get(buf, ep); return strcmp((char *) key, buf); } @@ -207,126 +140,183 @@ 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; - ee_name_get(b1, ep1); - ee_name_get(b2, ep2); + varname_get(b1, ep1); + varname_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) + +static +int envlist_import(void) { char name[CONFIG_SYS_ENV_NAMELEN+1]; uint16_t idx = 0; int nlen; + env_item_t e; -//printf_P(PSTR("*** ee_entry_get: >>>>>>>>> ENTER <<<<<<<<<\n")); - - - while ((nlen = ee_name_get(name, idx)) != 0 && idx < CONFIG_ENV_SIZE) { + e.flags = EF_N_EEP | EF_V_EEP; + e.name.eep = idx; + while ((nlen = varname_get(name, &e)) != 0 && idx < 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 (entrycount <= CONFIG_ENVVAR_MAX) { + e.val.eep = idx + nlen + 1; - if (strncmp(name, s, nlen) == 0) + 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; - - 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; + qsort(env_list, entrycount, sizeof(env_item_t), comp_env_items); + + return 0; +} -//printf_P(PSTR("*** ee_entry_get: >>>>>> LEAVE 0x%.4x <<<<<\n"), -// (unsigned int) ep); - return ep; +static +int set_default_env(void) +{ + char buf[56]; + uint16_t eep = CONFIG_ENV_OFFSET + offsetof(env_t, data); + unsigned int len = ENV_SIZE; + unsigned int i, src = 0; + char c = 0xff, c0 = c; + + if (env_valid == 1) { + eep = CONFIG_ENV_OFFSET + offsetof(env_t, data) + CONFIG_ENV_SIZE; } -//printf_P(PSTR("*** ee_entry_get: >>>>>> LEAVE <<<<<\n")); - return NULL; -} -#endif + 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]; + } + eeprom_update_block(buf, (char *) eep, i); + if (c == 0 && c0 == 0) + len = 0; + if (len > sizeof(buf)) + len -= sizeof(buf); + src += sizeof(buf); + eep += sizeof(buf); + } + + return 0; +} -#if 0 -static char p_env_name_buf[CONFIG_SYS_ENV_NAMELEN+1]; -static char *dbg_p_env_name(env_item_t *p) +static +uint16_t env_crc(uint16_t data_offset) { - if (p->flags & EF_N_EEP) { - if (ee_name_get(p_env_name_buf, p) != 0) - return p_env_name_buf; - else - return ""; + uint16_t crc; + uint16_t i; + char c, c0; + + crc = 0xffff; + c = 0xff; + for (i = 0; !(c == 0 && c0 == 0) && i < ENV_SIZE; i++) + { + c0 = c; + c = eeprom_read_byte((const uint8_t *) data_offset + i); + crc = crc16(crc, c); } - return ""; + return crc ; } + + +/** + * return valid env + */ +static +int env_check_valid(void) +{ + const uint16_t offset[2] = {CONFIG_ENV_OFFSET, + CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE}; + uint_fast8_t flags[2], crc_ok[2]; + int rc; + + /* read FLAGS */ + flags[0] = eeprom_read_byte ((uint8_t *) offset[0] + + offsetof(env_t, flags)); + flags[1] = eeprom_read_byte ((uint8_t *) offset[1] + + offsetof(env_t, flags)); + + /* check CRC */ + crc_ok[0] = ( + eeprom_read_word((uint16_t *) offset[0] + + offsetof(env_t, crc)) + == env_crc(offset[0] + offsetof(env_t, data)) + ); + crc_ok[1] = ( + eeprom_read_word((uint16_t *) offset[1] + + offsetof(env_t, crc)) + == env_crc(offset[1] + offsetof(env_t, data)) + ); + + if (!crc_ok[0] && !crc_ok[1]) { + rc = 0; + + } else if (crc_ok[0] && !crc_ok[1]) { + rc = 1; + } else if (!crc_ok[0] && crc_ok[1]) { + rc = 2; + } else { + /* both ok - check serial */ +#if 1 + if (flags[1] == ACTIVE_FLAG && flags[0] != ACTIVE_FLAG) + rc = 2; + else if (flags[1] == OBSOLETE_FLAG && flags[0] == 0xFF) + rc = 2; + else + rc = 1; +#else + if (flags[0] == ACTIVE_FLAG && flags[1] == OBSOLETE_FLAG) + rc = 1; + else if (flags[0] == OBSOLETE_FLAG && flags[1] == ACTIVE_FLAG) + rc = 2; + else if (flags[0] == 0xFF && flags[1] == 0) + rc = 2; + else if (flags[1] == 0xFF && flags[0] == 0) + rc = 1; + else /* flags are equal - almost impossible */ + rc = 1; #endif + } + + return rc; +} -int env_item_print(env_item_t *ep) + +int env_init(void) { - 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; - } + env_valid = env_check_valid(); + if (env_valid == 0) { + printf_P(PSTR("*** Warning - bad CRC, " + "using default environment\n\n")); + set_default_env(); } - putchar('\n'); - len ++; - - return len; + entrycount = 0; + envlist_import(); + return 0; } -static env_item_t *envlist_search(const char *name) +static +env_item_t *envlist_search(const char *name) { return bsearch(name, env_list, entrycount, sizeof(env_item_t), comp_env_key_item); } -#if 0 -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; -} -#endif +static env_item_t *envlist_enter(env_item_t *e) { char *key = e->name.ram; @@ -373,7 +363,38 @@ env_item_t *envlist_enter(env_item_t *e) } -static env_item_t *envlist_get(const char *name, uint_fast8_t flag) +static +int env_item_delete(env_item_t *ep) +{ + if (entrycount == 0) + return -1; + if ((ep->flags & EF_V_EEP) == 0) + free(ep->val.ram); + if ((ep->flags & EF_N_EEP) == 0) + free(ep->name.ram); + + entrycount--; + size_t size = sizeof(env_item_t); + memmove(ep, ep + 1, (env_list - ep)*size + entrycount*size); + + return 0; +} + +static +int envlist_delete(const char *name) +{ + env_item_t *ep = bsearch(name, env_list, entrycount, + sizeof(env_item_t), comp_env_key_item); + + if (ep != NULL) + return env_item_delete(ep); + + return 1; +} + + +static +env_item_t *envlist_get(const char *name, uint_fast8_t flag) { env_item_t *ep; @@ -383,8 +404,10 @@ static env_item_t *envlist_get(const char *name, uint_fast8_t flag) if (ep->flags & EF_V_EEP) { char *vp; uint_fast8_t len; + /* TODO: function that gets len of val, + to get rid of xrealloc */ vp = xmalloc(CONFIG_SYS_CBSIZE); - len = ee_val_get(vp, ep->val.eep, CONFIG_SYS_CBSIZE); + len = varval_get(vp, ep->val.eep, CONFIG_SYS_CBSIZE); ep->val.ram = xrealloc(vp, len + 1); ep->flags &= ~EF_V_EEP; } @@ -394,185 +417,133 @@ static env_item_t *envlist_get(const char *name, uint_fast8_t flag) } -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--; - memmove(ep, ep + 1, (env_list - ep)*size + entrycount*size); - - rc = 1; - } -#if 0 - 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; ival.ram; -#if 0 - 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 sizeof(buf)) - len -= sizeof(buf); - src += sizeof(buf); - eep += sizeof(buf); + eeprom_update_block(buf, (uint8_t *) offset, len); + offset += len; + + if (e.val.ram != NULL) { + char c; + do { + if (e.flags & EF_V_EEP) + c = env_get_char(e.val.eep++); + else + c = *e.val.ram++; + + eeprom_update_byte((uint8_t *) offset, c); + offset++; + space_left--; + len++; + } while ((c != '\0') && space_left ); } - - eeprom_update_word( - (uint16_t *) CONFIG_ENV_OFFSET + offsetof(env_t, crc), - crc); -#if 0 - dump_eep(0, 128); -#endif - return 0; -} + return len; +} -int env_check(void) +static +int saveenv(void) { - uint16_t crc, stored_crc; - uint16_t i; - char c, c0; + unsigned int off = CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE; + unsigned int off_red = CONFIG_ENV_OFFSET; + unsigned int pos; + int len, left; + uint16_t crc; + int rc = 0; - debug("\n\n** env_check()\n"); - + if (env_valid == 2) { + off = CONFIG_ENV_OFFSET; + off_red = CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE; + } - /* 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 < ENV_SIZE; - i++) - { - c0 = c; - c = eeprom_read_byte((const uint8_t *) CONFIG_ENV_OFFSET + i); - crc = crc16(crc, c); + eeprom_update_byte((uint8_t *) off + offsetof(env_t, flags), 0xff); + + pos = off + offsetof(env_t, data); + left = ENV_SIZE - 1; + for (int i = 0 ; i < entrycount; i++) { + len = env_item_save(&env_list[i], pos, left); + if (len == 0) { + return 1; + } + pos += len; + left -= len; + } + /* terminate list */ + eeprom_update_byte((uint8_t *) pos, 0); + crc = env_crc(off + offsetof(env_t, data)); + eeprom_update_word((uint16_t *) off + offsetof(env_t, crc), crc); + eeprom_update_byte((uint8_t *) off + offsetof(env_t, flags), + ACTIVE_FLAG); + + if (rc == 0) { + while (entrycount != 0) { + env_item_delete(&env_list[entrycount-1]); + } + eeprom_update_byte((uint8_t *) off_red + offsetof(env_t, flags), + OBSOLETE_FLAG); + env_valid = (env_valid == 2) ? 1 : 2; + + envlist_import(); } - debug_cond((crc != stored_crc), - "** crc eep: 0x%.4x, crc new: 0x%.4x\n", stored_crc, crc); - return crc == stored_crc; + return rc; } -int env_init(void) + +static +int env_item_print(env_item_t *ep) { - 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) { + char buf[CONFIG_SYS_ENV_NAMELEN+1]; + int len; + env_item_t e = *ep; - if (entrycount <= CONFIG_ENVVAR_MAX) { - e.val.eep = idx + nlen + 1; + varname_get(buf, ep); + len = printf_P(PSTR("%s="), buf); - 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; + 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; } } - qsort(env_list, entrycount, sizeof(env_item_t), comp_env_items); + putchar('\n'); + len ++; - return 0; -} + return len; +} /* @@ -580,7 +551,8 @@ int env_init(void) * * Returns -1 in case of error, or length of printed string */ -static int env_print(char *name) +static +int env_print(char *name) { int len = -1; @@ -599,6 +571,7 @@ static int env_print(char *name) return len; } +static int env_print_ramsize(void) { int size = 0; @@ -622,35 +595,34 @@ int env_print_ramsize(void) return size; } -int do_env_print(cmd_tbl_t *cmdtp, int flag, int argc, - char * const argv[]) + +command_ret_t do_env_print(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { - int i; - int rcode = 0; + command_ret_t rc = CMD_RET_SUCCESS; (void) cmdtp; (void) flag; if (argc == 1) { /* print all env vars */ - rcode = env_print(NULL); - if (rcode < 0) - return 1; + int size = env_print(NULL); + if (size < 0) + return CMD_RET_FAILURE; printf_P(PSTR("\nEnvironment size: %d/%d bytes\n"), - rcode, ENV_SIZE); + size, ENV_SIZE); env_print_ramsize(); - return 0; + return CMD_RET_SUCCESS; } /* print selected env vars */ - for (i = 1; i < argc; ++i) { + for (int 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; + rc = CMD_RET_FAILURE; } } - return rcode; + return rc; } @@ -668,7 +640,8 @@ int do_env_print(cmd_tbl_t *cmdtp, int flag, int argc, * * @return 0 if ok, 1 on error */ -static int _do_env_set(int flag, int argc, char * const argv[]) +static +command_ret_t _do_env_set(int flag, int argc, char * const argv[]) { int i, len; char *name, *value, *s; @@ -683,12 +656,12 @@ static int _do_env_set(int flag, int argc, char * const argv[]) if (strchr(name, '=')) { printf_P(PSTR("## Error: illegal character '='" "in variable name \"%s\"\n"), name); - return 1; + return CMD_RET_FAILURE; } 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; + return CMD_RET_FAILURE; } /* env_id++; @@ -696,7 +669,7 @@ static int _do_env_set(int flag, int argc, char * const argv[]) /* Delete only ? */ if (argc < 3 || argv[2] == NULL) { int rc = envlist_delete(name); - return !rc; + return rc ? CMD_RET_FAILURE : CMD_RET_SUCCESS; } /* @@ -708,7 +681,7 @@ static int _do_env_set(int flag, int argc, char * const argv[]) value = xmalloc(len); if (value == NULL) { printf_P(PSTR("## Can't malloc %d bytes\n"), len); - return 1; + return CMD_RET_FAILURE; } for (i = 2, s = value; i < argc; ++i) { char *v = argv[i]; @@ -727,10 +700,10 @@ static int _do_env_set(int flag, int argc, char * const argv[]) if (!ep) { printf_P(PSTR("## Error inserting \"%s\" variable.\n"), name); - return 1; + return CMD_RET_FAILURE; } - return 0; + return CMD_RET_SUCCESS; } /** @@ -740,6 +713,7 @@ static int _do_env_set(int flag, int argc, char * const argv[]) * @param varvalue Value to set it to * @return 0 if ok, 1 on error */ +static int setenv(const char *varname, const char *varvalue) { const char * const argv[3] = { NULL, varname, varvalue }; @@ -748,7 +722,7 @@ int setenv(const char *varname, const char *varvalue) if (varvalue == NULL || varvalue[0] == '\0') --argc; - return _do_env_set(0, argc, (char * const *)argv); + return (int) _do_env_set(0, argc, (char * const *)argv); } #if 0 @@ -806,7 +780,7 @@ unsigned long getenv_hex(const char *varname, unsigned long default_val) return value; } -int do_env_set(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +command_ret_t do_env_set(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { (void) cmdtp; @@ -817,6 +791,14 @@ int do_env_set(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } +command_ret_t do_env_save(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + (void) cmdtp; (void) flag; (void) argc; (void) argv; + + printf_P(PSTR("Saving Environment ...\n")); + return saveenv() ? CMD_RET_FAILURE : CMD_RET_SUCCESS; +} + #if defined(CONFIG_AUTO_COMPLETE) int env_complete(char *var, int maxv, char *cmdv[], int bufsz, char *buf) { @@ -848,4 +830,3 @@ int env_complete(char *var, int maxv, char *cmdv[], int bufsz, char *buf) return found; } #endif -