chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] support DRIVER as a rule key
[elogind.git]
/
namedev.h
diff --git
a/namedev.h
b/namedev.h
index 68100d4f62e81271aeb0234d5cac10c990221e85..7a98d66c24ca42c2b5f964c2751c6eac8610ab8d 100644
(file)
--- a/
namedev.h
+++ b/
namedev.h
@@
-28,12
+28,13
@@
struct sysfs_class_device;
struct sysfs_class_device;
-#define BUS_SIZE 30
-#define FILE_SIZE 50
-#define VALUE_SIZE 100
-#define ID_SIZE 50
-#define PLACE_SIZE 50
-#define PROGRAM_SIZE 100
+#define BUS_SIZE 32
+#define FILE_SIZE 64
+#define VALUE_SIZE 128
+#define ID_SIZE 64
+#define PLACE_SIZE 64
+#define DRIVER_SIZE 64
+#define PROGRAM_SIZE 128
#define FIELD_BUS "BUS"
#define FIELD_SYSFS "SYSFS"
#define FIELD_BUS "BUS"
#define FIELD_SYSFS "SYSFS"
@@
-42,6
+43,8
@@
struct sysfs_class_device;
#define FIELD_PROGRAM "PROGRAM"
#define FIELD_RESULT "RESULT"
#define FIELD_KERNEL "KERNEL"
#define FIELD_PROGRAM "PROGRAM"
#define FIELD_RESULT "RESULT"
#define FIELD_KERNEL "KERNEL"
+#define FIELD_SUBSYSTEM "SUBSYSTEM"
+#define FIELD_DRIVER "DRIVER"
#define FIELD_NAME "NAME"
#define FIELD_SYMLINK "SYMLINK"
#define FIELD_OWNER "OWNER"
#define FIELD_NAME "NAME"
#define FIELD_SYMLINK "SYMLINK"
#define FIELD_OWNER "OWNER"
@@
-53,8
+56,8
@@
struct sysfs_class_device;
#define MAX_SYSFS_PAIRS 5
#define MAX_SYSFS_PAIRS 5
-#define RULEFILE_
EXT
".rules"
-#define PERMFILE_
EXT
".permissions"
+#define RULEFILE_
SUFFIX
".rules"
+#define PERMFILE_
SUFFIX
".permissions"
#define set_empty_perms(dev, m, o, g) \
if (dev->mode == 0) \
#define set_empty_perms(dev, m, o, g) \
if (dev->mode == 0) \
@@
-78,6
+81,8
@@
struct config_device {
char kernel[NAME_SIZE];
char program[PROGRAM_SIZE];
char result[PROGRAM_SIZE];
char kernel[NAME_SIZE];
char program[PROGRAM_SIZE];
char result[PROGRAM_SIZE];
+ char subsystem[SUBSYSTEM_SIZE];
+ char driver[DRIVER_SIZE];
char name[NAME_SIZE];
char symlink[NAME_SIZE];
struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
char name[NAME_SIZE];
char symlink[NAME_SIZE];
struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
@@
-102,7
+107,7
@@
extern struct list_head config_device_list;
extern struct list_head perm_device_list;
extern int namedev_init(void);
extern struct list_head perm_device_list;
extern int namedev_init(void);
-extern int namedev_name_device(struct
sysfs_class_device *class_dev, struct udevice *
dev);
+extern int namedev_name_device(struct
udevice *udev, struct sysfs_class_device *class_
dev);
extern int namedev_init_permissions(void);
extern int namedev_init_rules(void);
extern int namedev_init_permissions(void);
extern int namedev_init_rules(void);