[PATCH] another patch for path problem

[elogind.git] / libsysfs / libsysfs.h

diff --git a/libsysfs/libsysfs.h b/libsysfs/libsysfs.h
index ccb9898cb534e27484a4aecce4a85cef04a8105e..6d8e58de21ec4235920d0d7f52b9a147e388aeae 100644 (file)
--- a/libsysfs/libsysfs.h
+++ b/libsysfs/libsysfs.h
@@ -32,18 +32,18 @@
 #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"
-
-/* Some "block" subsystem specific #defines */
-#define SYSFS_QUEUE_NAME       "queue"
-#define SYSFS_IOSCHED_NAME     "iosched"
+#define SYSFS_PATH_ENV         "SYSFS_PATH"
 
 #define SYSFS_PATH_MAX         255
 #define        SYSFS_NAME_LEN          50
@@ -88,8 +88,9 @@ struct sysfs_device {
        struct dlist *children; 
        unsigned char name[SYSFS_NAME_LEN];
        unsigned char bus_id[SYSFS_NAME_LEN];
-       unsigned char path[SYSFS_PATH_MAX];
+       unsigned char bus[SYSFS_NAME_LEN];
        unsigned char driver_name[SYSFS_NAME_LEN];
+       unsigned char path[SYSFS_PATH_MAX];
 
        /* for internal use only */
        struct sysfs_directory *directory;      
@@ -118,6 +119,7 @@ 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 */
@@ -140,6 +142,7 @@ extern "C" {
 /*
  * Function Prototypes
  */
+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);
@@ -184,10 +187,8 @@ 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 int sysfs_write_driver_attr(unsigned char *drv, unsigned char *attrib,
-                               unsigned char *value, size_t len);
-extern int sysfs_read_driver_attr(unsigned char *drv, unsigned char *attrib,
-                               unsigned char *value, size_t len);
+extern struct sysfs_attribute *sysfs_open_driver_attr(const unsigned char *bus, 
+               const unsigned char *drv, const unsigned char *attrib);
 
 /* generic sysfs device access */
 extern void sysfs_close_root_device(struct sysfs_root_device *root);
@@ -200,10 +201,8 @@ extern struct sysfs_attribute *sysfs_get_device_attr
 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);
-extern int sysfs_write_device_attr(unsigned char *dev, unsigned char *attrib,
-                               unsigned char *value, size_t len);
-extern int sysfs_read_device_attr(unsigned char *dev, unsigned char *attrib,
-                               unsigned char *value, size_t len);
+extern struct sysfs_attribute *sysfs_open_device_attr(const unsigned char *bus, 
+               const unsigned char *bus_id, const unsigned char *attrib);
 
 /* generic sysfs bus access */
 extern void sysfs_close_bus(struct sysfs_bus *bus);
@@ -217,8 +216,6 @@ extern struct sysfs_attribute *sysfs_get_bus_attribute(struct sysfs_bus *bus,
                                                unsigned char *attrname);
 extern struct sysfs_device *sysfs_open_bus_device(unsigned char *busname, 
                                                        unsigned char *dev_id);
-extern int sysfs_find_device_bus(const unsigned char *dev_id, 
-                                       unsigned char *busname, size_t bsize);
 extern int sysfs_find_driver_bus(const unsigned char *driver, 
                                        unsigned char *busname, size_t bsize);
 
@@ -231,17 +228,14 @@ extern struct sysfs_class *sysfs_open_class(const unsigned char *name);
 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
-       (const unsigned char *class, unsigned char *name);
+       (const unsigned char *class, const unsigned char *name);
 extern struct dlist *sysfs_get_classdev_attributes
        (struct sysfs_class_device *cdev);
-extern int sysfs_find_device_class(const unsigned char *bus_id, 
-               unsigned char *classname, size_t bsize);
 extern struct sysfs_attribute *sysfs_get_classdev_attr
        (struct sysfs_class_device *clsdev, const unsigned char *name);
-extern int sysfs_write_classdev_attr(unsigned char *dev, unsigned char *attrib, 
-               unsigned char *value, size_t len);
-extern int sysfs_read_classdev_attr(unsigned char *dev, unsigned char *attrib, 
-               unsigned char *value, size_t len);
+extern struct sysfs_attribute *sysfs_open_classdev_attr
+       (const unsigned char *classname, const unsigned char *dev, 
+                                               const unsigned char *attrib); 
 
 #ifdef __cplusplus
 }