X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.h;h=d681ad5613a92c4af782d5243a2c6b78e454bfac;hp=95a2b88f5ee10266c8d801696dc40cd1f58187f6;hb=220dac4c5eb3d82b5473c7532eb731df184e11f7;hpb=989e081131f25b24da26ca94f0494ca756389867 diff --git a/udev.h b/udev.h index 95a2b88f5..d681ad561 100644 --- a/udev.h +++ b/udev.h @@ -27,7 +27,7 @@ #include "list.h" #include "logging.h" -#include "udev_libc_wrapper.h" +#include "udev_sysdeps.h" #include "udev_version.h" #define COMMENT_CHARACTER '#' @@ -54,8 +54,8 @@ struct sysfs_device { struct list_head node; /* for device cache */ struct sysfs_device *parent; /* already cached parent*/ char devpath[PATH_SIZE]; - char subsystem[NAME_SIZE]; /* $class/$bus/"drivers" */ - char kernel_name[NAME_SIZE]; /* device instance name */ + char subsystem[NAME_SIZE]; /* $class, $bus, drivers, module */ + char kernel[NAME_SIZE]; /* device instance name */ char kernel_number[NAME_SIZE]; char driver[NAME_SIZE]; /* device driver name */ }; @@ -109,7 +109,8 @@ extern dev_t udev_device_get_devt(struct udevice *udev); extern char sysfs_path[PATH_SIZE]; extern int sysfs_init(void); extern void sysfs_cleanup(void); -extern void sysfs_device_set_values(struct sysfs_device *dev, const char *devpath, const char *subsystem); +extern void sysfs_device_set_values(struct sysfs_device *dev, const char *devpath, + const char *subsystem, const char *driver); extern struct sysfs_device *sysfs_device_get(const char *devpath); extern struct sysfs_device *sysfs_device_get_parent(struct sysfs_device *dev); extern struct sysfs_device *sysfs_device_get_parent_with_subsystem(struct sysfs_device *dev, const char *subsystem);