Changeset 4 for trunk/kernel/drivers/soclib/soclib_mmc.c

Timestamp:

Apr 26, 2017, 2:10:21 PM (7 years ago)

Author:

alain

Message:

Introduce the chdev_t structure in place of device_t.

File:

• trunk/kernel/drivers/soclib/soclib_mmc.c (modified) (8 diffs)

trunk/kernel/drivers/soclib/soclib_mmc.c

@@ -24 +24 @@
 
 #include <hal_types.h>
-#include <device.h>
+#include <chdev.h>
 #include <dev_mmc.h>
 #include <soclib_mmc.h>
@@ -32 +32 @@
 
 
-/////////////////////////////////////
-void soclib_mmc_init( xptr_t dev_xp )
+///////////////////////////////////////
+void soclib_mmc_init( chdev_t * chdev )
 {
-    // get local pointer on MMC device descriptor
-    device_t * dev_ptr = (device_t *)GET_PTR( dev_xp );
-
-    // get extended pointer on MMC peripheral from MMC device
-    xptr_t  mmc_xp = dev_ptr->base;
-
-    // get local pointer on MMC segment base
-    uint32_t * base = (uint32_t *)GET_PTR( mmc_xp );
+    // get pointer on MMC segment base
+    uint32_t * base = (uint32_t *)GET_PTR( chdev->base );
 
     // enable MMC IRQ
@@ -49 +43 @@
 
 
-//////////////////////////////////////////////////////////////////
-void __attribute__ ((noinline)) soclib_mmc_command( xptr_t th_xp )
+//////////////////////////////////////////////////////////////
+void __attribute__ ((noinline)) soclib_mmc_cmd( xptr_t th_xp )
 {
     xptr_t     dev_xp;       // extended pointer on MMC device
@@ -64 +58 @@
 
     // get command type and extended pointer on MMC device
-    type   =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->dev.mmc.type   ) );
-    dev_xp = (xptr_t)hal_remote_lwd( XPTR( th_cxy , &th_ptr->dev.mmc.dev_xp ) );
+    type   =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->command.mmc.type   ) );
+    dev_xp = (xptr_t)hal_remote_lwd( XPTR( th_cxy , &th_ptr->command.mmc.dev_xp ) );
 
     // get MMC device cluster and local pointer
-    cxy_t      dev_cxy = GET_CXY( dev_xp );
-    device_t * dev_ptr = (device_t *)GET_PTR( dev_xp );
+    cxy_t     dev_cxy = GET_CXY( dev_xp );
+    chdev_t * dev_ptr = (chdev_t *)GET_PTR( dev_xp );
 
     // get extended pointer on SOCLIB-MMC peripheral
@@ -81 +75 @@
     {
         // get buffer paddr
-        buf_paddr = hal_remote_lwd( XPTR( th_cxy , &th_ptr->dev.mmc.buf_paddr ) );
+        buf_paddr = hal_remote_lwd( XPTR( th_cxy , &th_ptr->command.mmc.buf_paddr ) );
 
         // split buffer paddr in two 32 bits words
@@ -88 +82 @@
 
         // get buffer size
-        buf_size   = hal_remote_lw( XPTR( th_cxy , &th_ptr->dev.mmc.buf_size ) );
+        buf_size   = hal_remote_lw( XPTR( th_cxy , &th_ptr->command.mmc.buf_size ) );
 
         // get command type
@@ -102 +96 @@
     {
         // get src/dst buffer local pointer and register index
-        reg_ptr   = (uint32_t *)hal_remote_lpt( XPTR( th_cxy , &th_ptr->dev.mmc.reg_ptr ) );
-        reg_index = hal_remote_lw( XPTR( th_cxy , &th_ptr->dev.mmc.reg_index ) );
+        reg_ptr   = (uint32_t *)hal_remote_lpt( XPTR( th_cxy , &th_ptr->command.mmc.reg_ptr ) );
+        reg_index = hal_remote_lw( XPTR( th_cxy , &th_ptr->command.mmc.reg_index ) );
 
         // move register to/from local buffer 
@@ -119 +113 @@
 
 ////////////////////////////////////////////////////////////////
-void __attribute__ ((noinline)) soclib_mmc_isr( device_t * dev )
+void __attribute__ ((noinline)) soclib_mmc_isr( chdev_t * chdev )
 {
-    // get extended pointer on MMC peripheral from MMC device
-    xptr_t  mmc_xp = dev->base;
-
-    // get local pointer on MMC segment base
-    uint32_t * base = (uint32_t *)GET_PTR( mmc_xp );
+    // get pointer on MMC segment base
+    uint32_t * base = (uint32_t *)GET_PTR( chdev->base );
 
     // get faulty ADDRESS and SRCID from MMC registers