Changeset 1055 for Whitix

Timestamp:

10/03/08 12:11:36 (2 months ago)

Author:

mwhitworth

Message:

Add to device layer, add class functions, add start of bus type, add to sdevice impl.

Location:

Whitix/branches/keobject/devices/kedev

Files:

• Makefile (modified) (1 diff)
• class.c (modified) (1 diff)
• device.c (modified) (3 diffs)
• init.c (modified) (1 diff)
• sdevice.c (modified) (10 diffs)

Whitix/branches/keobject/devices/kedev/Makefile

@@ -1 +1 @@
 DEPTH=../../
 
-OBJS = device.o sdevice.o init.o
+OBJS = device.o sdevice.o init.o class.o bus.o
 
 build: $(OBJS)

Whitix/branches/keobject/devices/kedev/class.c

@@ +1 @@
+#include <devices/device.h>
+#include <devices/class.h>
+#include <fs/devfs.h>
+#include <module.h>
+#include <keobject.h>
+
+struct KeSet classRoot;
+
+int DevClassCreate(struct DevClass* devClass, struct KeObjType* type, const char* name, ...)
+{
+        int err;
+        
+        err = KeSetCreate(&devClass->set, &classRoot, type, name);
+        
+        if (err)
+                return err;
+                
+        return DevFsAddDir(&devClass->set, name);
+}
+
+SYMBOL_EXPORT(DevClassCreate);
+
+int ClassInit()
+{
+        /* TODO: Create cache. */
+        
+        KeSetCreate(&classRoot, NULL, NULL, "Devices");
+
+        return 0;
+}

Whitix/branches/keobject/devices/kedev/device.c

@@ -17 +17 @@
  */
 
-#include <device.h>
+#include <devices/device.h>
+#include <fs/devfs.h>
 #include <keobject.h>
+#include <module.h>
 
 /* Set up the structure. */
-int KeDeviceInit(struct KeDevice* device, struct KeSet* type, DevId devId, void* devPriv)
+int KeDeviceInit(struct KeDevice* device, struct KeSet* type, DevId devId,
+        void* devPriv, int devType)
 {
         KeObjectInit(&device->object, type);
@@ -27 +30 @@
         device->devId = devId;
         device->devPriv = devPriv;
+        device->type = devType;
         
         return 0;
 }
 
+SYMBOL_EXPORT(KeDeviceInit);
+
+int KeDeviceVaAttach(struct KeDevice* device, const char* name, VaList args)
+{
+        int err;
+        
+        err = KeObjectVaAttach(&device->object, name, args);
+        
+        if (err)
+                return err;
+                
+        /* Now add the device in the device filesystem. */
+        return DevFsAddDevice(device, KeObjGetName(&device->object));   
+}
+
+SYMBOL_EXPORT(KeDeviceVaAttach);
+
 int KeDeviceAttach(struct KeDevice* device, const char* name, ...)
 {
         int err;
+        VaList args;
         
         /* Bind the KeObject to the filesystem first. This creates a directory
@@ -39 +61 @@
          */
          
-        err = KeObjectAttach(&device->object, name);
+        VaStart(args, name);
         
-        if (err)
-                return err;
-                
-        /* Now add the device in the device filesystem. */
-        return DevFsAddDevice(device, name);
+        err = KeDeviceVaAttach(device, name, args);
+        
+        VaEnd(args);
+        
+        return err;
 }
+
+SYMBOL_EXPORT(KeDeviceAttach);

Whitix/branches/keobject/devices/kedev/init.c

@@ -17 +17 @@
  */
 
-#include <device.h>
-#include <keobject.h>
+int BusInit();
+int ClassInit();
+int StorageInit();
 
 int DeviceInit()
 {
+        ClassInit();
+        BusInit();
+        
         return StorageInit();
 }

Whitix/branches/keobject/devices/kedev/sdevice.c

@@ -17 +17 @@
  */
 
-#include <sdevice.h>
+#include <devices/class.h>
+#include <devices/sdevice.h>
 #include <module.h>
 #include <llist.h>
@@ -29 +30 @@
 #include <print.h>
 #include <fs/config.h>
+#include <fs/devfs.h>
 
 LIST_HEAD(sDeviceList);
@@ -35 +37 @@
 
 struct KeSubsystem storage;
-struct KeSet storageSet;
+struct DevClass storageClass;
 
 int StorageDeviceInit(struct StorageDevice* dev, DevId devId)
@@ -41 +43 @@
         dev->softBlockSize=dev->blockSize;      
         
-        return KeDeviceInit(&dev->device, &storageSet, devId, dev);
+        return KeDeviceInit(&dev->device, &storageClass.set, devId, dev, DEVICE_BLOCK);
 }
 
@@ -62 +64 @@
 int StorageDeviceAdd(struct StorageDevice* dev, const char* name, ...)
 {
-        struct KeObject* object;
-        
-        object=KeSetFind(&storageSet, name);
-        
-        if (object)
-                return -EEXIST;
-
-#if 0
-        if (dev->name)
-        {
-                char buf[255];
-                
-                name=(char*)MemAlloc(strlen(dev->name)+1);
-                strcpy(name,dev->name);
-                dev->name=name;
-                
-                /* Add to the storage directory, along with a list of basic attributes. */
-                sprintf(buf, "Devices/%s", dev->name);
-                
+        int err;
+        VaList args;
+        
+#if 0   
                 ConfigDir* dir=ConfigCreateDir(NULL, buf);
                 
@@ -90 +77 @@
 #endif
 
+        /* General storage device setup. */
         BlockCreateHashTable(dev);
-        
         StorageQueueInit(dev);
-
-        return KeDeviceAttach(&dev->device, name);
+        
+        VaStart(args, name);
+        err = KeDeviceVaAttach(&dev->device, name, args);
+        VaEnd(args);
+        
+        return err;
 }
 
@@ -101 +92 @@
 int StorageSetCreate(struct KeSet* set, struct KeObjType* type, const char* name)
 {
-        return KeSetCreate(set, &storageSet, type, name);
+        return KeSetCreate(set, &storageClass.set, type, name);
 }
 
@@ -154 +145 @@
 /*
  * Always hold a spinlock when dealing with the list, because an irq can alter the list
- * at the end of it's request, causing havoc with ListEmpty etc.
+ * at the end of its request, causing havoc with ListEmpty etc.
  */
 
@@ -247 +238 @@
         root = StorageParseCommandLine(commandLine);
         
-        object = KeSetFind(&storageSet, root);
+        object = KeSetFind(&storageClass.set, root);
         
         if (!object)
@@ -259 +250 @@
 int StorageInit()
 {
-        return KeSetCreate(&storageSet, NULL, NULL, "Storage");
-}
+        return DevClassCreate(&storageClass, NULL, "Storage");
+}