summaryrefslogtreecommitdiff
path: root/firmware/export
diff options
context:
space:
mode:
authorMichael Giacomelli <giac2000@hotmail.com>2012-08-06 19:18:20 -0400
committerMichael Giacomelli <giac2000@hotmail.com>2012-08-06 19:20:47 -0400
commit633dd492831db37f4df98315425ee146b8cb312b (patch)
tree8d75726a07144dadc79d05cd51c0d433fed27ac3 /firmware/export
parent97c1dc0368dadf3f404bc4c5e1af1193eeb713b3 (diff)
downloadrockbox-633dd492831db37f4df98315425ee146b8cb312b.tar.gz
rockbox-633dd492831db37f4df98315425ee146b8cb312b.zip
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
Diffstat (limited to 'firmware/export')
-rw-r--r--firmware/export/logdiskf.h12
1 files changed, 8 insertions, 4 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 @@
29 29
30void init_logdiskf(void); 30void init_logdiskf(void);
31 31
32#ifndef __PCTOOL__
33
34/*large memory devices spin up the disk much less often*/ 32/*large memory devices spin up the disk much less often*/
35#if MEMORYSIZE > 32 33#if MEMORYSIZE > 32
36 #define MAX_LOGDISKF_SIZE 8192 34 #define MAX_LOGDISKF_SIZE 8192
@@ -42,8 +40,6 @@ void init_logdiskf(void);
42 40
43extern unsigned char logdiskfbuffer[MAX_LOGDISKF_SIZE]; 41extern unsigned char logdiskfbuffer[MAX_LOGDISKF_SIZE];
44extern int logfdiskindex; 42extern int logfdiskindex;
45#endif /* __PCTOOL__ */
46
47 43
48#define LOGDISK_LEVEL 1 44#define LOGDISK_LEVEL 1
49 45
@@ -78,4 +74,12 @@ void _logdiskf(const char* file, const char level,
78 74
79#endif /* !ROCKBOX_HAS_LOGDISKF */ 75#endif /* !ROCKBOX_HAS_LOGDISKF */
80 76
77#else
78
79#define ERRORF DEBUGF
80#define WARNF DEBUGF
81#define NOTEF DEBUGF
82
81#endif /* LOGDISKF_H */ 83#endif /* LOGDISKF_H */
84
85