diff options
Diffstat (limited to 'utils')
-rw-r--r-- | utils/log.c | 38 | ||||
-rw-r--r-- | utils/nsoption.h | 3 |
2 files changed, 38 insertions, 3 deletions
diff --git a/utils/log.c b/utils/log.c index e267b3179..97e1ee19a 100644 --- a/utils/log.c +++ b/utils/log.c @@ -301,5 +301,43 @@ nslog_finalise() } #ifdef WITH_NSLOG nslog_cleanup(); + + gettimeofday(&now_tv, NULL); + + timeval_subtract(&tv, &now_tv, &start_tv); + + snprintf(buff, sizeof(buff),"(%ld.%06ld)", + (long)tv.tv_sec, (long)tv.tv_usec); + + return buff; +} + +void nslog_log(const char *file, const char *func, int ln, const char *format, ...) +{ +#ifndef _TARGET_IS_KOLIBRIOS + va_list ap; + + fprintf(logfile, "%s %s:%i %s: ", nslog_gettime(), file, ln, func); + + va_start(ap, format); + + vfprintf(logfile, format, ap); + + va_end(ap); + + fputc('\n', logfile); +#else + va_list ap; + char message[1000]; + + va_start(ap, format); + vsprintf(message, format, ap); + va_end(ap); + + debug_board_printf(message); + debug_board_printf("\n"); +#endif +} + #endif } diff --git a/utils/nsoption.h b/utils/nsoption.h index dc23a70ff..113efce8b 100644 --- a/utils/nsoption.h +++ b/utils/nsoption.h @@ -56,9 +56,6 @@ #define NSOPTION_UINT(NAME, DEFAULT) #define NSOPTION_COLOUR(NAME, DEFAULT) -#ifndef _TARGET_IS_KOLIBRIOS -#define _TARGET_IS_KOLIBRIOS -#endif #ifdef _TARGET_IS_KOLIBRIOS #define nskolibrios #endif |