Changeset 536 for trunk/kernel/kern

Timestamp:

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

Author:

nicolas.van.phan@…

Message:

TTY MUX 1 : Init tty chdevs in internal_devices_init()

File:

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

trunk/kernel/kern/kernel_init.c

@@ -400 +400 @@
 
                 assert( (chdev_ptr != NULL) , "cannot allocate memory for DMA chdev" );
-            
+
                 // make DMA specific initialisation
                 dev_dma_init( chdev_ptr );     
@@ -413 +413 @@
 __FUNCTION__ , channel , local_cxy , chdev_ptr );
 #endif
+            }
+        }
+
+        else if ( func == DEV_FUNC_TXT && info->use_mty0 == 1 )
+        {
+            assert(impl == IMPL_TXT_MTY,
+                "Internal TTYs should have MTY implementation\n");
+
+            for ( channel = 0; channel < channels; channel++ )
+            {
+                int rx;
+                for ( rx = 0; rx <= 1; rx++ )
+                {
+                    // skip MTY0_TX since it has already been initialized
+                    if ( channel == 0 && rx == 0 ) continue;
+
+                    // create chdev in local cluster
+                    chdev_ptr = chdev_create( func,
+                                              impl,
+                                              channel,
+                                              rx,
+                                              base );
+
+                    assert( (chdev_ptr != NULL) ,
+                        "cannot allocate memory for MTY chdev" );
+
+                    // make MTY specific initialization
+                    dev_txt_init( chdev_ptr );
+
+                    // set the MTY fields in all clusters
+                    xptr_t *chdev_entry;
+                    if ( rx == 1 ) {
+                        chdev_entry = &chdev_dir.txt_rx[channel];
+                    } else {
+                        chdev_entry = &chdev_dir.txt_tx[channel];
+                    }
+                    for ( x = 0; x < info->x_max; x++ )
+                    {
+                        for ( y = 0; y < info->y_max; y++ )
+                        {
+                            cxy_t cxy = (x<<info->y_width) + y;
+                            hal_remote_swd( XPTR( cxy, chdev_entry ),
+                                            XPTR( local_cxy, chdev_ptr ) );
+                        }
+                    }
+                }
             }
         }
@@ -492 +538 @@
             {
                 // skip TXT_TX[0] chdev that has already been created & registered
-                if( (func == DEV_FUNC_TXT) && (channel == 0) && (rx == 0) ) continue;
+                if( info->use_mty0 == 0 && (func == DEV_FUNC_TXT) && (channel == 0) && (rx == 0) )
+                {
+                    continue;
+                }
+
+                // skip TXT chdevs because they are initialized in internal_devices_init()
+                if ( info->use_mty0 == 1 && func == DEV_FUNC_TXT )
+                {
+                    continue;
+                }
 
                 // compute target cluster for chdev[func,channel,direction]