Changeset 261

Timestamp:

Jul 20, 2017, 3:13:58 PM (7 years ago)

Author:

max@…

Message:

Hide soclib_dma.

Location:

trunk

Files:

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

trunk/hal/generic/hal_drivers.h

@@ -35 +35 @@
 void hal_drivers_nic_init(chdev_t *nic, uint32_t impl);
 
+void hal_drivers_dma_init(chdev_t *dma, uint32_t impl);
+
 #endif  /* HAL_DRIVERS_H_ */
 

trunk/hal/tsar_mips32/core/hal_drivers.c

@@ -130 +130 @@
 }
 
+///////////////////////////////////////////////////////////////////////////////
+//    DMA
+///////////////////////////////////////////////////////////////////////////////
+
+//////////////////////////////////////////
+void hal_drivers_dma_init( chdev_t  * dma,
+                           uint32_t   impl )
+{
+    if( impl == IMPL_DMA_SCL )
+    {
+        soclib_dma_init( dma );
+    }
+    else
+    {
+        assert( false , __FUNCTION__ , "undefined DMA implementation" );
+    }
+}
+

trunk/hal/tsar_mips32/drivers/soclib_dma.c

@@ -34 +34 @@
     cxy_t      dma_cxy  = GET_CXY( chdev->base );
     uint32_t * dma_ptr  = (uint32_t *)GET_PTR( chdev->base );
+
+    // set driver specific fields in chdev descriptor
+    chdev->cmd = &soclib_dma_cmd;
+    chdev->isr = &soclib_dma_isr;
 
     // enable interrupts

trunk/hal/x86_64/core/hal_drivers.c

@@ -77 +77 @@
         x86_panic("NIC driver not implemented");
 }
+
+/* -------------------------------------------------------------------------- */
+
+void hal_drivers_dma_init(chdev_t *dma, uint32_t impl)
+{
+        x86_panic("DMA driver not implemented");
+}
+

trunk/kernel/devices/dev_dma.c

@@ -32 +32 @@
 #include <soclib_dma.h>
 #include <dev_dma.h>
-#include <soclib_dma.h>
+#include <hal_drivers.h>
 
 /////////////////////////////////////////////////////////////////////////////////////////
@@ -50 +50 @@
     snprintf( dma->name , 16 , "dma_%d_%x" , channel , local_cxy );
 
-    // set field "cmd", "isr", and call the relevant driver init function
-    if( impl == IMPL_DMA_SCL )
-    {
-        dma->cmd = &soclib_dma_cmd;
-        dma->isr = &soclib_dma_isr;
-        soclib_dma_init( dma );
-    }
-    else
-    {
-        assert( false , __FUNCTION__ , "undefined DMA implementation" );
-    }
+    // call driver init function
+    hal_drivers_dma_init( dma, impl );
 
     // bind IRQ to the core defined by the DMA channel