diff --git a/ports/arm/atomport-tests.h b/ports/arm/atomport-tests.h index 1c52be9..79865bb 100644 --- a/ports/arm/atomport-tests.h +++ b/ports/arm/atomport-tests.h @@ -33,12 +33,12 @@ /* Include Atomthreads kernel API */ #include "atom.h" -/* Prerequisite for ATOMLOG() macro (via dbg_format_msg) */ -extern void dbg_format_msg (char *format, ...) ; +/* Include printf for ATOMLOG() */ +#include /* Logger macro for viewing test results */ -#define ATOMLOG dbg_format_msg +#define ATOMLOG printf /* * String location macro: for platforms which need to place strings in diff --git a/ports/arm/platforms/qemu_integratorcp/modules.c b/ports/arm/platforms/qemu_integratorcp/modules.c index 0983b55..5ee8e05 100644 --- a/ports/arm/platforms/qemu_integratorcp/modules.c +++ b/ports/arm/platforms/qemu_integratorcp/modules.c @@ -48,28 +48,6 @@ ICP_PIC_T * const board_pic = (ICP_PIC_T*)BOARD_BASE_ADDRESS_PIC; #define TIMER0_CLOCK_SPEED 40000000 -/** - * \b dbg_format_msg - * - * Same as printf. - * - */ -void -dbg_format_msg (char *format, ...) -{ - va_list args; - static char msg[256] ; - CRITICAL_STORE ; - - va_start (args, format) ; - CRITICAL_START() ; - vsnprintf ((char*)msg, 256, (char*)format, args) ; - printf (msg) ; - CRITICAL_END() ; - -} - - /** * \b _mainCRTStartup * diff --git a/ports/arm/platforms/qemu_integratorcp/modules.h b/ports/arm/platforms/qemu_integratorcp/modules.h index c3237e0..9672418 100644 --- a/ports/arm/platforms/qemu_integratorcp/modules.h +++ b/ports/arm/platforms/qemu_integratorcp/modules.h @@ -121,9 +121,6 @@ extern ICP_PIC_T* const board_pic ; /* Function prototypes */ extern int low_level_init (void) ; -extern void dbg_format_msg (char *format, ...) ; - -#define DBG_MESSAGE(fmt_str) { dbg_format_msg fmt_str ; } #endif /* __MODULES_H__ */ diff --git a/tests/stress1.c b/tests/stress1.c index c27b01e..f16827c 100644 --- a/tests/stress1.c +++ b/tests/stress1.c @@ -75,13 +75,13 @@ monitor_thread (uint32_t parm) uint32_t time = atomTimeGet() ; CRITICAL_START(); - ATOMLOG (_STR("\r\nMonitor %d threads # %d (%08d)\r\n"), parm, counter, (unsigned int)time) ; + ATOMLOG (_STR("\r\nMonitor %d threads # %d (%08d)\r\n"), (int)parm, counter, (unsigned int)time) ; ATOMLOG (_STR("------------------------------\r\n")) ; //CRITICAL_END(); for (i=0; i