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

Timestamp:

Oct 4, 2018, 11:48:51 PM (6 years ago)

Author:

alain

Message:

Complete restructuration of kernel locks.

File:

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

trunk/kernel/devices/dev_iob.c

@@ -2 +2 @@
  * dev_iob.c - IOB (bridge to external I/O) generic device API implementation.
  *
- * Authors   Alain Greiner  (2017)
+ * Authors   Alain Greiner  (2016,2017,2018)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -25 +25 @@
 #include <hal_kernel_types.h>
 #include <hal_special.h>
-#include <remote_spinlock.h>
+#include <remote_busylock.h>
 #include <chdev.h>
 #include <printk.h>
@@ -50 +50 @@
     // get IOB chdev descriptor cluster and local pointer
     cxy_t     dev_cxy = GET_CXY( dev_xp );
-    chdev_t * dev_ptr = (chdev_t *)GET_PTR( dev_xp );
+    chdev_t * dev_ptr = GET_PTR( dev_xp );
 
     // get pointer on set_active function
@@ -56 +56 @@
 
     // call relevant driver function
-    remote_spinlock_lock( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
+    remote_busylock_acquire( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
     f( dev_xp , 1 );
-    remote_spinlock_unlock( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
+    remote_busylock_release( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
 }
 
@@ -66 +66 @@
     // get IOB chdev descriptor cluster and local pointer
     cxy_t     dev_cxy = GET_CXY( dev_xp );
-    chdev_t * dev_ptr = (chdev_t *)GET_PTR( dev_xp );
+    chdev_t * dev_ptr = GET_PTR( dev_xp );
 
     // get pointer on set_active function
@@ -72 +72 @@
 
     // call driver function
-    remote_spinlock_lock( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
+    remote_busylock_acquire( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
     f( dev_xp , 0 );
-    remote_spinlock_unlock( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
+    remote_busylock_release( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
 }
 
@@ -83 +83 @@
     // get IOB chdev descriptor cluster and local pointer
     cxy_t     dev_cxy = GET_CXY( dev_xp );
-    chdev_t * dev_ptr = (chdev_t *)GET_PTR( dev_xp );
+    chdev_t * dev_ptr = GET_PTR( dev_xp );
 
     // get pointer on set_ptpr function
@@ -89 +89 @@
 
     // call driver function
-    remote_spinlock_lock( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
+    remote_busylock_acquire( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
     f( dev_xp , wdata );
-    remote_spinlock_unlock( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
+    remote_busylock_release( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
 
 }
@@ -101 +101 @@
     // get IOB chdev descriptor cluster and local pointer
     cxy_t     dev_cxy = GET_CXY( dev_xp );
-    chdev_t * dev_ptr = (chdev_t *)GET_PTR( dev_xp );
+    chdev_t * dev_ptr = GET_PTR( dev_xp );
 
     // get pointer on inval_page function
@@ -107 +107 @@
 
     // call driver function
-    remote_spinlock_lock( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
+    remote_busylock_acquire( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
     f( dev_xp , vpn );
-    remote_spinlock_unlock( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
+    remote_busylock_release( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
 }
 
@@ -120 +120 @@
     // get IOB chdev descriptor cluster and local pointer
     cxy_t     dev_cxy = GET_CXY( dev_xp );
-    chdev_t * dev_ptr = (chdev_t *)GET_PTR( dev_xp );
+    chdev_t * dev_ptr = GET_PTR( dev_xp );
 
     // get pointer on the functions
@@ -128 +128 @@
 
     // call driver function
-    remote_spinlock_lock( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
+    remote_busylock_acquire( 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 ) );
+    remote_busylock_release( XPTR( dev_cxy , &dev_ptr->wait_lock ) );
 }