Add progmem datatypes; PSTR() definition.

[bertos.git] / debug.h

diff --git a/debug.h b/debug.h
index 86d6820c1eda69f2b1ddfd6e8378ac8f2a695b6c..1ede2d7217158f00db113e48321f98f306a3054a 100755 (executable)
--- a/debug.h
+++ b/debug.h
@@ -17,6 +17,15 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.8  2005/01/11 18:08:08  aleph
+ *#* Add empty kdump definition for debug off
+ *#*
+ *#* Revision 1.7  2004/12/31 17:43:09  bernie
+ *#* Use UNUSED_ARG instead of obsolete UNUSED macro.
+ *#*
+ *#* Revision 1.6  2004/12/08 08:52:00  bernie
+ *#* Save some more RAM on AVR.
+ *#*
  *#* Revision 1.5  2004/12/08 08:04:13  bernie
  *#* Doxygen fixes.
  *#*
@@ -69,10 +78,15 @@
        #ifndef INLINE
        #define INLINE static inline
        #endif
-       #ifndef UNUSED
-       #define UNUSED(type,name) type
+       #ifndef UNUSED_ARG
+       #ifdef __cplusplus
+               #define UNUSED_ARG(type,name) type
+       #else
+               #define UNUSED_ARG(type,name) type name
+       #endif
        #endif
 #else /* !OS_HOSTED */
+       #include <config.h>
        #include <compiler.h>
 #endif /* !OS_HOSTED */
 
@@ -175,6 +189,7 @@
                void kdbg_init(void);
                void kputchar(char c);
                void kdump(const void *buf, size_t len);
+               void __init_wall(long *wall, int size);
 
                #ifdef __AVR__
                        #include <avr/pgmspace.h>
@@ -182,20 +197,20 @@
                        void kprintf_P(const char *PROGMEM fmt, ...) FORMAT(__printf__, 1, 2);
                        int __assert_P(const char *PROGMEM cond, const char *PROGMEM file, int line);
                        int __invalid_ptr_P(void *p, const char *PROGMEM name, const char *PROGMEM file, int line);
+                       int __check_wall_P(long *wall, int size, const char * PGM_ATTR name, const char * PGM_ATTR file, int line);
                        #define kputs(str)  kputs_P(PSTR(str))
                        #define kprintf(fmt, ...)  kprintf_P(PSTR(fmt) ,## __VA_ARGS__)
                        #define __assert(cond, file, line)  __assert_P(PSTR(cond), PSTR(file), (line))
                        #define __invalid_ptr(p, name, file, line)  __invalid_ptr_P((p), PSTR(name), PSTR(file), (line))
+                       #define __check_wall(wall, size, name, file, line)  __check_wall_P(wall, size, PSTR(name), PSTR(file), (line))
                #else /* !__AVR__ */
                        void kputs(const char *str);
                        void kprintf(const char * fmt, ...) FORMAT(__printf__, 1, 2);
                        int __assert(const char *cond, const char *file, int line);
                        int __invalid_ptr(void *p, const char *name, const char *file, int line);
+                       int __check_wall(long *wall, int size, const char *name, const char *file, int line);
                #endif /* !__AVR__ */
 
-               void __init_wall(long *wall, int size);
-               int __check_wall(long *wall, int size, const char *name, const char *file, int line);
-
                #ifndef CONFIG_KDEBUG_ASSERT_NO_TEXT
                        #define ASSERT(x)         ((void)(LIKELY(x) ? 0 : __assert(#x, THIS_FILE, __LINE__)))
                        #define ASSERT2(x, help)  ((void)(LIKELY(x) ? 0 : __assert(help " (" #x ")", THIS_FILE, __LINE__)))
@@ -312,14 +327,16 @@
        #define IMPLEMENT_INSTANCE_TRACKING(CLASS)
 
        INLINE void kdbg_init(void) { /* nop */ }
-       INLINE void kputchar(UNUSED(char, c)) { /* nop */ }
-       INLINE void kputs(UNUSED(const char*, str)) { /* nop */ }
+       INLINE void kputchar(UNUSED_ARG(char, c)) { /* nop */ }
+       INLINE void kputs(UNUSED_ARG(const char *, str)) { /* nop */ }
+       INLINE void kdump(UNUSED_ARG(const void *, buf), UNUSED_ARG(size_t, len)) { /* nop */ }
+
        #ifdef __cplusplus
                /* G++ can't inline functions with variable arguments... */
                #define kprintf(fmt,...) do { (void)(fmt); } while(0)
        #else
                /* ...but GCC can. */
-               INLINE void kprintf(UNUSED(const char*, fmt), ...) { /* nop */ }
+               INLINE void kprintf(UNUSED_ARG(const char *, fmt), ...) { /* nop */ }
        #endif
 
 #endif /* _DEBUG */