summaryrefslogtreecommitdiffstats
path: root/firmware/logf.c
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2017-09-08 19:28:02 -0400
committerMichael Sevakis <jethead71@rockbox.org>2017-11-21 05:00:27 -0500
commit5c9688961ef9166cec5225db50d5f73691d8292d (patch)
tree467cc61cceef1fda804f9c715e9994670eb7683f /firmware/logf.c
parent52af55eee8566e23b190b7444e73df0106b1663d (diff)
downloadrockbox-5c9688961ef9166cec5225db50d5f73691d8292d.tar.gz
rockbox-5c9688961ef9166cec5225db50d5f73691d8292d.tar.bz2
rockbox-5c9688961ef9166cec5225db50d5f73691d8292d.zip
Implement a much more capable vuprintf()
New support as well as some buggy support fixed. Still no floating point support if ever that would be desired. Support (*): * Flags: '-', '+', ' ', '#', '0' * Width and precision: 'n', '.n', '*' and '.*' * Length modifiers: 'hh', 'h', 'j', 'l', 'll', 't', 'z' * Radix: 'c', 'd', 'i', 'n', 'o', 'p/P', 's', 'u', 'x/X' (*) Provision exists to switch lesser-used stuff on or off or when certain functionality isn't desired (bootloader?). The compulsory radixes are everything but 'o', 'n', 'p/P' and 'x/X' with length modifiers being optional. The default setup is 'l', 'z', 'c', 'd', 'p/P', 's', 'u', 'x/X'. * Move fdprintf() to its own file. It was in a strange place. * Make callers compatible and fix a couple snprintf() bugs while at it. Could smush it down in size but I'm gonna get over the binsize neurosis and just the let optimizer do its thing. Change-Id: Ibdc613a9b6775802c188b29b9dd46c568c94f7c3
Diffstat (limited to 'firmware/logf.c')
-rw-r--r--firmware/logf.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/firmware/logf.c b/firmware/logf.c
index bdc5ad9cc0..3f9bd36112 100644
--- a/firmware/logf.c
+++ b/firmware/logf.c
@@ -38,7 +38,7 @@
#endif
#include "logf.h"
#include "serial.h"
-#include "format.h"
+#include "vuprintf.h"
#ifdef HAVE_USBSTACK
#include "usb_core.h"
@@ -193,7 +193,7 @@ static void check_logfindex(void)
}
}
-static int logf_push(void *userp, unsigned char c)
+static int logf_push(void *userp, int c)
{
(void)userp;
@@ -210,7 +210,7 @@ static int logf_push(void *userp, unsigned char c)
}
#endif
- return true;
+ return 1;
}
void _logf(const char *fmt, ...)
@@ -310,7 +310,7 @@ void logf_panic_dump(int *y)
#endif
#ifdef ROCKBOX_HAS_LOGDISKF
-static int logdiskf_push(void *userp, unsigned char c)
+static int logdiskf_push(void *userp, int c)
{
(void)userp;
@@ -319,11 +319,11 @@ static int logdiskf_push(void *userp, unsigned char c)
{
strcpy(&logdiskfbuffer[logdiskfindex-8], "LOGFULL");
logdiskfindex=MAX_LOGDISKF_SIZE;
- return false;
+ return 0;
}
logdiskfbuffer[logdiskfindex++] = c;
- return true;
+ return 1;
}
static void flush_buffer(void);