Changeset 285 for branch

Timestamp:

Jan 31, 2014, 4:10:30 PM (11 years ago)

Author:

cfuguet

Message:

Removing the GIET_MONO_TTY variable on the giet_config.h
file. All the tests on this variable as been replaced by
NB_TTY_CHANNELS == 1.

Location:

branch/giet_vm_ioc_drivers

Files:

• giet_boot/boot.c (modified) (2 diffs)
• giet_config.h (modified) (1 diff)
• giet_libs/stdio.c (modified) (3 diffs)
• mappings/4c_1p_sort_chiplet.xml (modified) (4 diffs)

branch/giet_vm_ioc_drivers/giet_boot/boot.c

@@ -1169 +1169 @@
     unsigned int alloc_tim_channel[X_SIZE*Y_SIZE]; // user TIMER allocators
 
-    if (!GIET_MONO_TTY) alloc_tty_channel++;
+    if (NB_TTY_CHANNELS > 1) alloc_tty_channel++;
 
     /////////////////////////////////////////////////////////////////////////
@@ -1372 +1372 @@
                 }
                 ctx_tty = alloc_tty_channel;
-                if (!GIET_MONO_TTY) alloc_tty_channel++;
+                if (NB_TTY_CHANNELS > 1) alloc_tty_channel++;
             }
             // ctx_nic : NIC channel global index provided by the global allocator

branch/giet_vm_ioc_drivers/giet_config.h

@@ -37 +37 @@
 #define GIET_IDLE_TASK_VERBOSITY 1
 
-#define GIET_MONO_TTY            0          /* Only one terminal is used */
-
 #define GIET_MAX_ELF_FILES       20         /* max .elf files loaded by boot-loader */
 #define GIET_OPEN_FILES_MAX      16         /* max simultaneously open files */

branch/giet_vm_ioc_drivers/giet_libs/stdio.c

@@ -298 +298 @@
     unsigned int ret;
 
-    if (GIET_MONO_TTY)
+    if (NB_TTY_CHANNELS == 1)
     {
         ret = sys_call(SYSCALL_TTY_LOCK, 0, 0, 0, 0); // Get TTY lock
@@ -328 +328 @@
     }
 
-    if (GIET_MONO_TTY)
+    if (NB_TTY_CHANNELS == 1)
     {
         ret = sys_call(SYSCALL_TTY_LOCK, 1, 0, 0, 0); // Release TTY lock
@@ -412 +412 @@
 
 return_error:
-    if (GIET_MONO_TTY)
+    if (NB_TTY_CHANNELS == 1)
     {
         ret = sys_call(SYSCALL_TTY_LOCK, 1, 0, 0, 0); // Release TTY lock

branch/giet_vm_ioc_drivers/mappings/4c_1p_sort_chiplet.xml

@@ -35 +35 @@
             </proc> 
 
-            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "1"  />
+            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "6"  />
             <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1"  />
             <periph type = "IOC"  psegname = "PSEG_IOC"  channels = "1" subtype = "SPI" /> 
@@ -53 +53 @@
             </proc>
 
-            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "1" />
+            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "6" />
             <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1" />
         </cluster>
@@ -67 +67 @@
             </proc>
 
-            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "1" />
+            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "6" />
             <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1" />
         </cluster>
@@ -81 +81 @@
             </proc>
 
-            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "1" />
+            <periph type = "XCU"  psegname = "PSEG_XCU"  channels = "6" />
             <periph type = "MMC"  psegname = "PSEG_MMC"  channels = "1" />
         </cluster>