[PATCH] Makefile: add some more warnings and prepare for clean gcc4 compile

[elogind.git] / udev.h

diff --git a/udev.h b/udev.h
index c82dbebded625ce48f2d05256f7ffe907f2ee0d9..07385ccec551930ce98a68fc9eb293c48cba4419 100644 (file)
--- a/udev.h
+++ b/udev.h
@@ -20,51 +20,69 @@
  *
  */
 
-#ifndef UDEV_H
-#define UDEV_H
+#ifndef _UDEV_H_
+#define _UDEV_H_
 
+#include <sys/param.h>
+#include "libsysfs/sysfs/libsysfs.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
-
+#define ALARM_TIMEOUT                  120
+#define COMMENT_CHARACTER              '#'
 
-/* Lots of constants that should be in a config file sometime */
+#define NAME_SIZE                      256
+#define USER_SIZE                      32
 
-/* Location of sysfs mount */
-#define SYSFS_ROOT     "/sys"
+#define ACTION_SIZE                    32
+#define DEVPATH_SIZE                   256
+#define SUBSYSTEM_SIZE                 32
+#define SEQNUM_SIZE                    32
 
-/* Where udev should create its device nodes, trailing / needed */
-#define UDEV_ROOT      "/udev/"
+#define LINE_SIZE                      512
 
-/* device file in sysfs that contains major/minor number, leading / needed */
-#define DEV_FILE       "/dev"
+#define DEVD_DIR                       "/etc/dev.d"
+#define DEVD_SUFFIX                    ".dev"
 
-/* Binaries that udev calls to do stuff */
-#define MKNOD          "/bin/mknod"
+#define HOTPLUGD_DIR                   "/etc/hotplug.d"
+#define HOTPLUG_SUFFIX                 ".hotplug"
 
-extern int log_message (int level, const char *format, ...)
-       __attribute__ ((format (printf, 2, 3)));
+struct udevice {
+       char devpath[DEVPATH_SIZE];
+       char subsystem[SUBSYSTEM_SIZE];
 
-#define NAME_SIZE      100
-#define OWNER_SIZE     30
-#define GROUP_SIZE     30
-
-struct device_attr {
+       char name[NAME_SIZE];
+       char symlink[NAME_SIZE];
+       char owner[USER_SIZE];
+       char group[USER_SIZE];
+       mode_t mode;
+       char type;
        int major;
        int minor;
-       int mode;
-       char name[NAME_SIZE];
-       char owner[OWNER_SIZE];
-       char group[GROUP_SIZE];
+
+       char devname[NAME_SIZE];
+       int partitions;
+       int ignore_remove;
+       int config_line;
+       char config_file[NAME_SIZE];
+       char bus_id[SYSFS_NAME_LEN];
+       char program_result[NAME_SIZE];
+       char kernel_number[NAME_SIZE];
+       char kernel_name[NAME_SIZE];
+       int test_run;
 };
 
+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_multiplex_directory(struct udevice *udev, const char *basedir, const char *suffix);
 
-#endif
+extern char sysfs_path[SYSFS_PATH_MAX];
+extern char udev_root[PATH_MAX];
+extern char udev_db_path[PATH_MAX+NAME_MAX];
+extern char udev_config_filename[PATH_MAX+NAME_MAX];
+extern char udev_rules_filename[PATH_MAX+NAME_MAX];
+extern int udev_log;
+extern int udev_dev_d;
+extern int udev_hotplug_d;
 
+#endif