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] move the signal handling registration to after we have initialized enough...
[elogind.git]
/
namedev.h
diff --git
a/namedev.h
b/namedev.h
index 1405d07e04ea8a301b9649a6ae11f5a86a330145..1ac71069ad219784d8c227610a7e911e1329a826 100644
(file)
--- a/
namedev.h
+++ b/
namedev.h
@@
-28,7
+28,6
@@
struct sysfs_class_device;
struct sysfs_class_device;
-#define COMMENT_CHARACTER '#'
enum config_type {
KERNEL_NAME = 0, /* must be 0 to let memset() default to this value */
enum config_type {
KERNEL_NAME = 0, /* must be 0 to let memset() default to this value */
@@
-44,27
+43,48
@@
enum config_type {
#define VALUE_SIZE 100
#define ID_SIZE 50
#define PLACE_SIZE 50
#define VALUE_SIZE 100
#define ID_SIZE 50
#define PLACE_SIZE 50
+#define PROGRAM_SIZE 100
#define TYPE_LABEL "LABEL"
#define TYPE_NUMBER "NUMBER"
#define TYPE_TOPOLOGY "TOPOLOGY"
#define TYPE_REPLACE "REPLACE"
#define TYPE_CALLOUT "CALLOUT"
#define TYPE_LABEL "LABEL"
#define TYPE_NUMBER "NUMBER"
#define TYPE_TOPOLOGY "TOPOLOGY"
#define TYPE_REPLACE "REPLACE"
#define TYPE_CALLOUT "CALLOUT"
+
+#define FIELD_BUS "BUS"
+#define FIELD_ID "ID"
+#define FIELD_SYSFS "SYSFS_"
+#define FIELD_PLACE "PLACE"
+#define FIELD_PROGRAM "PROGRAM"
+#define FIELD_KERNEL "KERNEL"
+#define FIELD_NAME "NAME"
+#define FIELD_SYMLINK "SYMLINK"
+
#define CALLOUT_MAXARG 8
#define CALLOUT_MAXARG 8
+#define MAX_SYSFS_PAIRS 5
+
+struct sysfs_pair {
+ char file[FILE_SIZE];
+ char value[VALUE_SIZE];
+};
struct config_device {
struct list_head node;
enum config_type type;
char bus[BUS_SIZE];
struct config_device {
struct list_head node;
enum config_type type;
char bus[BUS_SIZE];
- char sysfs_file[FILE_SIZE];
- char sysfs_value[VALUE_SIZE];
char id[ID_SIZE];
char place[PLACE_SIZE];
char kernel_name[NAME_SIZE];
char id[ID_SIZE];
char place[PLACE_SIZE];
char kernel_name[NAME_SIZE];
- char exec_program[FILE_SIZE];
+ char exec_program[PROGRAM_SIZE];
+ char name[NAME_SIZE];
+ char symlink[NAME_SIZE];
+ struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
+};
+
+struct perm_device {
+ struct list_head node;
- /* what to set the device to */
char name[NAME_SIZE];
char owner[OWNER_SIZE];
char group[GROUP_SIZE];
char name[NAME_SIZE];
char owner[OWNER_SIZE];
char group[GROUP_SIZE];
@@
-72,14
+92,19
@@
struct config_device {
};
extern struct list_head config_device_list;
};
extern struct list_head config_device_list;
+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_init_permissions(void);
extern int namedev_init(void);
extern int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *dev);
extern int namedev_init_permissions(void);
-extern int namedev_init_
config
(void);
+extern int namedev_init_
rules
(void);
-extern int add_
config_dev(struct config
_device *new_dev);
+extern int add_
perm_dev(struct perm
_device *new_dev);
extern void dump_config_dev(struct config_device *dev);
extern void dump_config_dev_list(void);
extern void dump_config_dev(struct config_device *dev);
extern void dump_config_dev_list(void);
+extern void dump_perm_dev(struct perm_device *dev);
+extern void dump_perm_dev_list(void);
+
+extern int get_pair(char **orig_string, char **left, char **right);
#endif
#endif