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

Timestamp:

Jul 27, 2017, 12:23:29 AM (7 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_bdv.c (modified) (5 diffs)

trunk/hal/tsar_mips32/drivers/soclib_bdv.c

@@ -58 +58 @@
 void __attribute__ ((noinline)) soclib_bdv_cmd( xptr_t th_xp )
 {
-    uint32_t   cmd_type;     // IOC_READ / IOC_WRITE / IOC_SYNC_READ
-    uint32_t   lba;          // command argument
-    uint32_t   count;        // command argument
-    xptr_t     buf_xp;       // command argument
-    xptr_t     dev_xp;       // command argument
+    uint32_t   cmd_type;    // IOC_READ / IOC_WRITE / IOC_SYNC_READ
+    uint32_t   lba;
+    uint32_t   count;
+    xptr_t     buf_xp;
+    xptr_t     ioc_xp;
 
     // get client thread cluster and local pointer
@@ -69 +69 @@
 
     // get command arguments and extended pointer on IOC device
-    cmd_type =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->command.ioc.type   ) );
-    lba      =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->command.ioc.lba    ) );
-    count    =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->command.ioc.count  ) );
-    buf_xp   = (xptr_t)hal_remote_lwd( XPTR( th_cxy , &th_ptr->command.ioc.buf_xp ) );
-    dev_xp   = (xptr_t)hal_remote_lwd( XPTR( th_cxy , &th_ptr->command.ioc.dev_xp ) );
+    cmd_type =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->ioc_cmd.type   ) );
+    lba      =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->ioc_cmd.lba    ) );
+    count    =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->ioc_cmd.count  ) );
+    buf_xp   = (xptr_t)hal_remote_lwd( XPTR( th_cxy , &th_ptr->ioc_cmd.buf_xp ) );
+    ioc_xp   = (xptr_t)hal_remote_lwd( XPTR( th_cxy , &th_ptr->ioc_cmd.dev_xp ) );
 
     // get IOC device cluster and local pointer
-    cxy_t      dev_cxy = GET_CXY( dev_xp );
-    chdev_t  * dev_ptr = (chdev_t *)GET_PTR( dev_xp );
+    cxy_t      ioc_cxy = GET_CXY( ioc_xp );
+    chdev_t  * ioc_ptr = (chdev_t *)GET_PTR( ioc_xp );
 
     // get extended pointer on SOCLIB-BDV peripheral
-    xptr_t     bdv_xp = hal_remote_lw( XPTR( dev_cxy , &dev_ptr->base ) );
+    xptr_t     bdv_xp = hal_remote_lw( XPTR( ioc_cxy , &ioc_ptr->base ) );
 
     // get SOCLIB_BDV device cluster and local pointer
@@ -114 +114 @@
             if( status == BDV_READ_SUCCESS ) // successfully completed
             {
-                hal_remote_sw( XPTR( th_cxy , &th_ptr->command.ioc.error ) , 0 );
+                hal_remote_sw( XPTR( th_cxy , &th_ptr->ioc_cmd.error ) , 0 );
                 break;
             }
@@ -123 +123 @@
             else                            // error reported
             {
-                hal_remote_sw( XPTR( th_cxy , &th_ptr->command.ioc.error ) , 1 );
+                hal_remote_sw( XPTR( th_cxy , &th_ptr->ioc_cmd.error ) , 1 );
                 break;
             }
@@ -161 +161 @@
         if((status != BDV_READ_SUCCESS) && (status != BDV_WRITE_SUCCESS)) 
     {
-        hal_remote_sw( XPTR( client_cxy , &client_ptr->command.ioc.error ) , 1 );
+        hal_remote_sw( XPTR( client_cxy , &client_ptr->ioc_cmd.error ) , 1 );
     }
         else
     {
-        hal_remote_sw( XPTR( client_cxy , &client_ptr->command.ioc.error ) , 0 );
+        hal_remote_sw( XPTR( client_cxy , &client_ptr->ioc_cmd.error ) , 0 );
     }