Changeset 216

Timestamp:

Jul 17, 2017, 1:50:38 PM (7 years ago)

Author:

max@…

Message:

dispatch 'impl' in the hal

Location:

trunk

Files:

• hal/generic/hal_drivers.h (modified) (1 diff)
• hal/tsar_mips32/core/hal_drivers.c (modified) (1 diff)
• hal/x86_64/core/hal_drivers.c (modified) (1 diff)
• kernel/devices/dev_ioc.c (modified) (2 diffs)

trunk/hal/generic/hal_drivers.h

@@ -34 +34 @@
 void hal_drivers_pic_init(chdev_t *dev);
 
-void hal_drivers_ioc_init(chdev_t *dev);
+void hal_drivers_ioc_init(chdev_t *dev, uint32_t impl);
 
 #endif  /* HAL_DRIVERS_H_ */

trunk/hal/tsar_mips32/core/hal_drivers.c

@@ -70 +70 @@
 /* -------------------------------------------------------------------------- */
 
-void hal_drivers_ioc_init(chdev_t *dev)
+void hal_drivers_ioc_init(chdev_t *dev, uint32_t impl)
 {
-        soclib_bdv_init(dev);
+        if (impl == IMPL_IOC_BDV) {
+                soclib_bdv_init(dev);
+        } else if (impl == IMPL_IOC_HBA) {
+                soclib_hba_init(dev);
+        } else {
+                assert( false , __FUNCTION__ , "undefined IOC device implementation" );
+        }
 }
 

trunk/hal/x86_64/core/hal_drivers.c

@@ -71 +71 @@
 /* -------------------------------------------------------------------------- */
 
-void hal_drivers_ioc_init(chdev_t *dev)
+void hal_drivers_ioc_init(chdev_t *dev, uint32_t impl)
 {
         ioc_ata_init(dev);

trunk/kernel/devices/dev_ioc.c

@@ -26 +26 @@
 #include <hal_gpt.h>
 #include <hal_drivers.h>
-#include <soclib_hba.h>
 #include <thread.h>
 #include <printk.h>
@@ -55 +54 @@
 
     // call driver init function
-    if( impl == IMPL_IOC_BDV )
-    {
-        hal_drivers_ioc_init( ioc );
-    }
-    else if( impl == IMPL_IOC_HBA )
-    {
-        soclib_hba_init( ioc );
-    }
-    else
-    {
-        assert( false , __FUNCTION__ , "undefined IOC device implementation" );
-    }
+    hal_drivers_ioc_init( ioc, impl );
 
     // select a core to execute the IOC server thread