Merged
authorLaurent Bessard
Sun, 24 Mar 2013 23:54:50 +0100
changeset 998 2f7721dae9a0
parent 996 17d9c81b5ed8 (diff)
parent 997 d6da2ccafca4 (current diff)
child 999 cbab4c1635bd
Merged
--- a/targets/plc_main_tail.c	Fri Mar 22 16:09:16 2013 +0100
+++ b/targets/plc_main_tail.c	Sun Mar 24 23:54:50 2013 +0100
@@ -26,7 +26,7 @@
     if(buffpos + size < LOG_BUFFER_SIZE){
         memcpy(&LogBuff[level][buffpos], buf, size);
     }else{
-        uint32_t remaining = LOG_BUFFER_SIZE - buffpos - 1; 
+        uint32_t remaining = LOG_BUFFER_SIZE - buffpos; 
         memcpy(&LogBuff[level][buffpos], buf, remaining);
         memcpy(LogBuff[level], (char*)buf + remaining, size - remaining);
     }
@@ -58,7 +58,7 @@
    |63 ... 32|31 ... 0|
    | Message | Buffer |
    | counter | Index  | */
-static uint64_t LogCursor[LOG_LEVELS] = {0x0,0x0,0x0,0x0};
+static uint64_t LogCursor[LOG_LEVELS] LOG_BUFFER_ATTRS = {0x0,0x0,0x0,0x0};
 
 /* Store one log message of give size */
 int LogMessage(uint8_t level, uint8_t* buf, uint32_t size){