Changeset 430 for trunk

Timestamp:

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

Author:

alain

Message:

blop

Location:

trunk/kernel/fs

Files:

• devfs.c (modified) (3 diffs)
• vfs.c (modified) (14 diffs)
• vfs.h (modified) (1 diff)

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;

trunk/kernel/fs/vfs.c

@@ -35 +35 @@
 #include <slist.h>
 #include <xhtab.h>
+#include <string.h>
 #include <rpc.h>
 #include <errno.h>
@@ -166 +167 @@
     {
         ctx = NULL;
-                panic("illegal file system type = %d" , fs_type );
+                assert( false , __FUNCTION__ , "illegal file system type = %d\n" , fs_type );
     }
 
@@ -243 +244 @@
     if( inode->refcount )
     {
-        panic("inode refcount non zero");
+        assert( false , __FUNCTION__ , "inode refcount non zero\n" );
     }       
 
@@ -425 +426 @@
     {
         ctx = NULL;
-        panic("undefined file system type");
+        assert( false , __FUNCTION__ , "undefined file system type\n" );
     }
 
@@ -476 +477 @@
     if( dentry->refcount )
     {
-        panic("dentry refcount non zero");
+        assert( false , __FUNCTION__ , "dentry refcount non zero\n" );
     }       
 
@@ -529 +530 @@
     if( file->refcount )
     {
-        panic("file refcount non zero");
+        assert( false , __FUNCTION__ , "refcount non zero\n" );
     }       
 
@@ -883 +884 @@
                     char   * path )
 {
-    panic("not implemented");
+    assert( false , __FUNCTION__ , "not implemented\n" );
     return 0;
 } 
@@ -891 +892 @@
                   struct stat * k_stat )
 {
-    panic("not implemented");
+    assert( false , __FUNCTION__ , "not implemented\n" );
     return 0;
 }
@@ -899 +900 @@
                      struct dirent * k_dirent )
 {
-    panic("not implemented");
+    assert( false , __FUNCTION__ , "not implemented\n" );
     return 0;
 }
@@ -908 +909 @@
                    uint32_t   mode )
 {
-    panic("not implemented");
+    assert( false , __FUNCTION__ , "not implemented\n" );
     return 0;
 }
@@ -916 +917 @@
                    char   * path )
 {
-    panic("not implemented");
+    assert( false , __FUNCTION__ , "not implemented\n" );
     return 0;
 }
@@ -952 +953 @@
     }
 
-    panic("not fully implemented");
+    assert( false , __FUNCTION__ , "not implemented\n" );
     return 0;
 }
@@ -984 +985 @@
 
     
-    panic("not fully implemented");
+    assert( false , __FUNCTION__ , "not implemented\n" );
     return 0;
 }
@@ -993 +994 @@
                     uint32_t rights )
 {
-    panic("not implemented");
+    assert( false , __FUNCTION__ , "not implemented\n" );
     return 0;
 }

trunk/kernel/fs/vfs.h

@@ -159 +159 @@
 typedef enum   
 {
-    INODE_TYPE_FILE  =     0x001,      /*! file                                          */
-    INODE_TYPE_DIR   =     0x002,      /*! directory                                     */
-    INODE_TYPE_FIFO  =     0x004,      /*! POSIX named pipe                              */
-    INODE_TYPE_PIPE  =     0x008,      /*! POSIX anonymous pipe                          */
-    INODE_TYPE_SOCK  =     0x010,      /*! POSIX socket                                  */
-    INODE_TYPE_DEV   =     0x020,      /*! device channel                                */
-    INODE_TYPE_SYML  =     0x080,      /*! symbolic link                                 */
+    INODE_TYPE_FILE  =     0,           /*! file                                         */
+    INODE_TYPE_DIR   =     1,           /*! directory                                    */
+    INODE_TYPE_FIFO  =     2,           /*! POSIX named pipe                             */
+    INODE_TYPE_PIPE  =     3,           /*! POSIX anonymous pipe                         */
+    INODE_TYPE_SOCK  =     4,           /*! POSIX socket                                 */
+    INODE_TYPE_DEV   =     5,           /*! device channel                               */
+    INODE_TYPE_SYML  =     6,           /*! symbolic link                                */
 }
 vfs_inode_type_t;