#ifndef UDEV_H
#define UDEV_H
-#include "libsysfs/libsysfs.h"
+#include <sysfs/libsysfs.h>
+#include <stddef.h>
#include <sys/param.h>
-#ifdef DEBUG
-#include <syslog.h>
-#define dbg(format, arg...) \
- do { \
- log_message (LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg); \
- } while (0)
-#else
- #define dbg(format, arg...) do { } while (0)
-#endif
-
-/* Parser needs it's own debugging statement, we usually don't care about this at all */
-#ifdef DEBUG_PARSER
-#define dbg_parse(format, arg...) \
- do { \
- log_message (LOG_DEBUG , "%s: " format , __FUNCTION__ , ## arg); \
- } while (0)
-#else
- #define dbg_parse(format, arg...) do { } while (0)
-#endif
-
-
-extern int log_message (int level, const char *format, ...)
- __attribute__ ((format (printf, 2, 3)));
-
#define COMMENT_CHARACTER '#'
#define NAME_SIZE 100
#define OWNER_SIZE 30
#define GROUP_SIZE 30
+#define MODE_SIZE 8
+
+/* length of public data */
+#define UDEVICE_LEN (offsetof(struct udevice, bus_id))
struct udevice {
char name[NAME_SIZE];
char type;
int major;
int minor;
- mode_t mode;
+ unsigned int mode; /* not mode_t due to conflicting definitions in different libcs */
char symlink[NAME_SIZE];
+ int partitions;
- /* fields that help us in building strings */
- unsigned char bus_id[SYSFS_NAME_LEN];
- unsigned char callout_value[NAME_SIZE];
- unsigned char kernel_number[NAME_SIZE];
-
+ /* private data that help us in building strings */
+ char bus_id[SYSFS_NAME_LEN];
+ char program_result[NAME_SIZE];
+ char kernel_number[NAME_SIZE];
+ char kernel_name[NAME_SIZE];
};
#define strfieldcpy(to, from) \
strncpy(to, from, sizeof(to)-1); \
} while (0)
-extern int udev_add_device(char *path, char *subsystem);
+extern int udev_add_device(char *path, char *subsystem, int fake);
extern int udev_remove_device(char *path, char *subsystem);
extern void udev_init_config(void);
+extern int parse_get_pair(char **orig_string, char **left, char **right);
extern char **main_argv;
extern char **main_envp;
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 default_mode_str[NAME_MAX];
+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 int udev_sleep;
#endif