Changeset 683 for trunk/kernel/fs/fatfs.c

Timestamp:

Jan 13, 2021, 12:36:17 AM (3 years ago)

Author:

alain

Message:

All modifications required to support the <tcp_chat> application
including error recovery in case of packet loss.A

File:

• trunk/kernel/fs/fatfs.c (modified) (6 diffs)

trunk/kernel/fs/fatfs.c

@@ -1630 +1630 @@
 xptr_t  fatfs_ctx_alloc( cxy_t  cxy )
 {
-    kmem_req_t    req;
-
     // allocate memory from remote cluster
-        req.type     = KMEM_KCM;
-        req.order    = bits_log2( sizeof(fatfs_ctx_t) );
-    req.flags    = AF_KERNEL | AF_ZERO;
- 
-    return XPTR( cxy , kmem_remote_alloc( cxy , &req ) );
+    void * ptr = kmem_remote_alloc( cxy,
+                                    bits_log2(sizeof(fatfs_ctx_t)),
+                                    AF_ZERO );
+
+    if( ptr == NULL ) return XPTR_NULL;
+    else              return XPTR( cxy , ptr );
 
 }  //end faffs_ctx_alloc()
@@ -1645 +1644 @@
 {
     error_t       error;
-    kmem_req_t    req;
     cxy_t         cxy;             // FATFS context cluster identifier
     fatfs_ctx_t * fatfs_ctx_ptr;   // local pointer on FATFS context
@@ -1667 +1665 @@
     // allocate a 512 bytes buffer in remote cluster, used to store
     // temporarily the BOOT sector, and permanently the FS_INFO sector
-        req.type    = KMEM_KCM;
-    req.order   = 9;                    // 512 bytes
-    req.flags   = AF_KERNEL | AF_ZERO;
-        buffer      = kmem_remote_alloc( cxy , &req );
-
+        buffer = kmem_remote_alloc( cxy, 
+                                9,
+                                AF_ZERO );
     if( buffer == NULL ) 
     {
@@ -1827 +1823 @@
 void fatfs_ctx_destroy( xptr_t  fatfs_ctx_xp )
 {
-    kmem_req_t   req;
     mapper_t   * fat_mapper;
     uint8_t    * fs_info_buffer;
@@ -1844 +1839 @@
     fs_info_buffer = hal_remote_lpt( XPTR( fatfs_ctx_cxy , &fatfs_ctx_ptr->fs_info_buffer ) );
 
-    // release FS_INFO buffer
-    req.type = KMEM_KCM;
-    req.ptr  = fs_info_buffer;
-    kmem_remote_free( fatfs_ctx_cxy , &req );
+    // release FS_INFO buffer (512 bytes)
+    kmem_remote_free( fatfs_ctx_cxy,
+                      fs_info_buffer,
+                      9 );               
 
     // release FATFS context descriptor
-    req.type = KMEM_KCM;
-    req.ptr  = fatfs_ctx_ptr;
-    kmem_remote_free( fatfs_ctx_cxy , &req );
+    kmem_remote_free( fatfs_ctx_cxy,
+                      fatfs_ctx_ptr,
+                      bits_log2(sizeof(fatfs_ctx_t)) );
 
 }  // end fatfs_ctx_destroy()
@@ -2857 +2852 @@
 
     // compute number of pages
-    npages = size >> CONFIG_PPM_PAGE_SHIFT;
+    npages = size >> CONFIG_PPM_PAGE_ORDER;
     if( size & CONFIG_PPM_PAGE_MASK ) npages++;