better logf

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6949 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 6 insertions, 5 deletions

diff --git a/firmware/export/logf.h b/firmware/export/logf.h
index 0d94d14156..70667fd52c 100644
--- a/firmware/export/logf.h
+++ b/firmware/export/logf.h
@@ -24,7 +24,7 @@
 #ifdef ROCKBOX_HAS_LOGF
 
 #define MAX_LOGF_LINES 1000
-#define MAX_LOGF_ENTRY 21 /* 128/6 pixels */
+#define MAX_LOGF_ENTRY 256
 #define MAX_LOGF_DATASIZE (MAX_LOGF_ENTRY*MAX_LOGF_LINES)
 
 extern unsigned char logfbuffer[MAX_LOGF_LINES][MAX_LOGF_ENTRY];
diff --git a/firmware/logf.c b/firmware/logf.c
index 0b4047f214..f61797b289 100644
--- a/firmware/logf.c
+++ b/firmware/logf.c
@@ -45,18 +45,19 @@ static void displayremote(void)
     /* TODO: we should have a debug option that enables/disables this! */
     int w, h;
     int lines;
+    int columns;
     int i;
     int index;
 
     lcd_remote_getstringsize("A", &w, &h);
     lines = LCD_REMOTE_HEIGHT/h;
-
+    columns = LCD_REMOTE_WIDTH/w;
     lcd_remote_setmargins(0, 0);
     lcd_remote_clear_display();
     
     index = logfindex;
     for(i = lines-1; i>=0; i--) {
-        unsigned char buffer[MAX_LOGF_ENTRY+1];
+        unsigned char buffer[columns+1];
 
         if(--index < 0) {
             if(logfwrap)
@@ -65,8 +66,8 @@ static void displayremote(void)
                 break; /* done */
         }
         
-        memcpy(buffer, logfbuffer[index], MAX_LOGF_ENTRY);
-        buffer[MAX_LOGF_ENTRY]=0;
+        memcpy(buffer, logfbuffer[index], columns);
+        buffer[columns]=0;
         lcd_remote_puts(0, i, buffer);
     }
     lcd_remote_update();