Changes in trunk/kernel/devices/dev_pic.c [3:1]

File:

• trunk/kernel/devices/dev_pic.c (modified) (6 diffs)

trunk/kernel/devices/dev_pic.c

@@ -25 +25 @@
 #include <hal_special.h>
 #include <dev_icu.h>
-#include <chdev.h>
+#include <device.h>
 #include <memcpy.h>
 #include <printk.h>
@@ -35 +35 @@
 /////////////////////////////////////////////////////////////////////////////////////////
 
-extern chdev_directory_t  chdev_dir;         // allocated in kernel_init.c
+extern devices_directory_t  devices_dir;         // allocated in kernel_init.c
 
-extern chdev_pic_input_t  chdev_pic_input;   // allocated in kernel_init.c
+extern devices_input_irq_t  devices_input_irq;   // allocated in kernel_init.c
+
+
 
 ///////////////////////////////////
-void dev_pic_init( chdev_t * chdev,
-                   uint32_t  irq_nr )
+void dev_pic_init( xptr_t   dev_xp,
+                   uint32_t irq_nr )
 {
-    // set PIC chdev extension field
-    chdev->ext.pic.irq_nr = irq_nr;
+    // get PIC device cluster and local pointer
+    cxy_t      dev_cxy = GET_CXY( dev_xp );
+    device_t * dev_ptr = (device_t *)GET_PTR( dev_xp );
 
-    // get implementation 
-    uint32_t impl = chdev->impl;
+    // set PIC device extension field
+    dev_ptr->ext.pic.irq_nr = irq_nr;
 
-    // call the relevant driver init function
+    // get implementation index from PIC device descriptor
+    uint32_t impl = hal_remote_lw( XPTR( dev_cxy , &dev_ptr->impl ) );
+
+    // set the "name" field in PIC device descriptor
+    // and call the relevant driver init function
     if( impl == IMPL_PIC_SOC )
     {
-        soclib_pic_init( chdev );
+        memcpy( dev_ptr->name , "PIC_TSR" , 16 );
+        soclib_pic_init( dev_xp );
     }
     else
     {
-        assert( false , __FUNCTION__ , "illegal PIC device implementation" );
+        printk("PANIC in %s: illegal PIC device implementation\n", __FUNCTION__ );
+        hal_core_sleep();
     }
 } // end dev_pic_init()
@@ -66 +75 @@
 {
     // get extended pointer on WTI mailbox
-    xptr_t wti_xp = XPTR( cxy , dev_icu_wti_ptr( wti_id ) );
+    xptr_t wti_xp = dev_icu_wti_xptr( cxy , wti_id );
 
-    // get extended pointer on PIC chdev from directory
-    xptr_t dev_xp = chdev_dir.pic;
+    // get extended pointer on PIC device from directory
+    xptr_t dev_xp = devices_dir.pic;
 
-    // get PIC chdev cluster and local pointer
-    cxy_t     dev_cxy = GET_CXY( dev_xp );
-    chdev_t * dev_ptr = (chdev_t *)GET_PTR( dev_xp );
+    // get PIC device cluster and local pointer
+    cxy_t      dev_cxy = GET_CXY( dev_xp );
+    device_t * dev_ptr = (device_t *)GET_PTR( dev_xp );
 
     // get implementation index and segment base 
@@ -83 +92 @@
         soclib_pic_bind_irq( dev_xp , irq_id , wti_xp );
     }
+    else
+    {
+        printk("PANIC in %s: illegal PIC device implementation\n", __FUNCTION__ );
+        hal_core_sleep();
+    }
 }  // end dev_pic_link_wti()
 
@@ -88 +102 @@
 void dev_pic_unbind_irq( uint32_t irq_id )
 {
-    // get extended pointer on PIC chdev from directory
-    xptr_t dev_xp = chdev_dir.pic;
+    // get extended pointer on PIC device from directory
+    xptr_t dev_xp = devices_dir.pic;
 
-    // get PIC chdev cluster and local pointer
-    cxy_t     dev_cxy = GET_CXY( dev_xp );
-    chdev_t * dev_ptr = (chdev_t *)GET_PTR( dev_xp );
+    // get PIC device cluster and local pointer
+    cxy_t      dev_cxy = GET_CXY( dev_xp );
+    device_t * dev_ptr = (device_t *)GET_PTR( dev_xp );
 
     // get implementation index 
@@ -103 +117 @@
         soclib_pic_unbind_irq( dev_xp , irq_id );
     }
+    else
+    {
+        printk("PANIC in %s: illegal PIC device implementation\n", __FUNCTION__ );
+        hal_core_sleep();
+    }
+   
 } // end dev_pic_disable_irq()