udev.h | udev.h | |||
---|---|---|---|---|
skipping to change at line 31 | skipping to change at line 31 | |||
#ifndef _UDEV_H_ | #ifndef _UDEV_H_ | |||
#define _UDEV_H_ | #define _UDEV_H_ | |||
#include <sys/types.h> | #include <sys/types.h> | |||
#include <sys/param.h> | #include <sys/param.h> | |||
#include "libsysfs/sysfs/libsysfs.h" | #include "libsysfs/sysfs/libsysfs.h" | |||
#include "list.h" | #include "list.h" | |||
#define COMMENT_CHARACTER '#' | #define COMMENT_CHARACTER '#' | |||
#define PATH_TO_NAME_CHAR '@' | ||||
#define LINE_SIZE 512 | #define LINE_SIZE 512 | |||
#define NAME_SIZE 128 | #define NAME_SIZE 128 | |||
#define PATH_SIZE 256 | #define PATH_SIZE 256 | |||
#define USER_SIZE 32 | #define USER_SIZE 32 | |||
#define SEQNUM_SIZE 32 | #define SEQNUM_SIZE 32 | |||
#define VALUE_SIZE 128 | #define VALUE_SIZE 128 | |||
#define DEFAULT_PARTITIONS_COUNT 15 | #define DEFAULT_PARTITIONS_COUNT 15 | |||
#define UDEV_ALARM_TIMEOUT 180 | #define UDEV_ALARM_TIMEOUT 180 | |||
#define DB_DIR ".udev/db" | ||||
struct udev_rules; | struct udev_rules; | |||
enum device_type { | enum device_type { | |||
DEV_UNKNOWN, | DEV_UNKNOWN, | |||
DEV_CLASS, | DEV_CLASS, | |||
DEV_BLOCK, | DEV_BLOCK, | |||
DEV_NET, | DEV_NET, | |||
DEV_DEVICE, | DEV_DEVICE, | |||
}; | }; | |||
skipping to change at line 87 | skipping to change at line 90 | |||
char config_file[PATH_SIZE]; | char config_file[PATH_SIZE]; | |||
char bus_id[NAME_SIZE]; | char bus_id[NAME_SIZE]; | |||
char program_result[PATH_SIZE]; | char program_result[PATH_SIZE]; | |||
char kernel_number[NAME_SIZE]; | char kernel_number[NAME_SIZE]; | |||
char kernel_name[NAME_SIZE]; | char kernel_name[NAME_SIZE]; | |||
int test_run; | int test_run; | |||
}; | }; | |||
extern int udev_init_device(struct udevice *udev, const char* devpath, cons t char *subsystem, const char *action); | extern int udev_init_device(struct udevice *udev, const char* devpath, cons t char *subsystem, const char *action); | |||
extern void udev_cleanup_device(struct udevice *udev); | extern void udev_cleanup_device(struct udevice *udev); | |||
extern dev_t get_devt(struct sysfs_class_device *class_dev); | ||||
extern int udev_process_event(struct udev_rules *rules, struct udevice *ude v); | extern int udev_process_event(struct udev_rules *rules, struct udevice *ude v); | |||
extern int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev); | extern int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev); | |||
extern int udev_remove_device(struct udevice *udev); | extern int udev_remove_device(struct udevice *udev); | |||
extern void udev_init_config(void); | extern void udev_init_config(void); | |||
extern int udev_start(void); | extern int udev_start(void); | |||
extern int udev_make_node(struct udevice *udev, const char *file, dev_t dev t, mode_t mode, uid_t uid, gid_t gid); | extern int udev_make_node(struct udevice *udev, const char *file, dev_t dev t, mode_t mode, uid_t uid, gid_t gid); | |||
extern int udev_db_add_device(struct udevice *dev); | ||||
extern int udev_db_delete_device(struct udevice *dev); | ||||
extern int udev_db_get_device(struct udevice *udev, const char *devpath); | ||||
extern int udev_db_lookup_name(const char *name, char *devpath, size_t len) | ||||
; | ||||
extern int udev_db_get_all_entries(struct list_head *name_list); | ||||
extern char sysfs_path[PATH_SIZE]; | extern char sysfs_path[PATH_SIZE]; | |||
extern char udev_root[PATH_SIZE]; | extern char udev_root[PATH_SIZE]; | |||
extern char udev_db_path[PATH_SIZE]; | ||||
extern char udev_config_filename[PATH_SIZE]; | extern char udev_config_filename[PATH_SIZE]; | |||
extern char udev_rules_filename[PATH_SIZE]; | extern char udev_rules_filename[PATH_SIZE]; | |||
extern int udev_log_priority; | extern int udev_log_priority; | |||
extern int udev_run; | extern int udev_run; | |||
#endif | #endif | |||
End of changes. 5 change blocks. | ||||
1 lines changed or deleted | 11 lines changed or added | |||
udev_utils.h | udev_utils.h | |||
---|---|---|---|---|
skipping to change at line 54 | skipping to change at line 54 | |||
/* udev_utils_string.c */ | /* udev_utils_string.c */ | |||
extern int strcmp_pattern(const char *p, const char *s); | extern int strcmp_pattern(const char *p, const char *s); | |||
extern int string_is_true(const char *str); | extern int string_is_true(const char *str); | |||
extern void remove_trailing_chars(char *path, char c); | extern void remove_trailing_chars(char *path, char c); | |||
extern int utf8_encoded_valid_unichar(const char *str); | extern int utf8_encoded_valid_unichar(const char *str); | |||
extern int replace_untrusted_chars(char *str); | extern int replace_untrusted_chars(char *str); | |||
/* udev_utils_file.c */ | /* udev_utils_file.c */ | |||
extern int create_path(const char *path); | extern int create_path(const char *path); | |||
extern int delete_path(const char *path); | ||||
extern int file_map(const char *filename, char **buf, size_t *bufsize); | extern int file_map(const char *filename, char **buf, size_t *bufsize); | |||
extern void file_unmap(void *buf, size_t bufsize); | extern void file_unmap(void *buf, size_t bufsize); | |||
extern int unlink_secure(const char *filename); | extern int unlink_secure(const char *filename); | |||
extern size_t buf_get_line(const char *buf, size_t buflen, size_t cur); | extern size_t buf_get_line(const char *buf, size_t buflen, size_t cur); | |||
/* udev_utils_run.c */ | /* udev_utils_run.c */ | |||
extern int pass_env_to_socket(const char *name, const char *devpath, const char *action); | extern int pass_env_to_socket(const char *name, const char *devpath, const char *action); | |||
extern int run_program(const char *command, const char *subsystem, | extern int run_program(const char *command, const char *subsystem, | |||
char *result, size_t ressize, size_t *reslen, int log ); | char *result, size_t ressize, size_t *reslen, int log ); | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 1 lines changed or added | |||
udev_version.h | udev_version.h | |||
---|---|---|---|---|
#define UDEV_VERSION "075" | #define UDEV_VERSION "076" | |||
#define UDEV_ROOT "/dev" | #define UDEV_ROOT "/dev" | |||
#define UDEV_DB "/dev/.udevdb" | ||||
#define UDEV_CONFIG_DIR "/etc/udev" | ||||
#define UDEV_CONFIG_FILE "/etc/udev/udev.conf" | #define UDEV_CONFIG_FILE "/etc/udev/udev.conf" | |||
#define UDEV_RULES_FILE "/etc/udev/rules.d" | #define UDEV_RULES_FILE "/etc/udev/rules.d" | |||
#define UDEVD_BIN "/sbin/udevd" | ||||
End of changes. 3 change blocks. | ||||
3 lines changed or deleted | 1 lines changed or added | |||
udevd.h | udevd.h | |||
---|---|---|---|---|
skipping to change at line 32 | skipping to change at line 32 | |||
#include "list.h" | #include "list.h" | |||
#define UDEV_MAGIC "udevd_" UDEV_VERSION | #define UDEV_MAGIC "udevd_" UDEV_VERSION | |||
#define UDEVD_SOCK_PATH "/org/kernel/udev/udevd" | #define UDEVD_SOCK_PATH "/org/kernel/udev/udevd" | |||
#define UDEVSEND_WAIT_MAX_SECONDS 3 | #define UDEVSEND_WAIT_MAX_SECONDS 3 | |||
#define UDEVSEND_WAIT_LOOP_PER_SECOND 10 | #define UDEVSEND_WAIT_LOOP_PER_SECOND 10 | |||
#define UDEVD_PRIORITY -4 | #define UDEVD_PRIORITY -4 | |||
#define UDEV_PRIORITY -2 | #define UDEV_PRIORITY -2 | |||
#define EVENT_QUEUE_DIR ".udev/queue" | ||||
#define EVENT_FAILED_DIR ".udev/failed" | ||||
/* maximum limit of runnig childs */ | /* maximum limit of runnig childs */ | |||
#define UDEVD_MAX_CHILDS 64 | #define UDEVD_MAX_CHILDS 64 | |||
/* start to throttle forking if maximum number of running childs in our ses sion is reached */ | /* start to throttle forking if maximum number of running childs in our ses sion is reached */ | |||
#define UDEVD_MAX_CHILDS_RUNNING 16 | #define UDEVD_MAX_CHILDS_RUNNING 16 | |||
/* environment buffer, should match the kernel's size in lib/kobject_uevent .h */ | /* environment buffer, should match the kernel's size in lib/kobject_uevent .h */ | |||
#define UEVENT_BUFFER_SIZE 1024 | #define UEVENT_BUFFER_SIZE 1024 | |||
#define UEVENT_NUM_ENVP 32 | #define UEVENT_NUM_ENVP 32 | |||
enum udevd_msg_type { | enum udevd_msg_type { | |||
skipping to change at line 63 | skipping to change at line 66 | |||
struct udevd_msg { | struct udevd_msg { | |||
char magic[32]; | char magic[32]; | |||
enum udevd_msg_type type; | enum udevd_msg_type type; | |||
char envbuf[UEVENT_BUFFER_SIZE+512]; | char envbuf[UEVENT_BUFFER_SIZE+512]; | |||
}; | }; | |||
struct uevent_msg { | struct uevent_msg { | |||
enum udevd_msg_type type; | enum udevd_msg_type type; | |||
struct list_head node; | struct list_head node; | |||
pid_t pid; | pid_t pid; | |||
int exitstatus; | ||||
time_t queue_time; | time_t queue_time; | |||
char *action; | char *action; | |||
char *devpath; | char *devpath; | |||
char *subsystem; | char *subsystem; | |||
dev_t devt; | dev_t devt; | |||
unsigned long long seqnum; | unsigned long long seqnum; | |||
char *physdevpath; | char *physdevpath; | |||
unsigned int timeout; | unsigned int timeout; | |||
char *envp[UEVENT_NUM_ENVP+1]; | char *envp[UEVENT_NUM_ENVP+1]; | |||
char envbuf[]; | char envbuf[]; | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 4 lines changed or added | |||