Changeset 559 for trunk/kernel/kern/kernel_init.c

Timestamp:

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

Author:

nicolas.van.phan@…

Message:

Remove y_max in loops (easy replacements)

File:

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

trunk/kernel/kern/kernel_init.c

@@ -59 +59 @@
 #include <devfs.h>
 #include <mapper.h>
+#include <cluster_info.h>
 
 ///////////////////////////////////////////////////////////////////////////////////////////
@@ -255 +256 @@
             for( x = 0 ; x < info->x_size ; x++ )
             {
-                for( y = 0 ; y < info->y_max; y++ ) // [FIXME]
+                for( y = 0 ; y < info->y_size; y++ ) // [FIXME]
                 {
-                    cxy_t  cxy = (x<<info->y_width) + y;
-                    hal_remote_swd( XPTR( cxy , &chdev_dir.txt_tx[0] ) ,
-                                    XPTR( local_cxy , &txt0_chdev ) );
+                    if (cluster_info_is_active(info->cluster_info[x][y])) {
+                        cxy_t  cxy = (x<<info->y_width) + y;
+                        hal_remote_swd( XPTR( cxy , &chdev_dir.txt_tx[0] ) ,
+                                        XPTR( local_cxy , &txt0_chdev ) );
+                    }
                 }
             }
@@ -314 +317 @@
             for( x = 0 ; x < info->x_size ; x++ )
             {
-                for( y = 0 ; y < info->y_max; y++ ) // [FIXME]
+                for( y = 0 ; y < info->y_size; y++ ) // [FIXME]
                 {
-                    cxy_t  cxy = (x<<info->y_width) + y;
-                    hal_remote_swd( XPTR( cxy , &chdev_dir.txt_tx[0] ) ,
-                                    XPTR( local_cxy , &txt0_chdev ) );
+                    if (cluster_info_is_active(info->cluster_info[x][y])) {
+                        cxy_t  cxy = (x<<info->y_width) + y;
+                        hal_remote_swd( XPTR( cxy , &chdev_dir.txt_tx[0] ) ,
+                                        XPTR( local_cxy , &txt0_chdev ) );
+                    }
                 }
             }
@@ -380 +385 @@
             for( x = 0 ; x < info->x_size ; x++ )
             {
-                for( y = 0 ; y < info->y_max; y++ ) // [FIXME]
+                for( y = 0 ; y < info->y_size; y++ ) // [FIXME]
                 {
-                    cxy_t  cxy = (x<<info->y_width) + y;
-                    hal_remote_swd( XPTR( cxy , &chdev_dir.mmc[local_cxy] ), 
-                                    XPTR( local_cxy , chdev_ptr ) );
+                    if (cluster_info_is_active(info->cluster_info[x][y])) {
+                        cxy_t  cxy = (x<<info->y_width) + y;
+                        hal_remote_swd( XPTR( cxy , &chdev_dir.mmc[local_cxy] ), 
+                                        XPTR( local_cxy , chdev_ptr ) );
+                    }
                 }
             }
@@ -458 +465 @@
                         chdev_entry = &chdev_dir.txt_tx[channel];
                     }
-                    for ( x = 0; x < info->x_max; x++ )
+                    for ( x = 0; x < info->x_size; x++ )
                     {
-                        for ( y = 0; y < info->y_max; y++ )
+                        for ( y = 0; y < info->y_size; y++ )
                         {
-                            cxy_t cxy = (x<<info->y_width) + y;
-                            hal_remote_swd( XPTR( cxy, chdev_entry ),
-                                            XPTR( local_cxy, chdev_ptr ) );
+                            if (cluster_info_is_active(info->cluster_info[x][y])) {
+                                cxy_t cxy = (x<<info->y_width) + y;
+                                hal_remote_swd( XPTR( cxy, chdev_entry ),
+                                                XPTR( local_cxy, chdev_ptr ) );
+                            }
                         }
                     }
@@ -499 +508 @@
                 // set the IOC fields in all clusters
                 xptr_t *chdev_entry = &chdev_dir.ioc[channel];
-                for ( x = 0; x < info->x_max; x++ )
+                for ( x = 0; x < info->x_size; x++ )
                 {
-                    for ( y = 0; y < info->y_max; y++ )
+                    for ( y = 0; y < info->y_size; y++ )
                     {
-                        cxy_t cxy = (x<<info->y_width) + y;
-                        hal_remote_swd( XPTR( cxy, chdev_entry ),
-                                        XPTR( local_cxy, chdev_ptr ) );
+                        if (cluster_info_is_active(info->cluster_info[x][y])) {
+                            cxy_t cxy = (x<<info->y_width) + y;
+                            hal_remote_swd( XPTR( cxy, chdev_entry ),
+                                            XPTR( local_cxy, chdev_ptr ) );
+                        }
                     }
     }
@@ -650 +661 @@
                     for( x = 0 ; x < info->x_size ; x++ )
                     {
-                        for( y = 0 ; y < info->y_max; y++ ) // [FIXME]
+                        for ( y = 0; y < info->y_size; y++ )
                         {
-                            cxy_t  cxy = (x<<info->y_width) + y;
-                            hal_remote_swd( XPTR( cxy , entry ),
-                                            XPTR( local_cxy , chdev ) );
+                            if (cluster_info_is_active(info->cluster_info[x][y])) {
+                                cxy_t  cxy = (x<<info->y_width) + y;
+                                hal_remote_swd( XPTR( cxy , entry ),
+                                                XPTR( local_cxy , chdev ) );
+                            }
                         }
                     }
@@ -733 +746 @@
     for( x = 0 ; x < info->x_size ; x++ )
     {
-        for( y = 0 ; y < info->y_max; y++ ) // [FIXME]
-        {
-            cxy_t  cxy = (x<<info->y_width) + y;
-            hal_remote_swd( XPTR( cxy , entry ) , 
-                            XPTR( local_cxy , chdev ) );
+        for ( y = 0; y < info->y_size; y++ )
+        {
+            if (cluster_info_is_active(info->cluster_info[x][y])) {
+                cxy_t  cxy = (x<<info->y_width) + y;
+                hal_remote_swd( XPTR( cxy , entry ) , 
+                                XPTR( local_cxy , chdev ) );
+            }
         }
     }
@@ -747 +762 @@
     for( x = 0 ; x < info->x_size ; x++ )
     {
-        for( y = 0 ; y < info->y_max; y++ ) // [FIXME]
-        {
-            cxy_t  cxy = (x<<info->y_width) + y;
-            hal_remote_memset( XPTR( cxy , &iopic_input ) , 0xFF , sizeof(iopic_input_t) );
+        for ( y = 0; y < info->y_size; y++ )
+        {
+            if (cluster_info_is_active(info->cluster_info[x][y])) {
+                cxy_t  cxy = (x<<info->y_width) + y;
+                hal_remote_memset( XPTR( cxy , &iopic_input ) , 0xFF , sizeof(iopic_input_t) );
+            }
         }
     }
@@ -784 +801 @@
             for( x = 0 ; x < info->x_size ; x++ )
             {
-                for( y = 0 ; y < info->y_max; y++ ) // [FIXME]
+                for ( y = 0; y < info->y_size; y++ )
                 {
-                    cxy_t  cxy = (x<<info->y_width) + y;
-                    hal_remote_swd( XPTR( cxy , ptr ) , id ); 
+                    if (cluster_info_is_active(info->cluster_info[x][y])) {
+                        cxy_t  cxy = (x<<info->y_width) + y;
+                        hal_remote_swd( XPTR( cxy , ptr ) , id ); 
+                    }
                 }
             }