Changeset 188 for trunk/kernel/devices/dev_ioc.c

Timestamp:

Jul 12, 2017, 8:12:41 PM (7 years ago)

Author:

alain

Message:

Redefine the PIC device API.

File:

• trunk/kernel/devices/dev_ioc.c (modified) (3 diffs)

trunk/kernel/devices/dev_ioc.c

@@ -39 +39 @@
 /////////////////////////////////////////////////////////////////////////////////////////
 
-extern chdev_directory_t  chdev_dir;         // allocated in kernel_init.c
-
-extern chdev_pic_input_t  chdev_pic_input;   // allocated in kernel_init.c
-
-////////////////////////////////////
-void dev_ioc_init( chdev_t * chdev )
-{
-    // the local ICU chdev must be initialized before the IOC chdev, because
-    // the IOC chdev initialisation requires allocation of a WTI from local ICU
-    xptr_t  icu_xp  = chdev_dir.icu[local_cxy];
-    assert( (icu_xp != XPTR_NULL) , __FUNCTION__ , "ICU not initialised before IOC" );
+extern chdev_directory_t  chdev_dir;     // allocated in kernel_init.c
+
+//////////////////////////////////
+void dev_ioc_init( chdev_t * ioc )
+{
+    // the PIC chdev must be initialized before the IOC chdev, because
+    // the IOC chdev initialisation requires the routing of an external IRQ
+    xptr_t  pic_xp  = chdev_dir.pic;
+
+    assert( (pic_xp != XPTR_NULL) , __FUNCTION__ , "PIC not initialised before IOC" );
 
     // get implementation and channel from chdev descriptor
-    uint32_t  impl    = chdev->impl;
-    uint32_t  channel = chdev->channel;
+    uint32_t  impl    = ioc->impl;
+    uint32_t  channel = ioc->channel;
 
     // set chdev name
-    strcpy( chdev->name , "ioc" );
+    snprintf( ioc->name , 16 , "ioc_%d" , channel );
 
     // set driver specific fields in chdev descriptor and call driver init function
     if( impl == IMPL_IOC_BDV )
     {
-        chdev->cmd = &soclib_bdv_cmd;
-        chdev->isr = &soclib_bdv_isr;
-        soclib_bdv_init( chdev );
+        ioc->cmd = &soclib_bdv_cmd;
+        ioc->isr = &soclib_bdv_isr;
+        soclib_bdv_init( ioc );
     }
     else if( impl == IMPL_IOC_HBA )
     {
-        chdev->cmd = &soclib_hba_cmd;
-        chdev->isr = &soclib_hba_isr;
-        soclib_hba_init( chdev );
+        ioc->cmd = &soclib_hba_cmd;
+        ioc->isr = &soclib_hba_isr;
+        soclib_hba_init( ioc );
     }
     else
@@ -76 +75 @@
     }
 
-    // get a WTI mailbox from local ICU
-    uint32_t wti_id = dev_icu_wti_alloc();
-
-    assert( (wti_id != -1) , __FUNCTION__ , "cannot allocate WTI mailbox" );
-
-    // select a core
+    // select a core to execute the IOC server thread
     lid_t lid = cluster_select_local_core();
 
-    // enable WTI IRQ and update WTI interrupt vector
-    dev_icu_enable_irq( lid , WTI_TYPE , wti_id , chdev );
-
-    // link IOC IRQ to WTI mailbox in PIC component 
-    uint32_t irq_id = chdev_pic_input.ioc[channel];
-    dev_pic_bind_irq( irq_id , local_cxy , wti_id );
+    // bind the IOC IRQ to the selected core
+    dev_pic_bind_irq( lid , ioc );
+
+    // enable IRQ
+    dev_pic_enable_irq( lid ,ioc );
 
     // create server thread
@@ -98 +91 @@
                                   THREAD_DEV,
                                   &chdev_sequencial_server,
-                                  chdev,
+                                  ioc,
                                   lid ); 
+
     assert( (error == 0) , __FUNCTION__ , "cannot create server thread" );
 
-    // set "server" field in chdev descriptor
-    chdev->server = new_thread;
+    // set "server" field in ioc descriptor
+    ioc->server = new_thread;
     
     // start server thread