chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge gregkh@ehlo.org:/home/kay/public_html/pub/scm/linux/hotplug/udev-kay
[elogind.git]
/
udev_rules.h
diff --git
a/udev_rules.h
b/udev_rules.h
index 75ffd5cb0f47b13ccb325910b7b979f896400384..2bf81075439d81021d355f68f689055c46d08805 100644
(file)
--- a/
udev_rules.h
+++ b/
udev_rules.h
@@
-31,6
+31,7
@@
#define KEY_KERNEL "KERNEL"
#define KEY_SUBSYSTEM "SUBSYSTEM"
#define KEY_ACTION "ACTION"
#define KEY_KERNEL "KERNEL"
#define KEY_SUBSYSTEM "SUBSYSTEM"
#define KEY_ACTION "ACTION"
+#define KEY_DEVPATH "DEVPATH"
#define KEY_BUS "BUS"
#define KEY_ID "ID"
#define KEY_PROGRAM "PROGRAM"
#define KEY_BUS "BUS"
#define KEY_ID "ID"
#define KEY_PROGRAM "PROGRAM"
@@
-38,6
+39,7
@@
#define KEY_DRIVER "DRIVER"
#define KEY_SYSFS "SYSFS"
#define KEY_ENV "ENV"
#define KEY_DRIVER "DRIVER"
#define KEY_SYSFS "SYSFS"
#define KEY_ENV "ENV"
+#define KEY_MODALIAS "MODALIAS"
#define KEY_NAME "NAME"
#define KEY_SYMLINK "SYMLINK"
#define KEY_OWNER "OWNER"
#define KEY_NAME "NAME"
#define KEY_SYMLINK "SYMLINK"
#define KEY_OWNER "OWNER"
@@
-80,6
+82,8
@@
struct udev_rule {
enum key_operation subsystem_operation;
char action[NAME_SIZE];
enum key_operation action_operation;
enum key_operation subsystem_operation;
char action[NAME_SIZE];
enum key_operation action_operation;
+ char devpath[PATH_SIZE];
+ enum key_operation devpath_operation;
char bus[NAME_SIZE];
enum key_operation bus_operation;
char id[NAME_SIZE];
char bus[NAME_SIZE];
enum key_operation bus_operation;
char id[NAME_SIZE];
@@
-94,6
+98,8
@@
struct udev_rule {
int sysfs_pair_count;
struct key_pair env_pair[KEY_ENV_PAIRS_MAX];
int env_pair_count;
int sysfs_pair_count;
struct key_pair env_pair[KEY_ENV_PAIRS_MAX];
int env_pair_count;
+ enum key_operation modalias_operation;
+ char modalias[PATH_SIZE];
char name[PATH_SIZE];
enum key_operation name_operation;
char name[PATH_SIZE];
enum key_operation name_operation;