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

Timestamp:

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

Author:

nicolas.van.phan@…

Message:

Remove y_max in all functions except dqdt_init()

File:

• trunk/kernel/kern/kernel_init.c (modified) (1 diff)

trunk/kernel/kern/kernel_init.c

@@ -621 +621 @@
 
                 // compute target cluster for chdev[func,channel,direction]
-                uint32_t offset     = ext_chdev_gid % ( info->x_size * (info->y_max) ); // [FIXME]
-                uint32_t cx         = offset / (info->y_max); // [FIXME]
-                uint32_t cy         = offset % (info->y_max); // [FIXME]
-                uint32_t target_cxy = (cx<<info->y_width) + cy;
-
+                uint32_t offset;
+                uint32_t cx;
+                uint32_t cy;
+                uint32_t target_cxy;
+                while (1) {
+                    offset     = ext_chdev_gid % ( info->x_size * (info->y_size) );
+                    cx         = offset / (info->y_size);
+                    cy         = offset % (info->y_size);
+                    target_cxy = (cx<<info->y_width) + cy;
+                    // ext_chdev_gid that results in empty target clusters are skipped
+                    if ( cluster_info_is_active( LOCAL_CLUSTER->cluster_info[cx][cy] ) == 0 ) {
+                        ext_chdev_gid++;
+                    } else { // The ext_chdev_gid resulted in a full target cluster
+                        break;
+                    }
+                }
                 // allocate and initialize a local chdev
                 // when local cluster matches target cluster