[PATCH] pre-libsysfs-0.4.0 patch

[elogind.git] / libsysfs / libsysfs.h

diff --git a/libsysfs/libsysfs.h b/libsysfs/libsysfs.h
index 6d8e58de21ec4235920d0d7f52b9a147e388aeae..aca25772b505729bd998d1a0388a211e9c864dac 100644 (file)
--- a/libsysfs/libsysfs.h
+++ b/libsysfs/libsysfs.h
@@ -31,15 +31,10 @@
  */ 
 #define SYSFS_FSTYPE_NAME      "sysfs"
 #define SYSFS_PROC_MNTS                "/proc/mounts"
-#define SYSFS_BUS_DIR          "/bus"
 #define SYSFS_BUS_NAME         "bus"
-#define SYSFS_CLASS_DIR                "/class"
 #define SYSFS_CLASS_NAME       "class"
-#define SYSFS_BLOCK_DIR                "/block"
 #define SYSFS_BLOCK_NAME       "block"
-#define SYSFS_DEVICES_DIR      "/devices"
 #define SYSFS_DEVICES_NAME     "devices"
-#define SYSFS_DRIVERS_DIR      "/drivers"
 #define SYSFS_DRIVERS_NAME     "drivers"
 #define SYSFS_NAME_ATTRIBUTE   "name"
 #define SYSFS_UNKNOWN          "unknown"
@@ -75,17 +70,15 @@ struct sysfs_directory {
 };
 
 struct sysfs_driver {
-       struct dlist *devices;
        unsigned char name[SYSFS_NAME_LEN];
        unsigned char path[SYSFS_PATH_MAX];
 
        /* for internal use only */
+       struct dlist *devices;
        struct sysfs_directory *directory;      
 };
 
 struct sysfs_device {
-       struct sysfs_device *parent;            
-       struct dlist *children; 
        unsigned char name[SYSFS_NAME_LEN];
        unsigned char bus_id[SYSFS_NAME_LEN];
        unsigned char bus[SYSFS_NAME_LEN];
@@ -93,45 +86,48 @@ struct sysfs_device {
        unsigned char path[SYSFS_PATH_MAX];
 
        /* for internal use only */
+       struct sysfs_device *parent;            
+       struct dlist *children; 
        struct sysfs_directory *directory;      
 };
 
 struct sysfs_root_device {
-       struct dlist *devices;
        unsigned char name[SYSFS_NAME_LEN];
        unsigned char path[SYSFS_PATH_MAX];
 
        /* for internal use only */
+       struct dlist *devices;
        struct sysfs_directory *directory;
 };
 
 struct sysfs_bus {
-       struct dlist *drivers;
-       struct dlist *devices;
        unsigned char name[SYSFS_NAME_LEN];
        unsigned char path[SYSFS_PATH_MAX];
 
        /* internal use only */
+       struct dlist *drivers;
+       struct dlist *devices;
        struct sysfs_directory *directory;      
 };
 
 struct sysfs_class_device {
-       struct sysfs_device *sysdevice;         /* NULL if virtual */
-       struct sysfs_driver *driver;            /* NULL if not implemented */
        unsigned char name[SYSFS_NAME_LEN];
        unsigned char classname[SYSFS_NAME_LEN];
        unsigned char path[SYSFS_PATH_MAX];
 
        /* for internal use only */
+       struct sysfs_class_device *parent;      
+       struct sysfs_device *sysdevice;         /* NULL if virtual */
+       struct sysfs_driver *driver;            /* NULL if not implemented */
        struct sysfs_directory *directory;      
 };
 
 struct sysfs_class {
-       struct dlist *devices;
        unsigned char name[SYSFS_NAME_LEN];
        unsigned char path[SYSFS_PATH_MAX];
 
        /* for internal use only */
+       struct dlist *devices;
        struct sysfs_directory *directory;      
 };
 
@@ -146,6 +142,9 @@ extern int sysfs_trailing_slash(unsigned char *path);
 extern int sysfs_get_mnt_path(unsigned char *mnt_path, size_t len);
 extern int sysfs_get_name_from_path(const unsigned char *path, 
                                        unsigned char *name, size_t len);
+extern int sysfs_path_is_dir(const unsigned char *path);
+extern int sysfs_path_is_link(const unsigned char *path);
+extern int sysfs_path_is_file(const unsigned char *path);
 extern int sysfs_get_link(const unsigned char *path, unsigned char *target, 
                                                                size_t len);
 extern struct dlist *sysfs_open_subsystem_list(unsigned char *name);
@@ -162,8 +161,12 @@ extern int sysfs_write_attribute(struct sysfs_attribute *sysattr,
                const unsigned char *new_value, size_t len);
 extern unsigned char *sysfs_get_value_from_attributes(struct dlist *attr, 
                                                const unsigned char * name);
+extern int sysfs_refresh_attributes(struct dlist *attrlist);
 extern void sysfs_close_directory(struct sysfs_directory *sysdir);
 extern struct sysfs_directory *sysfs_open_directory(const unsigned char *path);
+extern int sysfs_read_dir_attributes(struct sysfs_directory *sysdir);
+extern int sysfs_read_dir_links(struct sysfs_directory *sysdir);
+extern int sysfs_read_dir_subdirs(struct sysfs_directory *sysdir);
 extern int sysfs_read_directory(struct sysfs_directory *sysdir);
 extern int sysfs_read_all_subdirs(struct sysfs_directory *sysdir);
 extern struct sysfs_directory *sysfs_get_subdirectory
@@ -183,10 +186,10 @@ extern struct sysfs_driver *sysfs_open_driver(const unsigned char *path);
 extern struct sysfs_attribute *sysfs_get_driver_attr
                (struct sysfs_driver *drv, const unsigned char *name);
 extern struct dlist *sysfs_get_driver_attributes(struct sysfs_driver *driver);
+extern struct dlist *sysfs_get_driver_devices(struct sysfs_driver *driver);
 extern struct dlist *sysfs_get_driver_links(struct sysfs_driver *driver);
-extern void sysfs_close_driver_by_name(struct sysfs_driver *driver);
-extern struct sysfs_driver *sysfs_open_driver_by_name
-       (const unsigned char *drv_name, const unsigned char *bus, size_t bsize);
+extern struct sysfs_device *sysfs_get_driver_device
+       (struct sysfs_driver *driver, const unsigned char *name);
 extern struct sysfs_attribute *sysfs_open_driver_attr(const unsigned char *bus, 
                const unsigned char *drv, const unsigned char *attrib);
 
@@ -194,13 +197,14 @@ extern struct sysfs_attribute *sysfs_open_driver_attr(const unsigned char *bus,
 extern void sysfs_close_root_device(struct sysfs_root_device *root);
 extern struct sysfs_root_device *sysfs_open_root_device
                                                (const unsigned char *name);
+extern struct dlist *sysfs_get_root_devices(struct sysfs_root_device *root);
 extern void sysfs_close_device(struct sysfs_device *dev);
 extern struct sysfs_device *sysfs_open_device(const unsigned char *path);
 extern struct sysfs_attribute *sysfs_get_device_attr
                        (struct sysfs_device *dev, const unsigned char *name);
 extern struct dlist *sysfs_get_device_attributes(struct sysfs_device *device);
 extern struct sysfs_device *sysfs_open_device_by_id
-       (const unsigned char *bus_id, const unsigned char *bus, size_t bsize);
+               (const unsigned char *bus_id, const unsigned char *bus);
 extern struct sysfs_attribute *sysfs_open_device_attr(const unsigned char *bus, 
                const unsigned char *bus_id, const unsigned char *attrib);
 
@@ -211,6 +215,8 @@ extern struct sysfs_device *sysfs_get_bus_device(struct sysfs_bus *bus,
                                                unsigned char *id);
 extern struct sysfs_driver *sysfs_get_bus_driver(struct sysfs_bus *bus,
                                                unsigned char *drvname);
+extern struct dlist *sysfs_get_bus_drivers(struct sysfs_bus *bus);
+extern struct dlist *sysfs_get_bus_devices(struct sysfs_bus *bus);
 extern struct dlist *sysfs_get_bus_attributes(struct sysfs_bus *bus);
 extern struct sysfs_attribute *sysfs_get_bus_attribute(struct sysfs_bus *bus,
                                                unsigned char *attrname);
@@ -223,8 +229,15 @@ extern int sysfs_find_driver_bus(const unsigned char *driver,
 extern void sysfs_close_class_device(struct sysfs_class_device *dev);
 extern struct sysfs_class_device *sysfs_open_class_device
                                        (const unsigned char *path);
+extern struct sysfs_device *sysfs_get_classdev_device
+                               (struct sysfs_class_device *clsdev);
+extern struct sysfs_driver *sysfs_get_classdev_driver
+                               (struct sysfs_class_device *clsdev);
+extern struct sysfs_class_device *sysfs_get_classdev_parent
+                               (struct sysfs_class_device *clsdev);
 extern void sysfs_close_class(struct sysfs_class *cls);
 extern struct sysfs_class *sysfs_open_class(const unsigned char *name);
+extern struct dlist *sysfs_get_class_devices(struct sysfs_class *cls);
 extern struct sysfs_class_device *sysfs_get_class_device
        (struct sysfs_class *class, unsigned char *name);
 extern struct sysfs_class_device *sysfs_open_class_device_by_name