udev.h   udev.h 
/* /*
* udev.h * udev.h
* *
* Userspace devfs
*
* Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com> * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
* Copyright (C) 2003-2005 Kay Sievers <kay.sievers@vrfy.org> * Copyright (C) 2003-2005 Kay Sievers <kay.sievers@vrfy.org>
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by th e * under the terms of the GNU General Public License as published by th e
* Free Software Foundation version 2 of the License. * Free Software Foundation version 2 of the License.
* *
* This program is distributed in the hope that it will be useful, but * This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of * WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
skipping to change at line 43 skipping to change at line 41
#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 120 #define UDEV_ALARM_TIMEOUT 120
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,
}; };
struct udevice { struct udevice {
char devpath[PATH_SIZE]; char devpath[PATH_SIZE];
skipping to change at line 85 skipping to change at line 85
int ignore_remove; int ignore_remove;
int config_line; int config_line;
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 void udev_cleanup_device(struct udevice *udev);
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 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_db_path[PATH_SIZE];
extern char udev_config_filename[PATH_SIZE]; extern char udev_config_filename[PATH_SIZE];
 End of changes. 3 change blocks. 
2 lines changed or deleted 7 lines changed or added


 udev_db.h   udev_db.h 
/* /*
* udev_db.h * udev_db.h
* *
* Userspace devfs
*
* Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com> * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
* Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org> * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by th e * under the terms of the GNU General Public License as published by th e
* Free Software Foundation version 2 of the License. * Free Software Foundation version 2 of the License.
* *
* This program is distributed in the hope that it will be useful, but * This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of * WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details. * General Public License for more details.
* *
 End of changes. 2 change blocks. 
3 lines changed or deleted 1 lines changed or added


 udev_rules.h   udev_rules.h 
/* /*
* udev_rules.h * udev_rules.h
* *
* Userspace devfs * Copyright (C) 2003-2004 Greg Kroah-Hartman <greg@kroah.com>
* * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
* Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by th e * under the terms of the GNU General Public License as published by th e
* Free Software Foundation version 2 of the License. * Free Software Foundation version 2 of the License.
* *
* This program is distributed in the hope that it will be useful, but * This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of * WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details. * General Public License for more details.
* *
skipping to change at line 65 skipping to change at line 64
}; };
enum import_type { enum import_type {
IMPORT_UNSET, IMPORT_UNSET,
IMPORT_PROGRAM, IMPORT_PROGRAM,
IMPORT_FILE, IMPORT_FILE,
IMPORT_PARENT, IMPORT_PARENT,
}; };
struct udev_rule { struct udev_rule {
struct key label;
struct key goto_label;
struct key kernel_name; struct key kernel_name;
struct key subsystem; struct key subsystem;
struct key action; struct key action;
struct key devpath; struct key devpath;
struct key bus; struct key bus;
struct key id; struct key id;
struct key driver; struct key driver;
struct key program; struct key program;
struct key result; struct key result;
struct key modalias; struct key modalias;
skipping to change at line 109 skipping to change at line 110
char *buf; char *buf;
size_t bufsize; size_t bufsize;
size_t current; size_t current;
int mapped; int mapped;
int resolve_names; int resolve_names;
}; };
extern int udev_rules_init(struct udev_rules *rules, int resolve_names); extern int udev_rules_init(struct udev_rules *rules, int resolve_names);
extern void udev_rules_close(struct udev_rules *rules); extern void udev_rules_close(struct udev_rules *rules);
extern void udev_apply_format(struct udevice *udev, char *string, size_t ma
xsize,
struct sysfs_class_device *class_dev, struct s
ysfs_device *sysfs_device);
extern void udev_rules_iter_init(struct udev_rules *rules); extern void udev_rules_iter_init(struct udev_rules *rules);
extern struct udev_rule *udev_rules_iter_next(struct udev_rules *rules); extern struct udev_rule *udev_rules_iter_next(struct udev_rules *rules);
extern struct udev_rule *udev_rules_iter_label(struct udev_rules *rules, co nst char *label);
extern int udev_rules_get_name(struct udev_rules *rules, struct udevice *ud extern int udev_rules_get_name(struct udev_rules *rules, struct udevice *ud
ev, struct sysfs_class_device *class_dev); ev,
extern int udev_rules_get_run(struct udev_rules *rules, struct udevice *ude struct sysfs_class_device *class_dev);
v, struct sysfs_device *sysfs_device); extern int udev_rules_get_run(struct udev_rules *rules, struct udevice *ude
v,
struct sysfs_class_device *class_dev, struct s
ysfs_device *sysfs_dev);
#endif #endif
 End of changes. 5 change blocks. 
7 lines changed or deleted 17 lines changed or added


 udev_utils.h   udev_utils.h 
/* /*
* udev_lib - generic stuff used by udev * udev_utils.c - generic stuff used by udev
*
* Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
* *
* Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by th e * under the terms of the GNU General Public License as published by th e
* Free Software Foundation version 2 of the License. * Free Software Foundation version 2 of the License.
* *
* This program is distributed in the hope that it will be useful, but * This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of * WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details. * General Public License for more details.
* *
* You should have received a copy of the GNU General Public License al ong * You should have received a copy of the GNU General Public License al ong
* with this program; if not, write to the Free Software Foundation, In c., * with this program; if not, write to the Free Software Foundation, In c.,
* 675 Mass Ave, Cambridge, MA 02139, USA. * 675 Mass Ave, Cambridge, MA 02139, USA.
* *
*/ */
#ifndef _UDEV_LIB_H_ #ifndef _UDEV_COMMON_H_
#define _UDEV_LIB_H_ #define _UDEV_COMMON_H_
#include "udev.h" #include "udev.h"
#include "list.h"
struct name_entry { struct name_entry {
struct list_head node; struct list_head node;
char name[PATH_SIZE]; char name[PATH_SIZE];
}; };
extern int udev_init_device(struct udevice *udev, const char* devpath, cons extern int strcmp_pattern(const char *p, const char *s);
t char *subsystem, const char *action);
extern void udev_cleanup_device(struct udevice *udev);
extern int kernel_release_satisfactory(unsigned int version, unsigned int p atchlevel, unsigned int sublevel); extern int kernel_release_satisfactory(unsigned int version, unsigned int p atchlevel, unsigned int sublevel);
extern int create_path(const char *path); extern int create_path(const char *path);
extern int log_priority(const char *priority); extern int log_priority(const char *priority);
extern int string_is_true(const char *str); extern int string_is_true(const char *str);
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 int unlink_secure(const char *filename); extern int unlink_secure(const char *filename);
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 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);
extern void remove_trailing_char(char *path, char c); extern void remove_trailing_char(char *path, char c);
 End of changes. 5 change blocks. 
9 lines changed or deleted 6 lines changed or added


 udev_version.h   udev_version.h 
#define UDEV_VERSION "063" #define UDEV_VERSION "064"
#define UDEV_ROOT "/dev" #define UDEV_ROOT "/dev"
#define UDEV_DB "/dev/.udevdb" #define UDEV_DB "/dev/.udevdb"
#define UDEV_CONFIG_DIR "/etc/udev" #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 UDEV_BIN "/sbin/udev" #define UDEV_BIN "/sbin/udev"
#define UDEVD_BIN "/sbin/udevd" #define UDEVD_BIN "/sbin/udevd"
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 udevd.h   udevd.h 
/* /*
* udevd.h * udevd.h
* *
* Userspace devfs
*
* Copyright (C) 2004 Ling, Xiaofeng <xiaofeng.ling@intel.com> * Copyright (C) 2004 Ling, Xiaofeng <xiaofeng.ling@intel.com>
* Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org> * Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
*
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by th e * under the terms of the GNU General Public License as published by th e
* Free Software Foundation version 2 of the License. * Free Software Foundation version 2 of the License.
* *
* This program is distributed in the hope that it will be useful, but * This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of * WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details. * General Public License for more details.
* *
 End of changes. 2 change blocks. 
4 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/