Changeset 207 for soft/giet_vm/sys/common.c

Timestamp:

Aug 16, 2012, 6:36:16 PM (12 years ago)

Author:

alain

Message:

Several bugs have been fixed to support TSAR multi-cluster architecture
such as the "tsarv4-generic_mmu" platform.

File:

• soft/giet_vm/sys/common.c (modified) (3 diffs)

soft/giet_vm/sys/common.c

@@ -13 +13 @@
 #include <ctx_handler.h>
 #include <drivers.h>
+#include <hwr_mapping.h>
 #include <stdarg.h>
 
@@ -153 +154 @@
 ////////////////////////////////////////////////////////////////////////////
 //    _puts()
-// display a string on TTY0 / used for system code debugand log
-////////////////////////////////////////////////////////////////////////////
-void _puts(char *buffer) 
-{
-    unsigned int* tty_address = (unsigned int*)&seg_tty_base;
+// display a string on TTY0 / used for system code debug and log
+////////////////////////////////////////////////////////////////////////////
+void _puts(char* buffer) 
+{
+    unsigned int* tty_address = (unsigned int*)( (char*)&seg_tty_base +
+                                (CLUSTER_IO_ID * (unsigned)CLUSTER_SIZE) ); 
     unsigned int n;
 
@@ -163 +165 @@
     {
         if (buffer[n] == 0) break;
-        tty_address[0] = (unsigned int)buffer[n];
+        tty_address[TTY_WRITE] = (unsigned int)buffer[n];
     }
 }
 ////////////////////////////////////////////////////////////////////////////
-//    _putw() 
+//    _putx() 
 // display an int (hexa) on TTY0 / used for system code debug and log
 ////////////////////////////////////////////////////////////////////////////
-void _putw(unsigned int val)
+void _putx(unsigned int val)
 {
     static const char   HexaTab[] = "0123456789ABCDEF";