Changeset 556 for trunk/kernel/kern

Timestamp:

Sep 21, 2018, 10:25:39 PM (6 years ago)

Author:

nicolas.van.phan@…

Message:

Gather LETI-specific macros into hard_config.h

File:

• trunk/kernel/kern/kernel_init.c (modified) (6 diffs)

trunk/kernel/kern/kernel_init.c

@@ -24 +24 @@
 
 #include <kernel_config.h>
+#include <hard_config.h> // for the USE_TXT_XXX macros
 #include <errno.h>
 #include <hal_kernel_types.h>
@@ -424 +425 @@
 
         ///////////////////////////////
-        else if ( func == DEV_FUNC_TXT && info->use_mty0 == 1 )
+        else if ( func == DEV_FUNC_TXT && USE_TXT_MTY == 1 )
         {
             assert(impl == IMPL_TXT_MTY,
@@ -592 +593 @@
             {
                 // skip TXT_TX[0] chdev that has already been created & registered
-                if( info->use_mty0 == 0 && (func == DEV_FUNC_TXT) && (channel == 0) && (rx == 0) )
+                if( USE_TXT_MTY == 0 && (func == DEV_FUNC_TXT) && (channel == 0) && (rx == 0) )
                 {
                     continue;
@@ -598 +599 @@
 
                 // skip TXT chdevs because they are initialized in internal_devices_init()
-                if ( info->use_mty0 == 1 && func == DEV_FUNC_TXT )
+                if ( USE_TXT_MTY == 1 && func == DEV_FUNC_TXT )
                 {
                     continue;
@@ -967 +968 @@
     if( core_cxy == 0 && core_lid == 0 ) // [MODIF]
     {
-        if( info->use_mty0 == 1 ) {
+        if( USE_TXT_MTY == 1 ) {
             mtty0_device_init( info );
         } else {
@@ -1355 +1356 @@
 
 #if (DEBUG_KERNEL_INIT & 1)
-if( (core_lid ==  0) & (local_cxy == 0) ) 
+if( (core_lid ==  0) /*& (local_cxy == 0)*/ ) 
 sched_display( 0 );
 #endif