Changeset 238 for trunk/hal

Timestamp:

Jul 19, 2017, 3:31:39 PM (7 years ago)

Author:

alain

Message:

Fixing bugs in vfs_lookup()

Location:

trunk/hal/tsar_mips32

Files:

• core/hal_drivers.c (modified) (1 diff)
• core/hal_interrupt.c (modified) (2 diffs)
• drivers/soclib_pic.h (modified) (3 diffs)

trunk/hal/tsar_mips32/core/hal_drivers.c

@@ -23 +23 @@
 #include <chdev.h>
 #include <hal_drivers.h>
-#include <hal_internal.h>
+#include <printk.h>
 
 #include <soclib_tty.h>
-#include <soclib_xcu.h>
 #include <soclib_pic.h>
+#include <soclib_bdv.h>
+#include <soclib_hba.h>
 
-void hal_drivers_txt_init(chdev_t *dev)
+///////////////////////////////////////////////////////////////////////////////
+//    TXT
+///////////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////
+void hal_drivers_txt_init( chdev_t * txt )
 {
-        soclib_tty_init(dev);
+        soclib_tty_init( txt );
 }
 
-/* -------------------------------------------------------------------------- */
+///////////////////////////////////////////////////////////////////////////////
+//    PIC
+///////////////////////////////////////////////////////////////////////////////
 
-void hal_drivers_xcu_init(chdev_t *dev, lid_t lid)
+//////////////////////////////////////////
+void hal_drivers_pic_init( chdev_t * pic )
 {
-        soclib_xcu_init(dev, lid);
+        soclib_pic_init( pic );
+
+        /* update the PIC chdev extension */
+        pic->ext.pic.enable_timer = &soclib_pic_enable_timer;
+        pic->ext.pic.enable_irq   = &soclib_pic_enable_irq;
+        pic->ext.pic.disable_irq  = &soclib_pic_disable_irq;
+        pic->ext.pic.bind_irq     = &soclib_pic_bind_irq;
+        pic->ext.pic.send_ipi     = &soclib_pic_send_ipi;
+        pic->ext.pic.extend_init  = &soclib_pic_extend_init;
 }
 
-void hal_drivers_xcu_disable_irq(chdev_t *icu, uint32_t irq_index,
-    uint32_t irq_type, lid_t lid)
+///////////////////////////////////////////////////////////////////////////////
+//    IOC
+///////////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////
+void hal_drivers_ioc_init( chdev_t  * ioc,
+                           uint32_t   impl )
 {
-        soclib_xcu_disable_irq(icu, 1 << irq_index, irq_type, lid);
-}
-
-void hal_drivers_xcu_enable_irq(chdev_t *icu, uint32_t irq_index,
-    uint32_t irq_type, lid_t lid)
-{
-        soclib_xcu_enable_irq(icu, 1 << irq_index, irq_type, lid);
-}
-
-/* -------------------------------------------------------------------------- */
-
-void hal_drivers_pic_init(chdev_t *dev)
-{
-        soclib_pic_init(dev);
-
-        /* update the PIC chdev extension */
-        dev->ext.pic.enable_timer = &soclib_pic_enable_timer;
-        dev->ext.pic.enable_irq   = &soclib_pic_enable_irq;
-        dev->ext.pic.disable_irq  = &soclib_pic_disable_irq;
-        dev->ext.pic.bind_irq     = &soclib_pic_bind_irq;
-        dev->ext.pic.send_ipi     = &soclib_pic_send_ipi;
-        dev->ext.pic.extend_init  = &soclib_pic_extend_init;
-}
-
-/* -------------------------------------------------------------------------- */
-
-void hal_drivers_ioc_init(chdev_t *dev, uint32_t impl)
-{
-        if (impl == IMPL_IOC_BDV) {
-                soclib_bdv_init(dev);
-        } else if (impl == IMPL_IOC_HBA) {
-                soclib_hba_init(dev);
-        } else {
+        if (impl == IMPL_IOC_BDV) 
+    {
+                soclib_bdv_init( ioc );
+        } 
+    else if (impl == IMPL_IOC_HBA)
+    {
+                soclib_hba_init( ioc );
+        }
+    else 
+    {
                 assert( false , __FUNCTION__ , "undefined IOC device implementation" );
         }

trunk/hal/tsar_mips32/core/hal_interrupt.c

@@ -27 +27 @@
 #include <do_interrupt.h>
 #include <hal_interrupt.h>
-#include<mips32_uzone.h>
+#include <mips32_uzone.h>
+#include <soclib_pic.h>
 
 ///////////////////////////////////////
@@ -36 +37 @@
         thread_user_time_update( this );
 
-    // access ICU device to call the relevant ISR
+    // access local ICU to call the relevant ISR
     soclib_pic_irq_handler();
            

trunk/hal/tsar_mips32/drivers/soclib_pic.h

@@ -172 +172 @@
  * @ chdev    : pointer on PIC chdev descriptor.
  *****************************************************************************************/
-void   soclib_pic_init( chdev_t * pic );
+void   soclib_pic_init( struct chdev_s * pic );
 
 /*****************************************************************************************
@@ -202 +202 @@
  * @ src_chdev  : local pointer on source chdev descriptor.
  *****************************************************************************************/
-void soclib_pic_bind_irq( lid_t     lid,
-                          chdev_t * src_chdev );
+void soclib_pic_bind_irq( lid_t            lid,
+                          struct chdev_s * src_chdev );
 
 /******************************************************************************************
@@ -296 +296 @@
  * This SOCLIB PIC specific is the call-back function is the interrupt handler.
  *****************************************************************************************/
-void soclip_pic_irq_handler();
+void soclib_pic_irq_handler();