Changeset 408 for trunk/kernel/devices

Timestamp:

Dec 5, 2017, 4:20:07 PM (6 years ago)

Author:

alain

Message:

Fix several bugs in the fork() syscall.

Location:

trunk/kernel/devices

Files:

• dev_dma.c (modified) (2 diffs)
• dev_fbf.c (modified) (1 diff)
• dev_ioc.c (modified) (1 diff)
• dev_nic.c (modified) (5 diffs)
• dev_txt.c (modified) (1 diff)

trunk/kernel/devices/dev_dma.c

@@ -47 +47 @@
 
     // set dma name
-    snprintf( dma->name , 16 , "dma_%d_%x" , channel , local_cxy );
+    snprintf( dma->name , 16 , "dma%d_%x" , channel , local_cxy );
 
     // call driver init function
@@ -72 +72 @@
     }
 
-    // initialises server field in DMA chdev descriptor
+    // initialises server field in chdev descriptor
     dma->server = new_thread;
+
+    // initializes chdev field in thread descriptor
+    new_thread->chdev = dma;
     
-    // start server thread
-    thread_block( new_thread , THREAD_BLOCKED_DEV_QUEUE );
+    // unblock server thread
     thread_unblock( XPTR( local_cxy , new_thread ) , THREAD_BLOCKED_GLOBAL );
 

trunk/kernel/devices/dev_fbf.c

@@ -40 +40 @@
 {
     // set FBF chdev extension fields
-    // TODO this should be done in the impementation 
+    // TODO this should be done in the implementation 
     // TODO specific part, as these parameters must be obtained from the hardware.
     chdev->ext.fbf.width  = CONFIG_FBF_WIDTH;

trunk/kernel/devices/dev_ioc.c

@@ -77 +77 @@
     assert( (error == 0) , __FUNCTION__ , "cannot create server thread" );
 
-    // set "server" field in ioc descriptor
+    // set "server" field in chdev descriptor
     ioc->server = new_thread;
 
-    // start server thread
-    thread_block( new_thread , THREAD_BLOCKED_DEV_QUEUE );
+    // set "chdev field in thread descriptor
+    new_thread->chdev = ioc;
+
+    // unblock server thread
     thread_unblock( XPTR( local_cxy , new_thread ) , THREAD_BLOCKED_GLOBAL );
 

trunk/kernel/devices/dev_nic.c

@@ -79 +79 @@
     nic->server = new_thread;
     
-    // start server thread
-    thread_block( new_thread , THREAD_BLOCKED_DEV_QUEUE );
+    // set "chdev" field in thread descriptor
+    new_thread->chdev = nic;
+
+    // unblock server thread
     thread_unblock( XPTR( local_cxy , new_thread ) , THREAD_BLOCKED_GLOBAL );
 
@@ -101 +103 @@
 
     // get pointer on NIC-RX chdev descriptor
-    uint32_t   channel = thread_ptr->dev_channel; 
+    uint32_t   channel = thread_ptr->chdev->channel; 
     xptr_t     dev_xp  = chdev_dir.nic_rx[channel];
     cxy_t      dev_cxy = GET_CXY( dev_xp );
@@ -129 +131 @@
         // block on THREAD_BLOCKED_IO condition and deschedule
         thread_block( thread_ptr , THREAD_BLOCKED_IO );
-        sched_yield();
+        sched_yield("client blocked on I/O");
 
         // disable NIC-RX IRQ 
@@ -171 +173 @@
 
     // get pointer on NIC-TX chdev descriptor
-    uint32_t   channel = thread_ptr->dev_channel; 
+    uint32_t   channel = thread_ptr->chdev->channel; 
     xptr_t     dev_xp  = chdev_dir.nic_tx[channel];
     cxy_t      dev_cxy = GET_CXY( dev_xp );
@@ -199 +201 @@
         // block on THREAD_BLOCKED I/O condition and deschedule
         thread_block( thread_ptr , THREAD_BLOCKED_IO );
-        sched_yield();
+        sched_yield("client blocked on I/O");
 
         // disable NIC-TX IRQ 

trunk/kernel/devices/dev_txt.c

@@ -93 +93 @@
         txt->server = new_thread;
 
-        // start server thread
-        thread_block( new_thread , THREAD_BLOCKED_DEV_QUEUE );
+        // set "chdev" field in thread descriptor
+        new_thread->chdev = txt;
+
+        // unblock server thread
         thread_unblock( XPTR( local_cxy , new_thread ) , THREAD_BLOCKED_GLOBAL );
     }