Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Modified logf to use a define for the log width, and changed it to default to

Browse source 
21 as that is what fits in an iriver LCD by default since the font is 6 pixels
wide.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6547 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Daniel Stenberg 2005-06-01 13:21:20 +00:00
parent 1c5374fe79
commit 6ebdbe8df3
3 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/logfdisp.c
View file

@ -59,7 +59,7 @@ bool logfdisplay(void)
do {
index = logfindex;
for(i = lines-1; i>=0; i--) {
unsigned char buffer[17];
unsigned char buffer[MAX_LOGF_ENTRY + 1];
if(--index < 0) {
if(logfwrap)
@ -68,8 +68,8 @@ bool logfdisplay(void)
break; /* done */
}
memcpy(buffer, logfbuffer[index], 16);
buffer[16]=0;
memcpy(buffer, logfbuffer[index], MAX_LOGF_ENTRY);
buffer[MAX_LOGF_ENTRY]=0;
lcd_puts(0, i, buffer);
}
lcd_update();
@ -100,7 +100,7 @@ bool logfdump(void)
fd = open("/.rockbox/logf.txt", O_CREAT|O_WRONLY);
if(-1 != fd) {
unsigned char buffer[17];
unsigned char buffer[MAX_LOGF_ENTRY +1];
int index = logfindex-1;
int stop = logfindex;
@ -113,8 +113,8 @@ bool logfdump(void)
break; /* done */
}
memcpy(buffer, logfbuffer[index], 16);
buffer[16]=0;
memcpy(buffer, logfbuffer[index], MAX_LOGF_ENTRY);
buffer[MAX_LOGF_ENTRY]=0;
fdprintf(fd, "%s\n", buffer);
index--;
}

5
firmware/export/logf.h
View file

@ -23,9 +23,10 @@
#ifdef ROCKBOX_HAS_LOGF
#define MAX_LOGF_LINES 1000
#define MAX_LOGF_DATASIZE (16*MAX_LOGF_LINES)
#define MAX_LOGF_ENTRY 21 /* 128/6 pixels */
#define MAX_LOGF_DATASIZE (MAX_LOGF_ENTRY*MAX_LOGF_LINES)
extern unsigned char logfbuffer[MAX_LOGF_LINES][16];
extern unsigned char logfbuffer[MAX_LOGF_LINES][MAX_LOGF_ENTRY];
extern int logfindex;
extern bool logfwrap;

24
firmware/logf.c
View file

@ -18,10 +18,10 @@
****************************************************************************/
/*
* logf() logs 16 bytes in a circular buffer. Each logged string is space-
* padded for easier and faster output on screen. Just output 16 lines on each
* line. 16 bytes fit nicely on the iRiver remote LCD (128 pixels with an 8
* pixels font).
* logf() logs MAX_LOGF_ENTRY (21) bytes per entry in a circular buffer. Each
* logged string is space- padded for easier and faster output on screen. Just
* output MAX_LOGF_ENTRY characters on each line. MAX_LOGF_ENTRY bytes fit
* nicely on the iRiver remote LCD (128 pixels with an 8x6 pixels font).
*/
#include <string.h>
@ -36,7 +36,7 @@
/* Only provide all this if asked to */
#ifdef ROCKBOX_HAS_LOGF
unsigned char logfbuffer[MAX_LOGF_LINES][16];
unsigned char logfbuffer[MAX_LOGF_LINES][MAX_LOGF_ENTRY];
int logfindex;
bool logfwrap;
@ -57,7 +57,7 @@ static void displayremote(void)
index = logfindex;
for(i = lines-1; i>=0; i--) {
unsigned char buffer[17];
unsigned char buffer[MAX_LOGF_ENTRY+1];
if(--index < 0) {
if(logfwrap)
@ -66,8 +66,8 @@ static void displayremote(void)
break; /* done */
}
memcpy(buffer, logfbuffer[index], 16);
buffer[16]=0;
memcpy(buffer, logfbuffer[index], MAX_LOGF_ENTRY);
buffer[MAX_LOGF_ENTRY]=0;
lcd_remote_puts(0, i, buffer);
}
lcd_remote_update();
@ -89,11 +89,11 @@ void logf(const char *format, ...)
logfindex = 0;
}
ptr = logfbuffer[logfindex];
len = vsnprintf(ptr, 16, format, ap);
len = vsnprintf(ptr, MAX_LOGF_ENTRY, format, ap);
va_end(ap);
if(len < 16)
/* pad with spaces up to the 16 byte border */
memset(ptr+len, ' ', 16-len);
if(len < MAX_LOGF_ENTRY)
/* pad with spaces up to the MAX_LOGF_ENTRY byte border */
memset(ptr+len, ' ', MAX_LOGF_ENTRY-len);
logfindex++; /* leave it where we write the next time */