diff options
author | Leo C | 2014-08-25 17:03:02 +0200 |
---|---|---|
committer | Leo C | 2014-08-30 13:38:54 +0200 |
commit | fc30b18e2023806ace24dd857ed851c491f81e50 (patch) | |
tree | bd7cba02f6467bc6f0942a4eded605b8ba55ecd3 /avr | |
parent | d04c2fedf2729db314ae21664b14e6fa4a53e300 (diff) | |
download | z180-stamp-fc30b18e2023806ace24dd857ed851c491f81e50.zip |
#define MEMX
Diffstat (limited to 'avr')
-rw-r--r-- | avr/env.c | 12 | ||||
-rw-r--r-- | avr/main.c | 8 |
2 files changed, 10 insertions, 10 deletions
@@ -322,7 +322,7 @@ int env_init(void) -env_item_t *envlist_search(const __memx char *name) +env_item_t *envlist_search(const MEMX char *name) { char *p = (char *) name; @@ -420,7 +420,7 @@ int envlist_delete(const char *name) static -env_item_t *envlist_get(const __memx char *name, uint_fast8_t flag) +env_item_t *envlist_get(const MEMX char *name, uint_fast8_t flag) { env_item_t *ep; @@ -447,7 +447,7 @@ env_item_t *envlist_get(const __memx char *name, uint_fast8_t flag) } -char *getenv(const __memx char *name) +char *getenv(const MEMX char *name) { env_item_t *ep; char *ret = NULL; @@ -582,7 +582,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) { int len = -1; @@ -780,7 +780,7 @@ int setenv_ulong(const char *varname, unsigned long value) * @param value Value to set it to * @return 0 if ok, 1 on error */ -int setenv_hex(const __memx char *varname, unsigned long value) +int setenv_hex(const MEMX char *varname, unsigned long value) { char str[sizeof(unsigned long) *2 + 1]; @@ -798,7 +798,7 @@ int setenv_hex(const __memx char *varname, unsigned long value) * found * @return the decoded value, or default_val if not found */ -unsigned long getenv_ulong(const __memx char *name, int base, unsigned long default_val) +unsigned long getenv_ulong(const MEMX char *name, int base, unsigned long default_val) { char buf[16]; unsigned long value; @@ -164,13 +164,13 @@ const char *bootdelay_process(void) char *s; int bootdelay; - bootdelay = (int) getenv_ulong("bootdelay", 10, CONFIG_BOOTDELAY); + bootdelay = (int) getenv_ulong(PSTR("bootdelay"), 10, CONFIG_BOOTDELAY); debug("### main_loop entered: bootdelay=%d\n\n", bootdelay); _delay_ms(20); - s = getenv("bootcmd"); + s = getenv(PSTR("bootcmd")); stored_bootdelay = bootdelay; return s; } @@ -208,7 +208,7 @@ int main(void) if (reset_reason_is_power_on()) _delay_ms(CONFIG_PWRON_DELAY); - serial_setup(getenv_ulong("baudrate", 10, CONFIG_BAUDRATE)); + serial_setup(getenv_ulong(PSTR("baudrate"), 10, CONFIG_BAUDRATE)); sei(); #if DEBUG @@ -217,7 +217,7 @@ int main(void) #endif #if DEBUG - unsigned long i_speed = getenv_ulong("i2c_clock", 10, CONFIG_SYS_I2C_CLOCK); + unsigned long i_speed = getenv_ulong(PSTR("i2c_clock"), 10, CONFIG_SYS_I2C_CLOCK); debug("### Setting I2C clock Frequency to %lu Hz.\n", i_speed); i2c_init(i_speed); #else |