Changeset 605 for trunk/kernel/devices

Timestamp:

Dec 3, 2018, 12:19:16 PM (6 years ago)

Author:

alain

Message:

Improve the FAT32 file system to support cat, rm, cp commands.

Location:

trunk/kernel/devices

Files:

• dev_ioc.c (modified) (9 diffs)
• dev_mmc.c (modified) (4 diffs)

trunk/kernel/devices/dev_ioc.c

@@ -101 +101 @@
     thread_t * this = CURRENT_THREAD;              // pointer on client thread
 
+#if ( DEV_IOC_RX  || DEV_IOC_TX )
+uint32_t   cycle = (uint32_t)hal_get_cycles();
+#endif
+
     // software L2/L3 cache coherence for memory buffer
     if( chdev_dir.iob )
@@ -111 +115 @@
     xptr_t  dev_xp = chdev_dir.ioc[0];
 
-    assert( (dev_xp != XPTR_NULL) , "undefined IOC chdev descriptor" );
+// check dev_xp
+assert( (dev_xp != XPTR_NULL) , "undefined IOC chdev descriptor" );
 
     // register command in calling thread descriptor
@@ -125 +130 @@
     chdev_register_command( dev_xp );
 
+#if(DEV_IOC_RX & 1)
+if( (DEV_IOC_RX < cycle) && (cmd_type != IOC_WRITE) )
+printk("\n[%s] thread[%x,%x] resumes for RX\n",
+__FUNCTION__, this->process->pid , this->trdid )
+#endif
+
+#if(DEV_IOC_TX & 1)
+if( (DEV_IOC_RX < cycle) && (cmd_type == IOC_WRITE) )
+printk("\n[%s] thread[%x,%x] resumes for TX\n",
+__FUNCTION__, this->process->pid , this->trdid )
+#endif
+
     // return I/O operation status
     return this->ioc_cmd.error;
@@ -137 +154 @@
 
 #if DEBUG_DEV_IOC_RX
-uint32_t cycle = (uint32_t)hal_get_cycles();
-if( DEBUG_DEV_IOC_RX < cycle )
-printk("\n[DBG] %s : thread %x enters / lba  %x / buffer %x / cycle %d\n",
-__FUNCTION__ , this, lba, buffer, cycle );
+uint32_t   cycle = (uint32_t)hal_get_cycles();
+thread_t * this  = CURRENT_THREAD;
+if( DEBUG_DEV_IOC_RX < cycle )
+printk("\n[%s] thread[%x,%x] enters / lba  %x / buffer %x / cycle %d\n",
+__FUNCTION__ , this->process->pid, this->trdid, lba, buffer, cycle );
 #endif
 
@@ -148 +166 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_DEV_IOC_RX < cycle )
-printk("\n[DBG] %s : thread %x exit / lba  %x / buffer %x / cycle %d\n",
-__FUNCTION__ , this, lba, buffer, cycle );
+printk("\n[%s] thread[%x,%x] exit / lba  %x / buffer %x / cycle %d\n",
+__FUNCTION__ , this->process->pid, this->trdid, lba, buffer, cycle );
 #endif
 
@@ -161 +179 @@
 
 #if DEBUG_DEV_IOC_TX
-uint32_t cycle = (uint32_t)hal_get_cycles();
+uint32_t   cycle = (uint32_t)hal_get_cycles();
+thread_t * this  = CURRENT_THREAD;
 if( DEBUG_DEV_IOC_TX < cycle )
-printk("\n[DBG] %s : thread %x enters / lba  %x / buffer %x / cycle %d\n",
-__FUNCTION__ , this, lba, buffer, cycle );
+printk("\n[%s] thread[%x,%x] enters / lba  %x / buffer %x / cycle %d\n",
+__FUNCTION__ , this->process->pid, this->trdid, lba, buffer, cycle );
 #endif
 
@@ -172 +191 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_DEV_IOC_TX < cycle )
-printk("\n[DBG] %s : thread %x exit / lba  %x / buffer %x / cycle %d\n",
-__FUNCTION__ , this, lba, buffer, cycle );
+printk("\n[%s] thread[%x,%x] exit / lba  %x / buffer %x / cycle %d\n",
+__FUNCTION__ , this->process->pid, this->trdid, lba, buffer, cycle );
 #endif
 
@@ -189 +208 @@
 uint32_t cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_DEV_IOC_RX < cycle )
-printk("\n[DBG] %s : thread %x enters / lba  %x / buffer %x / cycle %d\n",
-__FUNCTION__ , this, lba, buffer, cycle );
+printk("\n[%s] thread[%x,%x] enters / lba  %x / buffer %x / cycle %d\n",
+__FUNCTION__ , this->process->pid, this->trdid, lba, buffer, cycle );
 #endif
 
@@ -230 +249 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_DEV_IOC_RX < cycle )
-printk("\n[DBG] %s : thread %x exit / lba  %x / buffer %x / cycle %d\n",
-__FUNCTION__ , this, lba, buffer, cycle );
+printk("\n[%s] thread[%x,%x] exit / lba  %x / buffer %x / cycle %d\n",
+__FUNCTION__ , this->process->pid, this->trdid, lba, buffer, cycle );
 #endif
 

trunk/kernel/devices/dev_mmc.c

@@ -103 +103 @@
 uint32_t cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_DEV_MMC < cycle )
-printk("\n[DBG] %s : thread %x enters / process %x / buf_xp = %l\n", 
-__FUNCTION__, this, this->process->pid , buf_xp );
+printk("\n[%s] thread[%x,%x] enters / cluster %x / buffer %x\n", 
+__FUNCTION__, this->process->pid, this->trdid, GET_CXY(buf_xp), GET_PTR(buf_xp) );
 #endif
 
@@ -126 +126 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_DEV_MMC < cycle )
-printk("\n[DBG] %s : thread %x exit / process %x / buf_xp = %l\n", 
-__FUNCTION__, this, this->process->pid , buf_xp );
+printk("\n[%s] thread[%x,%x] exit / cluster %x / buffer %x\n", 
+__FUNCTION__, this->process->pid, this->trdid, GET_CXY(buf_xp), GET_PTR(buf_xp) );
 #endif
 
@@ -144 +144 @@
 uint32_t cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_DEV_MMC < cycle )
-printk("\n[DBG] %s : thread %x enters / process %x / buf_xp = %l\n", 
-__FUNCTION__, this, this->process->pid , buf_xp );
+printk("\n[%s] thread[%x,%x] enters / cluster %x / buffer %x\n", 
+__FUNCTION__, this->process->pid, this->trdid, GET_CXY(buf_xp), GET_PTR(buf_xp) );
 #endif
 
@@ -167 +167 @@
 cycle = (uint32_t)hal_get_cycles();
 if( DEBUG_DEV_MMC < cycle )
-printk("\n[DBG] %s : thread %x exit / process %x / buf_xp = %l\n", 
-__FUNCTION__, this, this->process->pid , buf_xp );
+printk("\n[%s] thread[%x,%x] exit / cluster %x / buffer %x\n", 
+__FUNCTION__, this->process->pid, this->trdid, GET_CXY(buf_xp), GET_PTR(buf_xp) );
 #endif