Changeset 464 for soft/giet_vm/giet_boot/boot.c

Timestamp:

Dec 12, 2014, 4:30:49 PM (10 years ago)

Author:

alain

Message:

Define the kernel_heap[X_SIZE][Y_SIZE] global variables,
and the TTY related global variables in boot.c.

File:

• soft/giet_vm/giet_boot/boot.c (modified) (5 diffs)

soft/giet_vm/giet_boot/boot.c

@@ -53 +53 @@
 //    The first word contains the flags, the second word contains the PPN.
 //
-//    The page tables can be distributed in all clusters.
+//    When this is required in the mapping, the page tables can be replicated 
+//    in all clusters.
 ///////////////////////////////////////////////////////////////////////////////////////
 // Implementation Notes:
@@ -63 +64 @@
 
 #include <giet_config.h>
+#include <hard_config.h>
 #include <mapping_info.h>
-#include <mwmr_channel.h>
+#include <kernel_malloc.h>
 #include <barrier.h>
 #include <memspace.h>
@@ -84 +86 @@
 #include <utils.h>
 #include <tty0.h>
+#include <locks.h>
 #include <elf-types.h>
-
-// for boot FAT initialisation 
 #include <fat32.h>
-
 #include <mips32_registers.h>
 #include <stdarg.h>
@@ -142 +142 @@
 pmem_alloc_t           boot_pmem_alloc[X_SIZE][Y_SIZE];
 
+// Distributed kernel heap (one per cluster)
+__attribute__((section (".bootdata"))) 
+kernel_heap_t          kernel_heap[X_SIZE][Y_SIZE];
+
 // Schedulers virtual base addresses array (one per processor)
 __attribute__((section (".bootdata"))) 
@@ -161 +165 @@
 __attribute__((section (".bootdata"))) 
 unsigned int           _ptabs_max_pt2;
+
+// Global variables for TTY
+__attribute__((section (".bootdata"))) 
+sbt_lock_t             _tty_tx_lock[NB_TTY_CHANNELS]   __attribute__((aligned(64)));
+
+__attribute__((section (".bootdata"))) 
+unsigned int           _tty_rx_full[NB_TTY_CHANNELS];
+
+__attribute__((section (".bootdata"))) 
+unsigned int           _tty_rx_buf[NB_TTY_CHANNELS];
+
+
 
 /////////////////////////////////////////////////////////////////////