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
This commit is contained in:
parent
97c1dc0368
commit
633dd49283
2 changed files with 9 additions and 6 deletions
|
@ -29,8 +29,6 @@
|
||||||
|
|
||||||
void init_logdiskf(void);
|
void init_logdiskf(void);
|
||||||
|
|
||||||
#ifndef __PCTOOL__
|
|
||||||
|
|
||||||
/*large memory devices spin up the disk much less often*/
|
/*large memory devices spin up the disk much less often*/
|
||||||
#if MEMORYSIZE > 32
|
#if MEMORYSIZE > 32
|
||||||
#define MAX_LOGDISKF_SIZE 8192
|
#define MAX_LOGDISKF_SIZE 8192
|
||||||
|
@ -42,8 +40,6 @@ void init_logdiskf(void);
|
||||||
|
|
||||||
extern unsigned char logdiskfbuffer[MAX_LOGDISKF_SIZE];
|
extern unsigned char logdiskfbuffer[MAX_LOGDISKF_SIZE];
|
||||||
extern int logfdiskindex;
|
extern int logfdiskindex;
|
||||||
#endif /* __PCTOOL__ */
|
|
||||||
|
|
||||||
|
|
||||||
#define LOGDISK_LEVEL 1
|
#define LOGDISK_LEVEL 1
|
||||||
|
|
||||||
|
@ -78,4 +74,12 @@ void _logdiskf(const char* file, const char level,
|
||||||
|
|
||||||
#endif /* !ROCKBOX_HAS_LOGDISKF */
|
#endif /* !ROCKBOX_HAS_LOGDISKF */
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
|
#define ERRORF DEBUGF
|
||||||
|
#define WARNF DEBUGF
|
||||||
|
#define NOTEF DEBUGF
|
||||||
|
|
||||||
#endif /* LOGDISKF_H */
|
#endif /* LOGDISKF_H */
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -320,5 +320,4 @@ void init_logdiskf()
|
||||||
{
|
{
|
||||||
register_storage_idle_func(flush_buffer);
|
register_storage_idle_func(flush_buffer);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
#endif
|
|
||||||
|
|
Loading…
Reference in a new issue