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] don't call dev.d/ scripts twice, if directory = subsystem
[elogind.git]
/
udev.h
diff --git
a/udev.h
b/udev.h
index 717c1218eb7b0adb540f9d3a82212dc1882bc0ff..1e3db5af27e95c4309e4ec24096ee43e8ba2f73c 100644
(file)
--- a/
udev.h
+++ b/
udev.h
@@
-26,11
+26,12
@@
#include <sys/param.h>
#include "libsysfs/sysfs/libsysfs.h"
#include <sys/param.h>
#include "libsysfs/sysfs/libsysfs.h"
+#define ALARM_TIMEOUT 120
#define COMMENT_CHARACTER '#'
#define NAME_SIZE 256
#define COMMENT_CHARACTER '#'
#define NAME_SIZE 256
-#define OWNER_SIZE 3
0
-#define GROUP_SIZE 3
0
+#define OWNER_SIZE 3
2
+#define GROUP_SIZE 3
2
#define MODE_SIZE 8
#define ACTION_SIZE 32
#define MODE_SIZE 8
#define ACTION_SIZE 32
@@
-38,45
+39,50
@@
#define SUBSYSTEM_SIZE 32
#define SEQNUM_SIZE 32
#define SUBSYSTEM_SIZE 32
#define SEQNUM_SIZE 32
-/* length of public data */
-#define UDEVICE_LEN (offsetof(struct udevice, bus_id))
+#define LINE_SIZE 256
+
+#define DEVD_DIR "/etc/dev.d"
+#define DEVD_SUFFIX ".dev"
+
+#define HOTPLUGD_DIR "/etc/hotplug.d"
+#define HOTPLUG_SUFFIX ".hotplug"
struct udevice {
struct udevice {
+ char devpath[DEVPATH_SIZE];
+ char subsystem[SUBSYSTEM_SIZE];
+ char action[ACTION_SIZE];
char name[NAME_SIZE];
char owner[OWNER_SIZE];
char group[GROUP_SIZE];
char type;
int major;
int minor;
char name[NAME_SIZE];
char owner[OWNER_SIZE];
char group[GROUP_SIZE];
char type;
int major;
int minor;
- unsigned int mode; /* not mode_t due to conflicting definitions in different libcs */
+ mode_t mode;
char symlink[NAME_SIZE];
int partitions;
char symlink[NAME_SIZE];
int partitions;
+ int ignore_remove;
int config_line;
char config_file[NAME_SIZE];
long config_uptime;
int config_line;
char config_file[NAME_SIZE];
long config_uptime;
-
- /* private data that help us in building strings */
char bus_id[SYSFS_NAME_LEN];
char bus_id[SYSFS_NAME_LEN];
+ char bus[SYSFS_NAME_LEN];
char program_result[NAME_SIZE];
char kernel_number[NAME_SIZE];
char kernel_name[NAME_SIZE];
char program_result[NAME_SIZE];
char kernel_number[NAME_SIZE];
char kernel_name[NAME_SIZE];
+ char devname[NAME_SIZE];
+ int test_run;
};
};
-extern int udev_add_device(
const char *path, const char *subsystem, int fake
);
-extern int udev_remove_device(
const char *path, const char *subsystem
);
+extern int udev_add_device(
struct udevice *udev, struct sysfs_class_device *class_dev
);
+extern int udev_remove_device(
struct udevice *udev
);
extern void udev_init_config(void);
extern int udev_start(void);
extern void udev_init_config(void);
extern int udev_start(void);
-extern int __udev_hotplug(char *action, const char *devpath,
- const char *subsystem);
extern int parse_get_pair(char **orig_string, char **left, char **right);
extern int parse_get_pair(char **orig_string, char **left, char **right);
-extern void dev_d_send(struct udevice *dev, const char *subsystem,
- const char *devpath);
+extern void udev_multiplex_directory(struct udevice *udev, const char *basedir, const char *suffix);
-extern char **main_argv;
-extern char **main_envp;
extern char sysfs_path[SYSFS_PATH_MAX];
extern char udev_root[PATH_MAX];
extern char sysfs_path[SYSFS_PATH_MAX];
extern char udev_root[PATH_MAX];
-extern char udev_db_
filename
[PATH_MAX+NAME_MAX];
+extern char udev_db_
path
[PATH_MAX+NAME_MAX];
extern char udev_permissions_filename[PATH_MAX+NAME_MAX];
extern char udev_config_filename[PATH_MAX+NAME_MAX];
extern char udev_rules_filename[PATH_MAX+NAME_MAX];
extern char udev_permissions_filename[PATH_MAX+NAME_MAX];
extern char udev_config_filename[PATH_MAX+NAME_MAX];
extern char udev_rules_filename[PATH_MAX+NAME_MAX];
@@
-84,7
+90,6
@@
extern char default_mode_str[MODE_SIZE];
extern char default_owner_str[OWNER_SIZE];
extern char default_group_str[GROUP_SIZE];
extern int udev_log;
extern char default_owner_str[OWNER_SIZE];
extern char default_group_str[GROUP_SIZE];
extern int udev_log;
-extern int udev_sleep;
extern int udev_dev_d;
#endif
extern int udev_dev_d;
#endif