Changeset 557 for trunk/boot

Timestamp:

Sep 21, 2018, 10:26:00 PM (6 years ago)

Author:

nicolas.van.phan@…

Message:

Add cluster_info[][] array in cluster descriptor

Location:

trunk/boot/tsar_mips32

Files:

• Makefile (modified) (1 diff)
• boot.c (modified) (4 diffs)

trunk/boot/tsar_mips32/Makefile

@@ -39 +39 @@
                 -I$(HAL_ARCH)/core   \
                 -I../.. \
-                -I$(KERNEL)
+                -I$(KERNEL) \
+                -I$(KERNEL)/kern
 
 # Rule to generate boot.elf, kernel.elf, ksh.elf, sort.elf and update virtual disk.

trunk/boot/tsar_mips32/boot.c

@@ -78 +78 @@
 #include <boot_info.h>
 
+#include <cluster_info.h>
+
 #include <boot_utils.h>
 #include <boot_fat32.h>
@@ -140 +142 @@
         case DEV_TYPE_TIM_SCL: return "TIM_SCL";
         case DEV_TYPE_TXT_TTY: return "TXT_TTY";
+        case DEV_TYPE_TXT_MTY: return "TXT_MTY";
         case DEV_TYPE_ICU_XCU: return "ICU_XCU";
         case DEV_TYPE_PIC_TSR: return "PIC_TSR";
@@ -415 +418 @@
     boot_info->kentry_size = seg_kentry_size;
 
+    /* Initialize all clusters as empty for now */
+    int x, y;
+    for ( x = 0; x < CONFIG_MAX_CLUSTERS_X; x++)
+    {
+        for ( x = 0; x < CONFIG_MAX_CLUSTERS_X; x++)
+        {
+            boot_info->cluster_info[x][y] = 0x0;
+        }
+    }
+
     // loop on arch_info clusters to get relevant pointers
     for (cluster =  cluster_base;
@@ -420 +433 @@
          cluster++)
     {
+        int x = cluster->cxy >> Y_WIDTH;
+        int y = cluster->cxy & ((1 << Y_WIDTH) - 1);
+
         if( cluster->cxy  == cxy )            my_cluster = cluster;
-        if( cluster->cxy  == header->io_cxy ) io_cluster = cluster;
+        if( cluster->cxy  == header->io_cxy ) {
+            io_cluster = cluster;
+            boot_info->cluster_info[x][y] |= CINFO_IS_IO;
+        }
+        if ( cluster->cores > 0 ) {
+            boot_info->cluster_info[x][y] |= CINFO_ACTIVE;
+        }
     }