projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lm3s1968: improve the example with GUI enhancements, keypad driver and menu.
[bertos.git]
/
bertos
/
drv
/
kdebug.c
diff --git
a/bertos/drv/kdebug.c
b/bertos/drv/kdebug.c
index 3b2c18bd90671c6ffc76dfa73ca2d38c08dcaa4a..7e5eaaa7befabfc2ccf11db90b4f7eccc752e392 100644
(file)
--- a/
bertos/drv/kdebug.c
+++ b/
bertos/drv/kdebug.c
@@
-27,28
+27,26
@@
* the GNU General Public License.
*
* Copyright 2003, 2004, 2005, 2006, 2007 Develer S.r.l. (http://www.develer.com/)
* the GNU General Public License.
*
* Copyright 2003, 2004, 2005, 2006, 2007 Develer S.r.l. (http://www.develer.com/)
- * Copyright 2000, 2001, 2002 Bernardo Innocenti <bernie@codewiz.org>
- *
+ * Copyright 2000, 2001, 2002 Bernie Innocenti <bernie@codewiz.org>
* -->
*
* \brief General pourpose debug support for embedded systems (implementation).
*
* \version $Id$
* -->
*
* \brief General pourpose debug support for embedded systems (implementation).
*
* \version $Id$
- * \author Bern
ardo Innocenti <bernie@develer.com
>
+ * \author Bern
ie Innocenti <bernie@codewiz.org
>
* \author Stefano Fedrigo <aleph@develer.com>
*/
* \author Stefano Fedrigo <aleph@develer.com>
*/
-#include <cpu/irq.h>
-#include <cpu/attr.h>
-#include <cpu/types.h>
-
+#include "cfg/cfg_debug.h"
#include <cfg/macros.h> /* for BV() */
#include <cfg/debug.h>
#include <cfg/macros.h> /* for BV() */
#include <cfg/debug.h>
+#include <cfg/os.h>
-#include <appconfig.h>
+#include <cpu/attr.h>
+#include <cpu/types.h>
#include <mware/formatwr.h> /* for _formatted_write() */
#include <mware/formatwr.h> /* for _formatted_write() */
-#include <
mware
/pgm.h>
+#include <
cpu
/pgm.h>
#ifdef _DEBUG
#ifdef _DEBUG
@@
-58,9
+56,10
@@
#if OS_HOSTED
#if OS_HOSTED
- #include <stdio.h>
+ #include <unistd.h> // write()
+
#define KDBG_WAIT_READY() do { /*nop*/ } while(0)
#define KDBG_WAIT_READY() do { /*nop*/ } while(0)
- #define KDBG_WRITE_CHAR(c)
putc((c), stderr
)
+ #define KDBG_WRITE_CHAR(c)
do { char __c = (c); write(STDERR_FILENO, &__c, sizeof(__c)); } while(0
)
#define KDBG_MASK_IRQ(old) do { (void)(old); } while(0)
#define KDBG_RESTORE_IRQ(old) do { /*nop*/ } while(0)
typedef char kdbg_irqsave_t; /* unused */
#define KDBG_MASK_IRQ(old) do { (void)(old); } while(0)
#define KDBG_RESTORE_IRQ(old) do { /*nop*/ } while(0)
typedef char kdbg_irqsave_t; /* unused */
@@
-190,7
+189,7
@@
static void klocation(const char * PGM_ATTR file, int line)
PGM_FUNC(kputs)(PGM_STR(": "));
}
PGM_FUNC(kputs)(PGM_STR(": "));
}
-int PGM_FUNC(__assert)(const char * PGM_ATTR cond, const char * PGM_ATTR file, int line)
+int PGM_FUNC(__
b
assert)(const char * PGM_ATTR cond, const char * PGM_ATTR file, int line)
{
klocation(file, line);
PGM_FUNC(kputs)(PGM_STR("Assertion failed: "));
{
klocation(file, line);
PGM_FUNC(kputs)(PGM_STR("Assertion failed: "));