Changeset 346 for trunk/kernel/devices/dev_iob.c

Timestamp:

Aug 9, 2017, 10:24:06 AM (7 years ago)

Author:

max@…

Message:

Hide soclib_iob.

File:

• trunk/kernel/devices/dev_iob.c (modified) (8 diffs)

trunk/kernel/devices/dev_iob.c

@@ -28 +28 @@
 #include <chdev.h>
 #include <printk.h>
-#include <soclib_iob.h>
+#include <hal_drivers.h>
 #include <dev_iob.h>
 
@@ -34 +34 @@
 void dev_iob_init( chdev_t * chdev )
 {
-    // get implementation 
+    // get implementation
     uint32_t  impl = chdev->impl;
 
@@ -41 +41 @@
 
     // call driver init function
-    if( impl == IMPL_IOB_TSR )
-    {
-        soclib_iob_init( chdev );
-    }
-    else
-    {
-        assert( false , __FUNCTION__ , "undefined IOB device implementation\n" );
-    }
+    hal_drivers_iob_init( chdev , impl );
 }
 
@@ -58 +51 @@
     chdev_t * dev_ptr = (chdev_t *)GET_PTR( dev_xp );
 
-    // get implementation from chdev descriptor
-    uint32_t  impl = hal_remote_lw( XPTR( dev_cxy , &dev_ptr->impl ) );
+    // get pointer on set_active function
+    iob_set_active_t * f = hal_remote_lpt( XPTR( dev_cxy , &dev_ptr->ext.iob.set_active ) );
 
-    // call driver function
-    if( impl == IMPL_IOB_TSR )
-    {
-        remote_spinlock_lock( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
-        soclib_iob_set_active( dev_xp , 1 );
-        remote_spinlock_unlock( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
-    }
-    else
-    {
-        printk("\n[PANIC] in %s: undefined IOB device implementation\n", __FUNCTION__ );
-        hal_core_sleep();
-    }
+    // call relevant driver function
+    remote_spinlock_lock( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
+    f( dev_xp , 1 );
+    remote_spinlock_unlock( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
 }
 
@@ -82 +67 @@
     chdev_t * dev_ptr = (chdev_t *)GET_PTR( dev_xp );
 
-    // get implementation from chdev descriptor
-    uint32_t  impl = hal_remote_lw( XPTR( dev_cxy , &dev_ptr->impl ) );
+    // get pointer on set_active function
+    iob_set_active_t * f = hal_remote_lpt( XPTR( dev_cxy , &dev_ptr->ext.iob.set_active ) );
 
     // call driver function
-    if( impl == IMPL_IOB_TSR )
-    {
-        remote_spinlock_lock( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
-        soclib_iob_set_active( dev_xp , 0 );
-        remote_spinlock_unlock( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
-    }
-    else
-    {
-        printk("\n[PANIC] in %s: undefined IOB device implementation\n", __FUNCTION__ );
-        hal_core_sleep();
-    }
+    remote_spinlock_lock( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
+    f( dev_xp , 0 );
+    remote_spinlock_unlock( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
 }
 
@@ -107 +84 @@
     chdev_t * dev_ptr = (chdev_t *)GET_PTR( dev_xp );
 
-    // get implementation from chdev descriptor
-    uint32_t  impl = hal_remote_lw( XPTR( dev_cxy , &dev_ptr->impl ) );
+    // get pointer on set_ptpr function
+    iob_set_ptpr_t * f = hal_remote_lpt( XPTR( dev_cxy , &dev_ptr->ext.iob.set_ptpr ) );
 
     // call driver function
-    if( impl == IMPL_IOB_TSR )
-    {
-        remote_spinlock_lock( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
-        soclib_iob_set_ptpr( dev_xp , wdata );
-        remote_spinlock_unlock( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
-    }
-    else
-    {
-        printk("\n[PANIC] in %s: undefined IOB device implementation\n", __FUNCTION__ );
-        hal_core_sleep();
-    }
+    remote_spinlock_lock( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
+    f( dev_xp , wdata );
+    remote_spinlock_unlock( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
+
 }
-                        
+
 ////////////////////////////////////////
 void dev_iob_inval_page( xptr_t  dev_xp,
@@ -132 +102 @@
     chdev_t * dev_ptr = (chdev_t *)GET_PTR( dev_xp );
 
-    // get implementation from chdev descriptor
-    uint32_t  impl = hal_remote_lw( XPTR( dev_cxy , &dev_ptr->impl ) );
+    // get pointer on inval_page function
+    iob_inval_page_t * f = hal_remote_lpt( XPTR( dev_cxy , &dev_ptr->ext.iob.inval_page ) );
 
     // call driver function
-    if( impl == IMPL_IOB_TSR )
-    {
-        remote_spinlock_lock( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
-        soclib_iob_inval_page( dev_xp , vpn );
-        remote_spinlock_unlock( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
-    }
-    else
-    {
-        printk("\n[PANIC] in %s: undefined IOB device implementation\n", __FUNCTION__ );
-        hal_core_sleep();
-    }
+    remote_spinlock_lock( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
+    f( dev_xp , vpn );
+    remote_spinlock_unlock( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
 }
 
@@ -159 +121 @@
     chdev_t * dev_ptr = (chdev_t *)GET_PTR( dev_xp );
 
-    // get implementation from chdev descriptor
-    uint32_t  impl = hal_remote_lw( XPTR( dev_cxy , &dev_ptr->impl ) );
+    // get pointer on the functions
+    iob_get_error_t * f_get_error = hal_remote_lpt( XPTR( dev_cxy , &dev_ptr->ext.iob.get_error ) );
+    iob_get_srcid_t * f_get_srcid = hal_remote_lpt( XPTR( dev_cxy , &dev_ptr->ext.iob.get_srcid ) );
+    iob_get_bvar_t  * f_get_bvar  = hal_remote_lpt( XPTR( dev_cxy , &dev_ptr->ext.iob.get_bvar  ) );
 
     // call driver function
-    if( impl == IMPL_IOB_TSR )
-    {
-        remote_spinlock_lock( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
-        *error = soclib_iob_get_error( dev_xp );
-        *srcid = soclib_iob_get_srcid( dev_xp );
-        *bvar  = soclib_iob_get_bvar( dev_xp );
-        remote_spinlock_unlock( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
-    }
-    else
-    {
-        printk("\n[PANIC] in %s: undefined IOB device implementation\n", __FUNCTION__ );
-        hal_core_sleep();
-    }
+    remote_spinlock_lock( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
+    *error = f_get_error( dev_xp );
+    *srcid = f_get_srcid( dev_xp );
+    *bvar  = f_get_bvar( dev_xp );
+    remote_spinlock_unlock( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
 }