#define MEMX

diff --git a/avr/env.c b/avr/env.c
index 343d88204b4e2636cc21b878101d603aa0ff5564..c6e173c8feffb7785ed1f1c3be73447ae0f0699d 100644 (file)
--- a/avr/env.c
+++ b/avr/env.c
@@ -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;

diff --git a/avr/main.c b/avr/main.c
index dc7a6ef50bfc7d1fc33bc98f171bb3506ad151c9..a09f05c4e2de94bafabc765767ab88b982faa393 100644 (file)
--- a/avr/main.c
+++ b/avr/main.c
@@ -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

diff --git a/include/common.h b/include/common.h
index e8879a613c1477dceabab305aa5e1c2c3430decb..90b02837bec55975261880ab8cd72e7a17231069 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -17,8 +17,10 @@
 
 #ifdef __FLASH
 #define FLASH __flash
+#define MEMX __memx
 #else
 #define FLASH
+#define MEMX
 #endif 
 
 #define stringify(s)   tostring(s)

diff --git a/include/env.h b/include/env.h
index 4f210120c3e286822be58a70588a0bebf6118377..3e775b385f85c10484b1e6a7d6c23cb904773b0e 100644 (file)
--- a/include/env.h
+++ b/include/env.h
@@ -3,8 +3,8 @@
 
 int env_init(void);
 
-char *getenv(const __memx char *name);
-unsigned long getenv_ulong(const __memx char *name, int base, unsigned long default_val);
+char *getenv(const MEMX char *name);
+unsigned long getenv_ulong(const MEMX char *name, int base, unsigned long default_val);
 
 #if defined(CONFIG_AUTO_COMPLETE) 
 int env_complete(char *var, int maxv, char *cmdv[], int maxsz, char *buf);