Changeset 286 for branch/giet_vm_ioc_drivers/giet_drivers/hba_driver.c

Timestamp:

Jan 31, 2014, 5:05:21 PM (11 years ago)

Author:

cfuguet

Message:

• Modifying HBA driver to respect new IOC driver interface.

• Modifying XML parser and XML driver to manage the HBA controller as an IOC subtype.

File:

• branch/giet_vm_ioc_drivers/giet_drivers/hba_driver.c (modified) (13 diffs)

branch/giet_vm_ioc_drivers/giet_drivers/hba_driver.c

@@ -77 +77 @@
 #include <ctx_handler.h>
 #include <mmc_driver.h>
+#include <hba_driver.h>
 #include <vmem.h>
 
@@ -128 +129 @@
     if( channel >= NB_HBA_CHANNELS )
     {
-        _get_lock(&_tty_put_lock);
+        _tty_get_lock( 0 );
         _puts("\n[GIET ERROR] in _hba_get_status() : illegal channel\n");
-        _release_lock(&_tty_put_lock);
+        _tty_release_lock( 0 );
         return 1;
     }
@@ -150 +151 @@
     if( channel >= NB_HBA_CHANNELS )
     {   
-        _get_lock(&_tty_put_lock);
+        _tty_get_lock( 0 );
         _puts("\n[GIET ERROR] in _hba_reset_status() : illegal channel\n");
-        _release_lock(&_tty_put_lock);
+        _tty_release_lock( 0 );
         return 1;
     }
@@ -191 +192 @@
     hba_cmd_table_t*   cmd_table;      // command table pointer
 
-    // TODO The block size must be obtained from the hardware...
-    block_size = 512;
+    block_size = _hba_get_block_size();
 
     // check buffer alignment
     if( buf_vaddr & (block_size-1) )
     {
-        _get_lock(&_tty_put_lock);
+        _tty_get_lock( 0 );
         _puts("\n[GIET ERROR] in _hba_set_cmd() : user buffer not block aligned\n");
-        _release_lock(&_tty_put_lock);
+        _tty_release_lock( 0 );
         return 1;
     }
@@ -207 +207 @@
     if ( channel_id == 0xFFFFFFFF )
     {
-        _get_lock(&_tty_put_lock);
+        _tty_get_lock( 0 );
         _puts("\n[GIET ERROR] in _hba_set_cmd() : no HBA channel allocated\n");
-        _release_lock(&_tty_put_lock);
+        _tty_release_lock( 0 );
         return 1;
     }
@@ -223 +223 @@
     if( pxci & (1<<cmd_id ) ) 
     {
-        _get_lock(&_tty_put_lock);
+        _tty_get_lock( 0 );
         _puts("\n[GIET ERROR] in _hba_set_cmd() : command list full in channel \n");
         _putd( channel_id );
         _puts("\n");
-        _release_lock(&_tty_put_lock);
+        _tty_release_lock( 0 );
         return 1;
     }
@@ -262 +262 @@
         if ( ko )
         {
-            _get_lock(&_tty_put_lock);
+            _tty_get_lock( 0 );
             _puts("[GIET ERROR] in _hba_set_cmd() : user buffer unmapped\n");
-            _release_lock(&_tty_put_lock);
+            _tty_release_lock( 0 );
             return 1;
         }
         if ((flags & PTE_U) == 0)
         {
-            _get_lock(&_tty_put_lock);
+            _tty_get_lock( 0 );
             _puts("[GIET ERROR] in _hba_set_cmd() : user buffer not in user space\n");
-            _release_lock(&_tty_put_lock);
+            _tty_release_lock( 0 );
             return 1;
         }
         if (((flags & PTE_W) == 0 ) && (is_read == 0) )
         {
-            _get_lock(&_tty_put_lock);
+            _tty_get_lock( 0 );
             _puts("[GIET ERROR] in _hba_set_cmd() : user buffer not writable\n");
-            _release_lock(&_tty_put_lock);
+            _tty_release_lock( 0 );
             return 1;
         }
@@ -285 +285 @@
         if( buf_id > 245 )
         {
-            _get_lock(&_tty_put_lock);
+            _tty_get_lock( 0 );
             _puts("[GIET ERROR] in _hba_set_cmd() : max number of buffers is 248\n");
-            _release_lock(&_tty_put_lock);
+            _tty_release_lock( 0 );
             return 1;
         }
@@ -415 +415 @@
 // Returns 0 if success, > 0 if error.
 ///////////////////////////////////////////////////////////////////
-unsigned int _hba_write( unsigned int  lba,
+unsigned int _hba_write( unsigned int  mode,
+                         unsigned int  lba,
                          void*         buffer, 
                          unsigned int  count )
@@ -427 +428 @@
 // Returns 0 if success, > 0 if error.
 ///////////////////////////////////////////////////////////////////
-unsigned int _hba_read( unsigned int  lba, 
+unsigned int _hba_read( unsigned int  mode,
+                        unsigned int  lba, 
                         void*         buffer, 
                         unsigned int  count )
@@ -440 +442 @@
 // - the command tables physical addresses array,
 //////////////////////////////////////////////////////////////////
-void _hba_init( unsigned int channel )
+unsigned int _hba_init( unsigned int channel )
 {
     unsigned int ppn;
@@ -473 +475 @@
     if ( fail )
     {
-        _get_lock(&_tty_put_lock);
+        _tty_get_lock( 0 );
         _puts("[GIET ERROR] in _hba_init() : command list unmapped\n");
-        _release_lock(&_tty_put_lock);
-        _exit();
+        _tty_release_lock( 0 );
+        return 1;
     }
     hba_cmd_list_paddr[channel] = ((paddr_t)ppn) | (vbase & 0xFFF);
@@ -490 +492 @@
         if ( fail )
         {
-            _get_lock(&_tty_put_lock);
+            _tty_get_lock( 0 );
             _puts("[GIET ERROR] in _hba_init() : command table unmapped\n");
-            _release_lock(&_tty_put_lock);
-            _exit();
+            _tty_release_lock( 0 );
+            return 1;
         }
         hba_cmd_table_paddr[channel][c] = ((paddr_t)ppn) | (vbase & 0xFFF);
     }
+
+    return 0;
 }
 
+///////////////////////////////////////////////////////////////////////////////
+//     _hba_get_block_size()
+// This function returns the block_size of HBA controller
+///////////////////////////////////////////////////////////////////////////////
+unsigned int _hba_get_block_size()
+{
+    // TODO The block size must be obtained from the hardware...
+    return 512;
+}