Changeset 205 for trunk/kernel/devices

Timestamp:

Jul 17, 2017, 11:41:25 AM (7 years ago)

Author:

alain

Message:

Change dev_pic_enable_irq() and dev_pic_disable_irq() prototypes
to handle remote IRQs.

Location:

trunk/kernel/devices

Files:

• dev_pic.c (modified) (7 diffs)
• dev_pic.h (modified) (2 diffs)

trunk/kernel/devices/dev_pic.c

@@ -78 +78 @@
 
     // get pointer on extend_init function
-    pic_init_t * f = hal_remote_lpt( XPTR( pic_cxy , &pic_ptr->ext.pic.extend_init ) ); 
+    extend_init_t * f = hal_remote_lpt( XPTR( pic_cxy , &pic_ptr->ext.pic.extend_init ) ); 
 
     // call relevant driver function
@@ -93 +93 @@
 
     // get pointer on bind_irq function
-    pic_bind_t * f = hal_remote_lpt( XPTR( pic_cxy , &pic_ptr->ext.pic.bind_irq ) );
+    bind_irq_t * f = hal_remote_lpt( XPTR( pic_cxy , &pic_ptr->ext.pic.bind_irq ) );
 
     // call relevant driver function
@@ -99 +99 @@
 }
 
-///////////////////////////////////////
-void dev_pic_enable_irq( lid_t     lid,
-                         chdev_t * src_chdev )
+/////////////////////////////////////
+void dev_pic_enable_irq( lid_t   lid,
+                         xptr_t  src_chdev_xp )
 {
     // get pointer on PIC chdev
@@ -108 +108 @@
 
     // get pointer on enable_irq function
-    pic_enable_t * f = hal_remote_lpt( XPTR( pic_cxy , &pic_ptr->ext.pic.enable_irq ) );
+    enable_irq_t * f = hal_remote_lpt( XPTR( pic_cxy , &pic_ptr->ext.pic.enable_irq ) );
 
     // call relevant driver function
-    f( lid , src_chdev );
+    f( lid , src_chdev_xp );
 }
 
-////////////////////////////////////////
-void dev_pic_disable_irq( lid_t     lid,
-                          chdev_t * src_chdev )
+//////////////////////////////////////
+void dev_pic_disable_irq( lid_t   lid,
+                          xptr_t  src_chdev_xp )
 {
     // get pointer on PIC chdev
@@ -123 +123 @@
 
     // get pointer on disable_irq function
-    pic_disable_t * f = hal_remote_lpt( XPTR( pic_cxy , &pic_ptr->ext.pic.disable_irq ) );
+    disable_irq_t * f = hal_remote_lpt( XPTR( pic_cxy , &pic_ptr->ext.pic.disable_irq ) );
 
     // call relevant driver function
-    f( lid , src_chdev );
+    f( lid , src_chdev_xp );
 }
 
@@ -137 +137 @@
 
     // get pointer on enable_timer function
-    pic_timer_t * f = hal_remote_lpt( XPTR( pic_cxy , &pic_ptr->ext.pic.enable_timer ) );
+    enable_timer_t * f = hal_remote_lpt( XPTR( pic_cxy , &pic_ptr->ext.pic.enable_timer ) );
 
     // call relevant driver function
@@ -152 +152 @@
 
     // get pointer on send_ipi function
-    pic_ipi_t * f = hal_remote_lpt( XPTR( pic_cxy , &pic_ptr->ext.pic.send_ipi ) );
+    send_ipi_t * f = hal_remote_lpt( XPTR( pic_cxy , &pic_ptr->ext.pic.send_ipi ) );
 
     // call relevant driver function

trunk/kernel/devices/dev_pic.h

@@ -83 +83 @@
  ****************************************************************************************/
 
-typedef void   (pic_bind_t)    ( lid_t lid , 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 ); 
-typedef void   (pic_init_t)    ( uint32_t * lapic_base ); 
+typedef void   (bind_irq_t)     ( lid_t lid , struct chdev_s * src_chdev );   
+typedef void   (enable_irq_t)   ( lid_t lid , xptr_t src_chdev_xp );   
+typedef void   (disable_irq_t)  ( lid_t lid , xptr_t src_chdev_xp );   
+typedef void   (enable_timer_t) ( uint32_t period );   
+typedef void   (send_ipi_t)     ( cxy_t cxy , lid_t lid ); 
+typedef void   (extend_init_t)  ( uint32_t * lapic_base ); 
   
 typedef struct pic_extend_s
 {
-    pic_bind_t    * bind_irq;      /*! pointer on the driver "bind_irq" function        */ 
-    pic_enable_t  * enable_irq;    /*! pointer on the driver "enable_irq" function      */ 
-    pic_disable_t * disable_irq;   /*! pointer on the driver "disable_irq" function     */ 
-    pic_timer_t   * enable_timer;  /*! pointer on the driver "enable_timer" function    */
-    pic_ipi_t     * send_ipi;      /*! pointer on the driver "send_ipi" function        */
-    pic_init_t    * extend_init;   /*! pointer on the driver "init_extend" function     */
+    bind_irq_t      * bind_irq;      /*! pointer on the driver "bind_irq" function      */ 
+    enable_irq_t    * enable_irq;    /*! pointer on the driver "enable_irq" function    */ 
+    disable_irq_t   * disable_irq;   /*! pointer on the driver "disable_irq" function   */ 
+    enable_timer_t  * enable_timer;  /*! pointer on the driver "enable_timer" function  */
+    send_ipi_t      * send_ipi;      /*! pointer on the driver "send_ipi" function      */
+    extend_init_t   * extend_init;   /*! pointer on the driver "init_extend" function   */
 }
 pic_extend_t;
 
-/******************************************************************************************
+/*****************************************************************************************
  * This structure defines the input IRQS for the external IOPIC controller, that is used 
  * by external peripherals (IOC, NIC, TXT, etc.) to signal completion of an I/O operation.
@@ -186 +186 @@
 
 /*****************************************************************************************
- * This function disables the IRQ generated by a local chdev, defined by the <src_chdev> 
- * argument. It can be used for both internal & external IRQs.
- *****************************************************************************************
- * @ lid        : target core local index.
- * @ src_chdev  : local pointer on source chdev descriptor.
- ****************************************************************************************/
-void dev_pic_disable_irq( lid_t            lid,
-                          struct chdev_s * src_chdev );
-
-/*****************************************************************************************
- * This function enables the IRQ generated by a local chdev, defined by the <src_chdev> 
- * argument. It can be used for both internal & external IRQs.
- *****************************************************************************************
- * @ lid        : target core local index.
- * @ src_chdev  : local pointer on source chdev descriptor.
- ****************************************************************************************/
-void dev_pic_enable_irq( lid_t            lid,
-                         struct chdev_s * src_chdev );
+ * This function enables remote IRQ generated by a remote chdev, defined by the 
+ * <src_chdev_xp> argument. It can be called by any thread running in any cluster,
+ * and can be used for both internal & external IRQs.
+ *****************************************************************************************
+ * @ lid           : target core local index (in cluster containing the source chdev).
+ * @ src_chdev_xp  : extended  pointer on source chdev descriptor.
+ ****************************************************************************************/
+void dev_pic_enable_irq( lid_t   lid,
+                         xptr_t  src_chdev_xp );
+
+/*****************************************************************************************
+ * This function disables remote IRQ generated by a remote chdev, defined by the 
+ * <src_chdev_xp> argument. It can be called by any thread running in any cluster,
+ * and can be used for both internal & external IRQs.
+ *****************************************************************************************
+ * @ lid           : target core local index (in cluster containing the source chdev).
+ * @ src_chdev_xp  : extended pointer on sour chdev descriptor.
+ ****************************************************************************************/
+void dev_pic_disable_irq( lid_t   lid,
+                          xptr_t  src_chdev_xp );
 
 /*****************************************************************************************