Changeset 1055 for Whitix/branches/keobject/devices/kedev/device.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/device.c (modified) (3 diffs)

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);