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_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_MODE "MODE"
#define ATTR_PARTITIONS "all_partitions"
+#define ATTR_IGNORE_REMOVE "ignore_remove"
#define PARTITIONS_COUNT 15
-#define PROGRAM_MAXARG 10
#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) \
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 group[GROUP_SIZE];
unsigned int mode;
int partitions;
+ int ignore_remove;
char config_file[NAME_SIZE];
int config_line;
};
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);