summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorMihail Zenkov <mihail.zenkov@gmail.com>2016-03-31 11:33:11 +0000
committerGerrit Rockbox <gerrit@rockbox.org>2016-04-04 11:07:44 +0200
commite599810ffaa6412326f61d026fc598c721b3a01c (patch)
treefe21a4f5f388ed87e3112f00ff68cf3448f34e4e /firmware
parent26beb30c155aebc5e6e50366f1cfa34300a8c63a (diff)
downloadrockbox-e599810ffaa6412326f61d026fc598c721b3a01c.tar.gz
rockbox-e599810ffaa6412326f61d026fc598c721b3a01c.zip
Don't add new message to logf when we dump it to file
Fix log file corruption if we have new messages at dumping log to file. Comment removed as it incorrect. We store all messages in direct order (last message at end of file). Change-Id: I4acfa8a0935cc41a889e08f6bc42974fefd1ade2
Diffstat (limited to 'firmware')
-rw-r--r--firmware/export/logf.h1
-rw-r--r--firmware/logf.c4
2 files changed, 5 insertions, 0 deletions
diff --git a/firmware/export/logf.h b/firmware/export/logf.h
index e881e7e496..c8aaad06b4 100644
--- a/firmware/export/logf.h
+++ b/firmware/export/logf.h
@@ -34,6 +34,7 @@
34extern unsigned char logfbuffer[MAX_LOGF_SIZE]; 34extern unsigned char logfbuffer[MAX_LOGF_SIZE];
35extern int logfindex; 35extern int logfindex;
36extern bool logfwrap; 36extern bool logfwrap;
37extern bool logfenabled;
37#endif /* __PCTOOL__ */ 38#endif /* __PCTOOL__ */
38 39
39#define logf _logf 40#define logf _logf
diff --git a/firmware/logf.c b/firmware/logf.c
index 0f05c6590d..bdc5ad9cc0 100644
--- a/firmware/logf.c
+++ b/firmware/logf.c
@@ -62,6 +62,7 @@ static int logdiskfindex;
62unsigned char logfbuffer[MAX_LOGF_SIZE]; 62unsigned char logfbuffer[MAX_LOGF_SIZE];
63int logfindex; 63int logfindex;
64bool logfwrap; 64bool logfwrap;
65bool logfenabled = true;
65#endif 66#endif
66 67
67#ifdef HAVE_REMOTE_LCD 68#ifdef HAVE_REMOTE_LCD
@@ -214,6 +215,9 @@ static int logf_push(void *userp, unsigned char c)
214 215
215void _logf(const char *fmt, ...) 216void _logf(const char *fmt, ...)
216{ 217{
218 if (!logfenabled)
219 return;
220
217 #ifdef USB_ENABLE_SERIAL 221 #ifdef USB_ENABLE_SERIAL
218 int old_logfindex = logfindex; 222 int old_logfindex = logfindex;
219 #endif 223 #endif