Changeset 430 for trunk/kernel/fs/devfs.c

Timestamp:

Jan 29, 2018, 6:10:17 PM (6 years ago)

Author:

alain

Message:

blop

File:

• trunk/kernel/fs/devfs.c (modified) (3 diffs)

trunk/kernel/fs/devfs.c

@@ -387 +387 @@
     assert( ( size < CONFIG_TXT_KBUF_SIZE ) , __FUNCTION__ , "string size too large" );
 
-    cxy_t              file_cxy;     // remote file descriptor cluster 
-    vfs_file_t       * file_ptr;     // remote file descriptor local pointer
-    vfs_inode_type_t   inode_type;   // associated inode type
-    vfs_inode_t      * inode_ptr;    // associated inode local pointer
+    xptr_t             chdev_xp;
+    cxy_t              chdev_cxy;
     chdev_t          * chdev_ptr;    // associated chdev type
     uint32_t           func;         // chdev functionnal type
@@ -405 +403 @@
 #endif
 
-    // get cluster and local pointer on remote file descriptor
-    // associated inode and chdev are stored in same cluster as the file desc.
-    file_cxy  = GET_CXY( file_xp );
-    file_ptr  = (vfs_file_t *)GET_PTR( file_xp );
-
-    // get inode type from remote file descriptor
-    inode_type = hal_remote_lw( XPTR( file_cxy , &file_ptr->type ) );
-    inode_ptr  = (vfs_inode_t *)hal_remote_lpt( XPTR( file_cxy , &file_ptr->inode ) );
-
-    assert( (inode_type == INODE_TYPE_DEV) , __FUNCTION__ ,
-    "inode type is not INODE_TYPE_DEV" );
-
-    // get chdev local pointer from remote inode extension
-    chdev_ptr = (chdev_t *)hal_remote_lpt( XPTR( file_cxy , &inode_ptr->extend ) );
- 
+    // get extended pointer on chdev_xp
+    chdev_xp = chdev_from_file( file_xp );
+
+    // get cluster and local pointer on chdev
+    chdev_cxy  = GET_CXY( chdev_xp );
+    chdev_ptr  = (chdev_t *)GET_PTR( chdev_xp );
+
     // get chdev functionnal type and channel
-    func    = hal_remote_lw( XPTR( file_cxy , &chdev_ptr->func ) );
-    channel = hal_remote_lw( XPTR( file_cxy , &chdev_ptr->channel ) );
+    func    = hal_remote_lw( XPTR( chdev_cxy , &chdev_ptr->func ) );
+    channel = hal_remote_lw( XPTR( chdev_cxy , &chdev_ptr->channel ) );
 
     // action depends on "func" and "to_buffer" 
@@ -482 +472 @@
     else
     {
-        panic("device type %s does not support direct user access", chdev_func_str(func) );
+        assert( false , __FUNCTION__ ,
+        "%s does not support direct user access", chdev_func_str(func) );
 
         return -1;