Changeset 201 for trunk/kernel/devices

Timestamp:

Jul 13, 2017, 1:48:45 PM (7 years ago)

Author:

max@…

Message:

fix the pointers

Location:

trunk/kernel/devices

Files:

• dev_pic.c (modified) (9 diffs)
• dev_pic.h (modified) (1 diff)

trunk/kernel/devices/dev_pic.c

@@ -8 +8 @@
  * This file is part of ALMOS-MKH.
  *
- * ALMOS-MKH.is free software; you can redistribute it and/or modify it
+ * ALMOS-MKH is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by
  * the Free Software Foundation; version 2.0 of the License.
  *
- * ALMOS-MKH.is distributed in the hope that it will be useful, but
+ * ALMOS-MKH is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTPICLAR PURPOSE.  See the GNU
@@ -18 +18 @@
  *
  * You should have received a copy of the GNU General Public License
- * along with ALMOS-MKH.; if not, write to the Free Software Foundation,
+ * along with ALMOS-MKH; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
@@ -39 +39 @@
 void dev_pic_init( chdev_t  * pic )
 {
-    // get implementation 
+    // get implementation
     uint32_t impl = pic->impl;
 
@@ -70 +70 @@
 
     // get pointer on extend_init function
-    pic_init_t * f = hal_remote_lpt( XPTR( pic_cxy , &pic_ptr->ext.pic.extend_init ) ); 
+    pic_init_t * f = hal_remote_lpt( XPTR( pic_cxy , &pic_ptr->ext.pic.extend_init ) );
 
     // call relevant driver function
@@ -81 +81 @@
 {
     // get pointer on PIC chdev
-    chdev_t * pic = (chdev_t *)GET_PTR( chdev_dir.pic );
+    chdev_t * pic_ptr = (chdev_t *)GET_PTR( chdev_dir.pic );
+    cxy_t     pic_cxy = GET_CXY( chdev_dir.pic );
+
+    // get pointer on bind_irq function
+    pic_bind_t * f = hal_remote_lpt( XPTR( pic_cxy , &pic_ptr->ext.pic.bind_irq ) );
 
     // call relevant driver function
-    pic->ext.pic.bind_irq( lid , src_chdev );
-}  
+    f( lid , src_chdev );
+}
 
 ///////////////////////////////////////
@@ -92 +96 @@
 {
     // get pointer on PIC chdev
-    chdev_t * pic = (chdev_t *)GET_PTR( chdev_dir.pic );
+    chdev_t * pic_ptr = (chdev_t *)GET_PTR( chdev_dir.pic );
+    cxy_t     pic_cxy = GET_CXY( chdev_dir.pic );
+
+    // get pointer on enable_irq function
+    pic_enable_t * f = hal_remote_lpt( XPTR( pic_cxy , &pic_ptr->ext.pic.enable_irq ) );
 
     // call relevant driver function
-    pic->ext.pic.enable_irq( lid , src_chdev );
+    f( lid , src_chdev );
 }
 
@@ -103 +111 @@
 {
     // get pointer on PIC chdev
-    chdev_t * pic = (chdev_t *)GET_PTR( chdev_dir.pic );
+    chdev_t * pic_ptr = (chdev_t *)GET_PTR( chdev_dir.pic );
+    cxy_t     pic_cxy = GET_CXY( chdev_dir.pic );
+
+    // get pointer on disable_irq function
+    pic_disable_t * f = hal_remote_lpt( XPTR( pic_cxy , &pic_ptr->ext.pic.disable_irq ) );
 
     // call relevant driver function
-    pic->ext.pic.disable_irq( lid , src_chdev );
+    f( lid , src_chdev );
 }
 
@@ -113 +125 @@
 {
     // get pointer on PIC chdev
-    chdev_t * pic = (chdev_t *)GET_PTR( chdev_dir.pic );
+    chdev_t * pic_ptr = (chdev_t *)GET_PTR( chdev_dir.pic );
+    cxy_t     pic_cxy = GET_CXY( chdev_dir.pic );
+
+    // get pointer on enable_timer function
+    pic_timer_t * f = hal_remote_lpt( XPTR( pic_cxy , &pic_ptr->ext.pic.enable_timer ) );
 
     // call relevant driver function
-    pic->ext.pic.enable_timer( period );
+    f( period );
 }
 
@@ -124 +140 @@
 {
     // get pointer on PIC chdev
-    chdev_t * pic = (chdev_t *)GET_PTR( chdev_dir.pic );
+    chdev_t * pic_ptr = (chdev_t *)GET_PTR( chdev_dir.pic );
+    cxy_t     pic_cxy = GET_CXY( chdev_dir.pic );
+
+    // get pointer on send_ipi function
+    pic_ipi_t * f = hal_remote_lpt( XPTR( pic_cxy , &pic_ptr->ext.pic.send_ipi ) );
 
     // call relevant driver function
-    pic->ext.pic.send_ipi( cxy , lid );
+    f( cxy , lid );
 }
 
-

trunk/kernel/devices/dev_pic.h

@@ -84 +84 @@
 
 typedef void   (pic_bind_t)    ( lid_t lid , struct chdev_s * src_chdev );   
-typedef void   (pic_enable_t)  ( struct chdev_s * src_chdev );   
-typedef void   (pic_disable_t) ( struct chdev_s * src_chdev );   
+typedef void   (pic_enable_t)  ( lid_t lid , struct chdev_s * src_chdev );   
+typedef void   (pic_disable_t) ( lid_t lid , struct chdev_s * src_chdev );   
 typedef void   (pic_timer_t)   ( uint32_t period );   
 typedef void   (pic_ipi_t)     ( cxy_t cxy , lid_t lid );