Changeset 4 for trunk/kernel/drivers/soclib/soclib_hba.c

Timestamp:

Apr 26, 2017, 2:10:21 PM (8 years ago)

Author:

alain

Message:

Introduce the chdev_t structure in place of device_t.

File:

• trunk/kernel/drivers/soclib/soclib_hba.c (modified) (7 diffs)

trunk/kernel/drivers/soclib/soclib_hba.c

@@ -24 +24 @@
 #include <printk.h>
 #include <hal_special.h>
-#include <device.h>
+#include <chdev.h>
 #include <dev_ioc.h>
 #include <soclib_hba.h>
@@ -54 +54 @@
 spinlock_t         hba_lock;
 
-/////////////////////////////////////
-void soclib_hba_init( xptr_t dev_xp )
+///////////////////////////////////////
+void soclib_hba_init( chdev_t * chdev )
 {
-    // get IOC device descriptor cluster and local pointer 
-    cxy_t      dev_cxy  = GET_CXY( dev_xp );
-    device_t * dev_ptr  = (device_t *)GET_PTR( dev_xp );
-  
     // get hardware device base address
-        xptr_t     hba_xp = (xptr_t)hal_remote_lwd( XPTR( dev_cxy , &dev_ptr->base ) );
+        xptr_t  hba_xp = chdev->base;
 
     // get hardware device cluster and local pointer
@@ -73 +69 @@
 
     // set device descriptor extension
-    hal_remote_sw( XPTR( dev_cxy , &dev_ptr->ext.ioc.size  ) , block_size );
-    hal_remote_sw( XPTR( dev_cxy , &dev_ptr->ext.ioc.count ) , block_count );
+    chdev->ext.ioc.size  = block_size;
+    chdev->ext.ioc.count = block_count;
 
         // reset SOCLIB_HBA driver global variables
@@ -102 +98 @@
 
     // get command arguments and extended pointer on IOC device
-    to_mem    =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->dev.ioc.to_mem ) );
-    lba       =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->dev.ioc.lba    ) );
-    count     =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->dev.ioc.count  ) );
-    buf_xp    = (xptr_t)hal_remote_lwd( XPTR( th_cxy , &th_ptr->dev.ioc.buf_xp ) );
-    dev_xp    = (xptr_t)hal_remote_lwd( XPTR( th_cxy , &th_ptr->dev.ioc.dev_xp ) );
+    to_mem    =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->command.ioc.to_mem ) );
+    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 ) );
 
     // get IOC device cluster and local pointer
-    cxy_t      dev_cxy = GET_CXY( dev_xp );
-    device_t * dev_ptr = (device_t *)GET_PTR( dev_xp );
+    cxy_t     dev_cxy = GET_CXY( dev_xp );
+    chdev_t * dev_ptr = (chdev_t *)GET_PTR( dev_xp );
 
     // get extended pointer on SOCLIB-HBA peripheral
@@ -218 +214 @@
 
 
-////////////////////////////////////////////////////////////////
-void __attribute__ ((noinline)) soclib_hba_isr( device_t * dev )
+/////////////////////////////////////////////////////////////////
+void __attribute__ ((noinline)) soclib_hba_isr( chdev_t * chdev )
 {
     // get extended pointer on client thread
-    xptr_t root      = XPTR( local_cxy , &dev->wait_root );
+    xptr_t root      = XPTR( local_cxy , &chdev->wait_root );
     xptr_t client_xp = XLIST_FIRST_ELEMENT( root , thread_t , wait_list );
 
@@ -230 +226 @@
 
     // get SOCLIB_HBA device cluster and local pointer
-    cxy_t      hba_cxy  = GET_CXY( dev->base );
-    uint32_t * hba_ptr  = (uint32_t *)GET_PTR( dev->base );
+    cxy_t      hba_cxy  = GET_CXY( chdev->base );
+    uint32_t * hba_ptr  = (uint32_t *)GET_PTR( chdev->base );
 
     // get HBA_PXIS_REG and HBA_PXIS_REG current values
@@ -253 +249 @@
             if( error && (iter == fault_id ) ) 
             {
-                hal_remote_sw( XPTR( client_cxy , &client_ptr->dev.ioc.error ) , 1 );
+                hal_remote_sw( XPTR( client_cxy , &client_ptr->command.ioc.error ) , 1 );
             }
             else
             {
-                hal_remote_sw( XPTR( client_cxy , &client_ptr->dev.ioc.error ) , 0 );
+                hal_remote_sw( XPTR( client_cxy , &client_ptr->command.ioc.error ) , 0 );
             }