Changeset 2005 for Whitix/trunk

Timestamp:

04/02/09 21:11:33 (3 years ago)

Author:

mwhitworth

Message:

Add support for function entries in IcAttributes, add IC_FUNC define.

Files:

• Whitix/trunk/include/fs/icfs.h (modified) (7 diffs)

Whitix/trunk/include/fs/icfs.h

@@ -28 +28 @@
 #define ICFS_TYPE_FUNC  3
 
+typedef int (*IcReadFunc)(BYTE* data, unsigned long size, DWORD position);
+typedef int (*IcWriteFunc)(BYTE* data, unsigned long size, DWORD position);
+
+struct IcFuncEntry
+{
+        IcReadFunc readFunc;
+        IcWriteFunc writeFunc;
+};
+
 #define IC_READ         0
 #define IC_RW           1
@@ -35 +44 @@
 struct IcAttribute
 {
-        int type, offset, perms;
+        int type;
+
+        IcReadFunc readFunc;
+        IcWriteFunc writeFunc;
+                
+        int offset;
+        int perms;
+        
         const char* name;
 };
-
-typedef int (*IcReadFunc)(BYTE* data, unsigned long size, DWORD position);
-typedef int (*IcWriteFunc)(BYTE* data, unsigned long size, DWORD position);
 
 #define IC_INT(structure, member, permissions) \
@@ -49 +62 @@
           .perms = permissions \
         }
-
+        
+#define IC_INT_NAME(objName, structure, member, permissions) \
+        { \
+          .type = ICFS_TYPE_INT, \
+          .offset = OffsetOf(structure, member), \
+          .name = objName, \
+          .perms = permissions \
+        }
+        
 #define IC_STRING(structure, member, permissions) \
         { \
@@ -61 +82 @@
         { \
                 .type = ICFS_TYPE_STR, \
-                .offset = OffsetOf(structure, member), \
+                .offset = OffsetOf(structure, member) \
                 .name = objName, \
                 .perms = permissions, \
         }
         
+#define IC_FUNC(objName, funcRead, funcWrite) \
+        { \
+                .type = ICFS_TYPE_FUNC, \
+                .readFunc = funcRead, \
+                .writeFunc = funcWrite, \
+                .name = objName, \
+        }
+        
 #define IC_END() \
-        { -1, -1, -1, NULL }
+        { -1, NULL, NULL, -1, -1, NULL }
 
 struct IcFsEntry
@@ -75 +104 @@
         {
                 int* iVal;
-                char* sVal;
+                char** sVal;
                 
+                /* Array entries. */
                 struct
                 {
@@ -83 +113 @@
                 };
                 
-                struct
-                {
-                        IcReadFunc readFunc;
-                        IcWriteFunc writeFunc;
-                };
+                /* Function entries. */
+                struct IcFuncEntry entry;
         };
 };
@@ -96 +123 @@
 int IcFsAddIntEntry(struct KeFsEntry* dir, char* name, int* value, DWORD permissions);
 
-struct IcFsEntry* IcFsAddStrEntry(struct KeFsEntry* dir, char* name, char* str, DWORD permissions);
+struct IcFsEntry* IcFsAddStrEntry(struct KeFsEntry* dir, char* name, char** str, DWORD permissions);
 
 int IcFsAddArrayEntry(struct KeFsEntry* dir, char* name, char* array, unsigned int minLen, unsigned int maxLen, unsigned int size);