Changeset 863

Timestamp:

09/01/08 18:26:21 (3 years ago)

Author:

mwhitworth

Message:

Write basic configfs functions, including SysConfRead and SysConfWrite.

Files:

• Whitix/trunk/fs/infofs/config.c (modified) (3 diffs)

Whitix/trunk/fs/infofs/config.c

@@ -6 +6 @@
 #include <fs/icfs.h>
 #include <fs/vfs.h>
+#include <sys.h>
 
 static struct KeFsEntry root;
+
+int ConfigAddIntEntry(struct KeFsEntry* dir, char* name, int* value)
+{
+        return IcFsAddIntEntry(&root, dir, name, value);
+}
+
+SYMBOL_EXPORT(ConfigAddIntEntry);
+
+int ConfigAddArrayEntry(struct KeFsEntry* dir, char* name, BYTE* value, int minLen, int maxLen, int size)
+{
+        /* TODO: Create general IcFs function. */
+        struct IcFsEntry* entry;
+        
+        entry=IcFsAddStrEntry(&root, dir, name, value);
+        
+        if (!entry)
+                return -EINVAL;
+        
+        entry->type=ICFS_TYPE_BYTE;
+        entry->minLen=minLen;
+        entry->maxLen=maxLen;
+        entry->size=size;
+        
+        return 0;
+}
+
+SYMBOL_EXPORT(ConfigAddArrayEntry);
+
+int ConfigAddSoftLink(struct KeFsEntry* dir, char* name, int (*followLink)(char* buffer, int size))
+{
+        return IcFsAddSoftLink(&root, dir, name, followLink);
+}
+
+SYMBOL_EXPORT(ConfigAddSoftLink);
+
+struct KeFsEntry* ConfigCreateDir(struct KeFsEntry* dir, char* name)
+{
+        return IcFsCreateDir(&root, dir, name);
+}
+
+SYMBOL_EXPORT(ConfigCreateDir);
 
 DWORD ConfigGetRootId()
@@ -13 +55 @@
         return (DWORD)&root;
 }
+
+SYMBOL_EXPORT(ConfigGetRootId);
 
 int ConfigRootCreate()
@@ -21 +65 @@
 }
 
+struct KeFsEntry* ConfigResolvePath(char* name)
+{
+        /* Parse name. */
+        struct KeFsRoot* currNode=&root;
+        struct KeFsDir* dir;
+        struct KeFsEntry* entry;
+        
+        if (name[0] == '/')
+                name++;
+        
+        dir=KeFsNameToDir(&root.dir, &name);
+        
+        if (!dir)
+                return NULL;
+
+        entry=KeFsLookupDir(dir, name, strlen(name));
+        
+        if (!entry)
+                return NULL;
+        
+        /* Handle symlinks in KeFsLookupDir? */
+        if (!(entry->type & VFS_ATTR_FILE))
+                return NULL;
+                
+        return entry;
+}
+
+int SysConfRead(char* name, BYTE* data, int size)
+{
+        struct KeFsEntry* entry;
+        int position=0;
+        
+        entry=ConfigResolvePath(name);
+        
+        IcRead(&position, entry->file, data, size);
+        
+        return 0;
+}
+
+int SysConfWrite(char* name, BYTE* data, int size)
+{
+        struct KeFsEntry* entry;
+        int position=0;
+        
+        entry=ConfigResolvePath(name);
+        
+//      KePrint("data = %#X, size = %d\n", data, size);
+        
+        IcWrite(&position, entry->file, data, size);
+        
+        return 0;
+}
+
+struct SysCall configSystemCalls[]=
+{
+        SysEntry(SysConfRead, 12),
+        SysEntry(SysConfWrite, 12),
+        SysEntryEnd()
+};
+
 int ConfigInit()
 {
         ConfigRootCreate();
+        
+        /* Create standard directories */
+        ConfigCreateDir(NULL, "Devices");
+        ConfigCreateDir(NULL, "Devices/Storage");
+        
+        /* Register the ReadConf and WriteConf system calls, for quick access to configuration variables. */
+        SysRegisterRange(SYS_CONFIG_BASE, configSystemCalls);
+        
         return 0;
 }