Changeset 279 for trunk/hal/tsar_mips32/drivers/soclib_tty.c

Timestamp:

Jul 27, 2017, 12:23:29 AM (6 years ago)

Author:

alain

Message:

1) Introduce independant command fields for the various devices in the thread descriptor.
2) Introduce a new dev_pic_enable_ipi() function in the generic PIC device
3) Fix two bugs identified by Maxime in the scheduler initialisation, and in the sched_select().
4) fix several bugs in the TSAR hal_kentry.S.
5) Introduce a third kgiet segment (besides kdata and kcode) in the TSAR bootloader.

File:

• trunk/hal/tsar_mips32/drivers/soclib_tty.c (modified) (7 diffs)

trunk/hal/tsar_mips32/drivers/soclib_tty.c

@@ -54 +54 @@
 
     // get command type and extended pointer on TXT device
-    uint32_t type   =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->command.txt.type ) );
-    xptr_t   dev_xp = (xptr_t)hal_remote_lwd( XPTR( th_cxy , &th_ptr->command.txt.dev_xp ) );
+    uint32_t type   =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->txt_cmd.type ) );
+    xptr_t   dev_xp = (xptr_t)hal_remote_lwd( XPTR( th_cxy , &th_ptr->txt_cmd.dev_xp ) );
 
     // get TXT device cluster and local pointer
@@ -103 +103 @@
 
         // get source buffer extended pointer & bytes count
-        uint32_t count  = hal_remote_lw ( XPTR( th_cxy , &th_ptr->command.txt.count ) );
-        xptr_t   buf_xp = hal_remote_lwd( XPTR( th_cxy , &th_ptr->command.txt.buf_xp ) );
+        uint32_t count  = hal_remote_lw ( XPTR( th_cxy , &th_ptr->txt_cmd.count ) );
+        xptr_t   buf_xp = hal_remote_lwd( XPTR( th_cxy , &th_ptr->txt_cmd.buf_xp ) );
 
         // loop on characters
@@ -127 +127 @@
         }
     }
-}
+}  // end soclib_tty_cmd()
+
 
 /////////////////////////////////////////////////////////////////
@@ -148 +149 @@
 
     // get command arguments
-    type    = hal_remote_lw ( XPTR( client_cxy , &client_ptr->command.txt.type   ) );
-    count   = hal_remote_lw ( XPTR( client_cxy , &client_ptr->command.txt.count  ) );
-    buf_xp  = hal_remote_lwd( XPTR( client_cxy , &client_ptr->command.txt.buf_xp ) );
+    type    = hal_remote_lw ( XPTR( client_cxy , &client_ptr->txt_cmd.type   ) );
+    count   = hal_remote_lw ( XPTR( client_cxy , &client_ptr->txt_cmd.count  ) );
+    buf_xp  = hal_remote_lwd( XPTR( client_cxy , &client_ptr->txt_cmd.buf_xp ) );
 
     // get SOCLIB_TTY peripheral cluster and local pointer
@@ -210 +211 @@
             else         // TTY_TX full => update command arguments and exit ISR for retry
             {
-                hal_remote_sw ( XPTR( client_cxy , &client_ptr->command.txt.count ), count-i );
-                hal_remote_swd( XPTR( client_cxy , &client_ptr->command.txt.buf_xp ), buf_xp+i );
+                hal_remote_sw ( XPTR( client_cxy , &client_ptr->txt_cmd.count ), count-i );
+                hal_remote_swd( XPTR( client_cxy , &client_ptr->txt_cmd.buf_xp ), buf_xp+i );
                 return;
             }
@@ -223 +224 @@
 
     // set I/O operation status in command
-    hal_remote_sw( XPTR( client_cxy , &client_ptr->command.txt.error ) , 0 );
+    hal_remote_sw( XPTR( client_cxy , &client_ptr->txt_cmd.error ) , 0 );
 
     // unblock server thread
@@ -230 +231 @@
     // unblock client thread
     thread_unblock( client_xp , THREAD_BLOCKED_IO );
-}
-
+
+}  // end soclib_tty_isr()
+