Changeset 1055 for Whitix/branches/keobject/devices/kedev/sdevice.c

Timestamp:

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

Author:

mwhitworth

Message:

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

Files:

• Whitix/branches/keobject/devices/kedev/sdevice.c (modified) (10 diffs)

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");
+}