Use new header locations everywhere

[bertos.git] / bertos / cfg / debug.h

diff --git a/bertos/cfg/debug.h b/bertos/cfg/debug.h
index 0c8bfec09e75effc8d830d6acd853ffd36d9f9e4..907610c75a9d7b92138e0a40d84d6ada59eb8539 100644 (file)
--- a/bertos/cfg/debug.h
+++ b/bertos/cfg/debug.h
@@ -129,7 +129,7 @@
        void __init_wall(long *wall, int size);
 
        #if CPU_HARVARD
-               #include <mware/pgm.h>
+               #include <cpu/pgm.h>
                void kputs_P(const char *PROGMEM str);
                void kprintf_P(const char *PROGMEM fmt, ...) FORMAT(__printf__, 1, 2);
                int __bassert_P(const char *PROGMEM cond, const char *PROGMEM file, int line);
@@ -169,14 +169,16 @@
         * memory regions.  This helps catching pointers taken from
         * struct/class memebers when the struct pointer was NULL.
         */
-       #define ASSERT_VALID_PTR(p)         ((void)(LIKELY((p) >= 0x200) ? 0 : __invalid_ptr(p, #p, THIS_FILE, __LINE__)))
+       #define ASSERT_VALID_PTR(p) ((void)(LIKELY((p) >= (void *)CPU_RAM_START) \
+               ? 0 : __invalid_ptr(p, #p, THIS_FILE, __LINE__)))
 
        /**
         * Check that the given pointer is not pointing to invalid memory.
         *
         * \see ASSERT_VALID_PTR()
         */
-       #define ASSERT_VALID_PTR_OR_NULL(p) ((void)(LIKELY((p == NULL) || ((p) >= 0x200)) ? 0 : __invalid_ptr((p), #p, THIS_FILE, __LINE__)))
+       #define ASSERT_VALID_PTR_OR_NULL(p) ((void)(LIKELY((p == NULL) || ((p) >= (void *)CPU_RAM_START)) \
+               ? 0 : __invalid_ptr((p), #p, THIS_FILE, __LINE__)))
 
        #if !CONFIG_KDEBUG_DISABLE_TRACE
                #define TRACE  __trace(__func__)