Changeset 541 for trunk/boot

Timestamp:

Sep 21, 2018, 10:22:13 PM (6 years ago)

Author:

nicolas.van.phan@…

Message:

Multiplex bootloader writes on LETI

File:

• trunk/boot/tsar_mips32/boot_tty_driver.c (modified) (4 diffs)

trunk/boot/tsar_mips32/boot_tty_driver.c

@@ -43 +43 @@
 #endif
 
+#ifdef IS_LETI
+  #define TARGET_CLUSTER    0
+#else
+  #define TARGET_CLUSTER    ((X_IO << Y_WIDTH) + Y_IO)
+#endif
+
 
 /////////////////////////////////////////////////////////////////////////////
@@ -51 +57 @@
 static uint32_t boot_tty_get_register( uint32_t reg )
 {
-    cxy_t      cxy = (X_IO << Y_WIDTH) + Y_IO;
+    cxy_t      cxy = TARGET_CLUSTER;
     uint32_t * ptr = (uint32_t *)SEG_TXT_BASE + reg;
     
@@ -66 +72 @@
                                    uint32_t val )
 {
-    cxy_t      cxy = (X_IO << Y_WIDTH) + Y_IO;
+    cxy_t      cxy = TARGET_CLUSTER;
     uint32_t * ptr = (uint32_t *)SEG_TXT_BASE + reg;
 
@@ -101 +107 @@
         }
 
-        // Write one character to TTY0 terminal. 
+        // Write one character to TTY0 terminal.
         // Special treatment for a newline: Carriage Return before Line Feed.
         if (buf[nb_printed] == '\n') boot_tty_set_register(TTY_WRITE_REG , (uint32_t)'\r');