Changeset 437 for trunk/kernel/devices/dev_fbf.c

Timestamp:

Mar 28, 2018, 2:40:29 PM (6 years ago)

Author:

alain

Message:

Fix various bugs

File:

• trunk/kernel/devices/dev_fbf.c (modified) (5 diffs)

trunk/kernel/devices/dev_fbf.c

@@ -2 +2 @@
  * dev_fbf.c - FBF (Block Device Controler) generic device API implementation.
  * 
- * Author  Alain Greiner    (2016)
+ * Author  Alain Greiner    (2016,2017,2018)
  *
  * Copyright (c) UPMC Sorbonne Universites
@@ -137 +137 @@
     error = vmm_v2p_translate( CONFIG_KERNEL_IDENTITY_MAP , buffer , &buf_paddr );
  
-    if( error )
-    {
-        printk("\n[ERROR] in %s : cannot translate vaddr = %p in process %x\n",
-               __FUNCTION__ , buffer , this->process->pid ); 
-        return EINVAL;
-    }
-
-    fbf_dmsg("\n[DBG] %s : thread %x in process %x / vaddr = %p / paddr = %l\n", 
-             __FUNCTION__ , this->trdid , this->process->pid , buffer , buf_paddr );
+    // check buffer is mapped
+    assert( (error == 0) , __FUNCTION__ ,
+    "cannot translate vaddr = %p in process %x\n", buffer, this->process->pid ); 
 
     // get extended pointer on FBF chdev descriptor
@@ -162 +156 @@
 
     // check offset and length versus FBF size
-    if( (offset + length) > (width * height) )
-    {
-        printk("\n[ERROR] in %s : offset = %d / length = %d / width = %d / height = %d\n",
-               __FUNCTION__ , offset , length , width , height ); 
-        return EINVAL;
-    }
+    assert( ((offset + length) <= (width * height)) , __FUNCTION__ ,
+    "offset %d / length %d / width %d / height %d\n", offset, length, width, height ); 
 
     // compute extended pointers on frame buffer and memory buffer
@@ -186 +176 @@
                       uint32_t       offset )
 {
+
+#if CONFIG_DEBUG_DEV_FBF_RX
+uint32_t cycle = (uint32_t)hal_get_cycle();
+if( CONFIG_DEBUG_DEV_FBF_RX < cycle )
+printk("\n[DBG] %s : thread %x enter / process %x / vaddr %x / size %x\n", 
+__FUNCTION__ , this, this->process->pid , buffer , buf_paddr );
+#endif
+
     return dev_fbf_access( false , buffer , length , offset ); 
+
+#if CONFIG_DEBUG_DEV_FBF_RX
+cycle = (uint32_t)hal_get_cycle();
+if( CONFIG_DEBUG_DEV_FBF_RX < cycle )
+printk("\n[DBG] %s : thread %x exit / process %x / vaddr %x / size %x\n", 
+__FUNCTION__ , this, this->process->pid , buffer , buf_paddr );
+#endif
+
 }  
 
@@ -194 +200 @@
                        uint32_t       offset )
 {
+
+#if CONFIG_DEBUG_DEV_FBF_TX
+uint32_t cycle = (uint32_t)hal_get_cycle();
+if( CONFIG_DEBUG_DEV_FBF_TX < cycle )
+printk("\n[DBG] %s : thread %x enter / process %x / vaddr %x / size %x\n", 
+__FUNCTION__ , this, this->process->pid , buffer , buf_paddr );
+#endif
+
     return dev_fbf_access( true , buffer , length , offset ); 
+
+#if CONFIG_DEBUG_DEV_FBF_RX
+cycle = (uint32_t)hal_get_cycle();
+if( CONFIG_DEBUG_DEV_FBF_RX < cycle )
+printk("\n[DBG] %s : thread %x exit / process %x / vaddr %x / size %x\n", 
+__FUNCTION__ , this, this->process->pid , buffer , buf_paddr );
+#endif
+
 }