Changeset 1080 for Whitix/branches/keobject/video/console.c

Timestamp:

10/04/08 14:14:25 (3 months ago)

Author:

mwhitworth

Message:

Add IcFs entries (in a manual fashion temporarily), add SoftLink code.

Files:

• Whitix/branches/keobject/video/console.c (modified) (2 diffs)

Whitix/branches/keobject/video/console.c

@@ -643 +643 @@
 };
 
-#if 0
-int ConsoleGetCurrentName(char* buf, int size)
-{
-        struct File* file=&current->files[0];
-        int index=DEV_ID_MINOR(file->vNode->devId);
-        
-        /* FIXME: Check if device is actually open! */
-        
-        sprintf(buf, "Console%d", index);
-        
-        return 0;       
-}
-#endif
+int ConsoleGetCurrent(struct KeFsEntry** dest, struct KeFsEntry* src)
+{
+        struct VNode* vNode = current->files[0].vNode;
+        struct KeFsEntry* entry = (struct KeFsEntry*)vNode->id;
+        struct KeObject* object = (struct KeObject*)entry->file;
+        
+        *dest = object->dir;
+        
+        return 0;
+}
 
 void ConsoleAddKeyDev()
@@ -693 +690 @@
                 consoles[i].currX=consoles[i].currY=0;
                 consoles[i].head=consoles[i].tail=0;
-
-#if 0           
+        
                 /* Register each console's configuration options. */
-                dir=ConfigCreateDir(NULL, buf);
+                struct KeFsEntry* dir=KeDeviceGetConfDir(&curr->device);
                 
-                ConfigAddIntEntry(dir, "flags", &consoles[i].flags);
-                ConfigAddIntEntry(dir, "rows", &rows); /* TODO: Read-only. Info entry */
-                ConfigAddIntEntry(dir, "cols", &cols);
-                ConfigAddIntEntry(dir, "cursorRow", &consoles[i].currY);
-                ConfigAddIntEntry(dir, "cursorCol", &consoles[i].currX);
-#endif
+                IcFsAddIntEntry(dir, "flags", &consoles[i].flags, VFS_ATTR_RW);
+                IcFsAddIntEntry(dir, "rows", &rows, VFS_ATTR_READ);
+                IcFsAddIntEntry(dir, "cols", &cols, VFS_ATTR_READ);
+                IcFsAddIntEntry(dir, "cursorRow", &consoles[i].currY, VFS_ATTR_RW);
+                IcFsAddIntEntry(dir, "cursorCol", &consoles[i].currX, VFS_ATTR_RW);
         }
         
         /* Add a symbolic link for the current console used by the process. */
-//      ConfigAddSoftLink(DevClassGetDir(&consoleClass), "currConsole", ConsoleGetCurrent);
+        IcFsAddSoftLink(DevClassGetDir(&consoleClass), "currConsole", ConsoleGetCurrent);
 }