Changeset 1063 for Whitix/branches/keobject/fs/devfs/devfs.c

Timestamp:

10/03/08 12:21:41 (3 months ago)

Author:

mwhitworth

Message:

Remove DevAddDevice, add new DevFs* functions that deal with KeDevices.

Files:

• Whitix/branches/keobject/fs/devfs/devfs.c (modified) (7 diffs)

Whitix/branches/keobject/fs/devfs/devfs.c

@@ -35 +35 @@
 #include <fs/kfs.h>
 #include <print.h>
+#include <panic.h>
 
 /* Root directory of the device filesystem. */
@@ -117 +118 @@
 {
         struct KeFsEntry* entry=(struct KeFsEntry*)(vNode->id);
-        struct DevFsDevice* device;
+        struct KeDevice* device;
         struct StorageDevice* sDevice;
         
@@ -126 +127 @@
         {
                 vNode->mode |= VFS_ATTR_FILE;
-                device=(struct DevFsDevice*)entry->file;
+                device=(struct KeDevice*)entry->file;
                 vNode->devId = device->devId;
-                if (entry->type & DEVICE_BLOCK)
+                
+                if (device->type == DEVICE_BLOCK)
                 {
                         vNode->fileOps=&devFsBlockOps;
@@ -136 +138 @@
                         sDevice=(struct StorageDevice*)DeviceGetOps(vNode);
                         vNode->size=sDevice->blockSize*sDevice->totalSectors;
-                }else if (entry->type & DEVICE_CHAR)
+                }else if (device->type == DEVICE_CHAR)
                 {
                         vNode->mode |= VFS_ATTR_CHAR;
                         /* Just redirect to the usual char devices */
-                        vNode->fileOps=device->ops;
+                        vNode->fileOps=device->fileOps;
                         vNode->size=0;
-                }
+                }else
+                        KernelPanic("DevFs file is neither a block nor a character device");
         }else if (entry->type & VFS_ATTR_DIR)
         {
@@ -153 +156 @@
 }
 
-int DevAddDevice(char* name, WORD major, WORD minor, int type, void* ops)
-{
-        struct KeFsDir* dir=rootDir;
-        struct KeFsEntry* entry;
-        struct DevFsDevice* device;
-
-        /* Sanity checks */
-        if (!name || !ops)
-                return -EFAULT;
-
-        if (!major)
-                return -EINVAL;
-        
-        entry=KeFsAddEntry(dir, name, VFS_ATTR_RW);
-        
-        if (!entry)
-                return -EFAULT;
-
-        device=(struct DevFsDevice*)MemAlloc(sizeof(struct DevFsDevice));
-        
-        device->ops=ops;
-        device->devId = DEV_ID_MAKE(major, minor);
-        entry->file=device;
-        
-        entry->type |= type;
-
-        return 0;
-}
-
-SYMBOL_EXPORT(DevAddDevice);
-
 int DevFsAddDevice(struct KeDevice* device, const char* name)
 {
-        struct KeSet* parent;
         struct KeFsDir* dir;
         struct KeFsEntry* entry;
         
         dir = KeObjGetParentDevDir(&device->object);
-
+        
         if (!dir)
-                dir = rootDir;  
-        
-        entry = KeFsAddEntry(dir, name, VFS_ATTR_RW);
+                dir = rootDir;
+        
+        entry = KeFsAddEntry(dir, (char*)name, VFS_ATTR_RW);
         
         if (!entry)
@@ -208 +179 @@
 SYMBOL_EXPORT(DevFsAddDevice);
 
-int DevAddDir(char* name)
-{
-        char* endName;
-        DWORD offset;   
-        struct KeFsDir* dir=rootDir;
-        
-        /* Get to the directory */
-        while ((endName=strchr(name,'/')))
-        {
-                offset=(DWORD)(endName-name);
-                dir=KeFsDirLookup(name, strlen(name),dir);
-                if (!dir)
-                        return -ENOENT;
-        }
-        
-        KeFsAddDir(dir, name);
-        
-        return 0;
-}
-
-int DevRemoveDevice(struct DevFsDevice* device)
-{
-        KePrint("DevRemoveDevice\n");
-        return 0;
-}
+int DevFsAddDir(struct KeSet* set, char* name)
+{
+        struct KeFsDir* dir;
+        
+        dir = KeObjGetParentDevDir(&set->object);
+        
+        if (!dir)
+                dir = rootDir;
+        
+        set->devDir = KeFsAddDir(dir, name);
+        
+        return 0;
+}
+
+SYMBOL_EXPORT(DevFsAddDir);
 
 int DevFsReadDir(struct File* file, void* dirEntries)
@@ -306 +267 @@
         rootDir=&rootEntry.dir;
 
-        /* Add standard directories */
-        DevAddDir("Consoles");
-        DevAddDir("Special");
-        DevAddDir("Storage");
-        DevAddDir("Input");
-
-        return 0;
-}
+        return 0;
+}