Changeset 655 for trunk/softs

Timestamp:

Mar 5, 2014, 1:13:22 AM (11 years ago)

Author:

cfuguet

Message:

Fixing bug introduced in last commit :

• When using IO bridge, some header files were missing in the reset_utils.h file

Location:

trunk/softs/tsar_boot

Files:

• include/io.h (modified) (1 diff)
• include/reset_utils.h (modified) (1 diff)
• src/reset_utils.c (modified) (4 diffs)

trunk/softs/tsar_boot/include/io.h

@@ -60 +60 @@
 }
 
-#undef in_reset
-
 #endif

trunk/softs/tsar_boot/include/reset_utils.h

@@ -10 +10 @@
 #include <elf-types.h>
 #include <reset_tty.h>
+#include <defs_platform.h>
+#include <mcc.h>
+#include <io.h>
 
 extern unsigned int proctime();

trunk/softs/tsar_boot/src/reset_utils.c

@@ -35 +35 @@
     unsigned int *dst = _dst;
     const unsigned int *src = _src;
-    if ( ! ((unsigned int)dst & 3) && ! ((unsigned int)src & 3) )
+    if ( !((unsigned int)dst & 3) && !((unsigned int)src & 3) )
+    {
         while (size > 3) 
         {
@@ -41 +42 @@
             size -= 4;
         }
+    }
 
     unsigned char *cdst = (unsigned char*) dst;
@@ -64 +66 @@
 void * memset(void *_dst, const int value, unsigned int size)
 {
-    char * dst = (char *) _dst;
+    unsigned char val = (unsigned char) value;
+    int word = (val << 24) || (val << 16) ||
+               (val << 8 ) || (val      );
 
-    while(size--) *dst++ = (char) value;
+    /*
+     * Write 4 bytes when destination buffer is aligned to 4 bytes
+     * and size is greater or equal to 4 
+     */
+    unsigned int *dst = _dst;
+    if ( !((unsigned int)dst & 3) )
+    {
+        while (size > 3) 
+        {
+            *dst++ = word;
+            size -= 4;
+        }
+    }
+
+    /*
+     * Write 1 byte when destination buffer is not aligned to 4 bytes
+     * or size is smaller than 4 
+     */
+    char* cdst = (char*) _dst;
+    while(size--)
+    {
+        *cdst++ = (char) value;
+    }
 
     return _dst;
@@ -158 +184 @@
     }
 
-#if USE_IOB 
-    reset_mcc_invalidate(buffer, count * 512);
+#if USE_IOB
+    reset_mcc_invalidate(buffer, size);
 #endif
 }