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_KERNEL "KERNEL"
+#define FIELD_SUBSYSTEM "SUBSYSTEM"
#define FIELD_BUS "BUS"
#define FIELD_SYSFS "SYSFS"
#define FIELD_ID "ID"
#define FIELD_PLACE "PLACE"
#define FIELD_PROGRAM "PROGRAM"
#define FIELD_RESULT "RESULT"
-#define FIELD_KERNEL "KERNEL"
+#define FIELD_DRIVER "DRIVER"
#define FIELD_NAME "NAME"
#define FIELD_SYMLINK "SYMLINK"
+#define FIELD_OWNER "OWNER"
+#define FIELD_GROUP "GROUP"
+#define FIELD_MODE "MODE"
+#define FIELD_OPTIONS "OPTIONS"
+#define ATTR_IGNORE_DEVICE "ignore_device"
+#define ATTR_IGNORE_REMOVE "ignore_remove"
#define ATTR_PARTITIONS "all_partitions"
-#define PARTITIONS_COUNT 15
-
-#define PROGRAM_MAXARG 10
#define MAX_SYSFS_PAIRS 5
+#define RULEFILE_SUFFIX ".rules"
+
struct sysfs_pair {
char file[FILE_SIZE];
char value[VALUE_SIZE];
struct config_device {
struct list_head node;
+ char kernel[NAME_SIZE];
+ char subsystem[SUBSYSTEM_SIZE];
char bus[BUS_SIZE];
char id[ID_SIZE];
char place[PLACE_SIZE];
- char kernel[NAME_SIZE];
+ struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
char program[PROGRAM_SIZE];
char result[PROGRAM_SIZE];
+ char driver[DRIVER_SIZE];
char name[NAME_SIZE];
char symlink[NAME_SIZE];
- struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
- int partitions;
- int config_line;
-};
-struct perm_device {
- struct list_head node;
+ char owner[USER_SIZE];
+ char group[USER_SIZE];
+ mode_t mode;
- char name[NAME_SIZE];
- char owner[OWNER_SIZE];
- char group[GROUP_SIZE];
- unsigned int mode;
+ int partitions;
+ int ignore_device;
+ int ignore_remove;
+
+ char config_file[NAME_SIZE];
+ int config_line;
};
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_rules(void);
+extern int namedev_name_device(struct udevice *udev, struct sysfs_class_device *class_dev);
+extern void namedev_close(void);
-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_perm_dev(struct perm_device *dev);
-extern void dump_perm_dev_list(void);
#endif