From 633dd492831db37f4df98315425ee146b8cb312b Mon Sep 17 00:00:00 2001 From: Michael Giacomelli Date: Mon, 6 Aug 2012 19:18:20 -0400 Subject: [PATCH] Remove copy/pasted preprocessor defines that shouldn't have been included. Also, add dummy defines for application targets so that ERRORF, etc map to DEBUGF instead of a compile error and add a new line at the end of logf.c. Change-Id: Ie7c5bc3397a853af619e810defce6123114e7a51 --- firmware/export/logdiskf.h | 12 ++++++++---- firmware/logf.c | 3 +-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/firmware/export/logdiskf.h b/firmware/export/logdiskf.h index 628662fdba..1da2b68b4e 100644 --- a/firmware/export/logdiskf.h +++ b/firmware/export/logdiskf.h @@ -29,8 +29,6 @@ void init_logdiskf(void); -#ifndef __PCTOOL__ - /*large memory devices spin up the disk much less often*/ #if MEMORYSIZE > 32 #define MAX_LOGDISKF_SIZE 8192 @@ -42,8 +40,6 @@ void init_logdiskf(void); extern unsigned char logdiskfbuffer[MAX_LOGDISKF_SIZE]; extern int logfdiskindex; -#endif /* __PCTOOL__ */ - #define LOGDISK_LEVEL 1 @@ -78,4 +74,12 @@ void _logdiskf(const char* file, const char level, #endif /* !ROCKBOX_HAS_LOGDISKF */ +#else + +#define ERRORF DEBUGF +#define WARNF DEBUGF +#define NOTEF DEBUGF + #endif /* LOGDISKF_H */ + + diff --git a/firmware/logf.c b/firmware/logf.c index 23af33d076..e135b0b27f 100644 --- a/firmware/logf.c +++ b/firmware/logf.c @@ -320,5 +320,4 @@ void init_logdiskf() { register_storage_idle_func(flush_buffer); } - -#endif \ No newline at end of file +#endif