X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/a5338b60e111972364a8bc6f07011c6defd213d2..a9cfeffd21239290ab1da46a952fe5789ae3f6de:/lunaix-os/includes/lunaix/device.h

diff --git a/lunaix-os/includes/lunaix/device.h b/lunaix-os/includes/lunaix/device.h
index 08d25c4..ee56b1d 100644
--- a/lunaix-os/includes/lunaix/device.h
+++ b/lunaix-os/includes/lunaix/device.h
@@ -5,27 +5,42 @@
 
 #include <lunaix/ds/hstr.h>
 #include <lunaix/ds/llist.h>
+#include <lunaix/types.h>
+
+#define DEV_STRUCT_MAGIC 0x5645444c
+
+#define DEV_MSKIF 0x00000003
+
+#define DEV_IFVOL 0x0 // volumetric (block) device
+#define DEV_IFSEQ 0x1 // sequential (character) device
+#define DEV_IFCAT 0x2 // a device category (as device groupping)
+
+typedef unsigned int dev_t;
 
 struct device
 {
-    struct llist_header dev_list;
+    u32_t magic;
+    struct llist_header siblings;
+    struct llist_header children;
     struct device* parent;
     struct hstr name;
+    dev_t dev_id;
+    int dev_type;
     char name_val[DEVICE_NAME_SIZE];
     void* underlay;
-    void* fs_node;
-    int (*read)(struct device* dev,
-                void* buf,
-                unsigned int offset,
-                unsigned int len);
-    int (*write)(struct device* dev,
-                 void* buf,
-                 unsigned int offset,
-                 unsigned int len);
+    int (*read)(struct device* dev, void* buf, size_t offset, size_t len);
+    int (*write)(struct device* dev, void* buf, size_t offset, size_t len);
+    int (*read_page)(struct device* dev, void* buf, size_t offset);
+    int (*write_page)(struct device* dev, void* buf, size_t offset);
+    int (*exec_cmd)(struct device* dev, u32_t req, va_list args);
 };
 
-void
-device_init();
+struct device*
+device_add(struct device* parent,
+           void* underlay,
+           char* name_fmt,
+           u32_t type,
+           va_list args);
 
 struct device*
 device_addseq(struct device* parent, void* underlay, char* name_fmt, ...);
@@ -33,7 +48,25 @@ device_addseq(struct device* parent, void* underlay, char* name_fmt, ...);
 struct device*
 device_addvol(struct device* parent, void* underlay, char* name_fmt, ...);
 
+struct device*
+device_addcat(struct device* parent, char* name_fmt, ...);
+
 void
 device_remove(struct device* dev);
 
+struct device*
+device_getbyid(struct llist_header* devlist, dev_t id);
+
+struct device*
+device_getbyhname(struct device* root_dev, struct hstr* name);
+
+struct device*
+device_getbyname(struct device* root_dev, const char* name, size_t len);
+
+struct device*
+device_getbyoffset(struct device* root_dev, int pos);
+
+void
+device_init_builtin();
+
 #endif /* __LUNAIX_DEVICE_H */