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] rename device_list->list to device_list->node
[elogind.git]
/
namedev.h
diff --git
a/namedev.h
b/namedev.h
index 1e1a9bbc3450013a7dafe306c3e965b9e637e3f2..76caaaa9f7a0685868e2ad22d99605fea4580fcf 100644
(file)
--- a/
namedev.h
+++ b/
namedev.h
@@
-28,22
+28,14
@@
struct sysfs_class_device;
struct sysfs_class_device;
-#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_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_SUBSYSTEM "SUBSYSTEM"
#define FIELD_DRIVER "DRIVER"
#define FIELD_NAME "NAME"
#define FIELD_SYMLINK "SYMLINK"
#define FIELD_DRIVER "DRIVER"
#define FIELD_NAME "NAME"
#define FIELD_SYMLINK "SYMLINK"
@@
-52,33
+44,33
@@
struct sysfs_class_device;
#define FIELD_MODE "MODE"
#define FIELD_OPTIONS "OPTIONS"
#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
OPTION_IGNORE_DEVICE
"ignore_device"
+#define
OPTION_IGNORE_REMOVE
"ignore_remove"
+#define
OPTION_PARTITIONS
"all_partitions"
#define MAX_SYSFS_PAIRS 5
#define RULEFILE_SUFFIX ".rules"
struct sysfs_pair {
#define MAX_SYSFS_PAIRS 5
#define RULEFILE_SUFFIX ".rules"
struct sysfs_pair {
- char file[
FILE
_SIZE];
+ char file[
PATH
_SIZE];
char value[VALUE_SIZE];
};
struct config_device {
struct list_head node;
char value[VALUE_SIZE];
};
struct config_device {
struct list_head node;
- char bus[BUS_SIZE];
- char id[ID_SIZE];
- char place[PLACE_SIZE];
char kernel[NAME_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];
+ char subsystem[NAME_SIZE];
+ char bus[NAME_SIZE];
+ char id[NAME_SIZE];
+ char place[NAME_SIZE];
struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
+ char program[PATH_SIZE];
+ char result[PATH_SIZE];
+ char driver[NAME_SIZE];
+ char name[PATH_SIZE];
+ char symlink[PATH_SIZE];
char owner[USER_SIZE];
char group[USER_SIZE];
char owner[USER_SIZE];
char group[USER_SIZE];
@@
-88,7
+80,7
@@
struct config_device {
int ignore_device;
int ignore_remove;
int ignore_device;
int ignore_remove;
- char config_file[
NAME
_SIZE];
+ char config_file[
PATH
_SIZE];
int config_line;
};
int config_line;
};