[PATCH] cleanup udevd/udevstart

[elogind.git] / udevd.h

diff --git a/udevd.h b/udevd.h
index c9b69bbc3cb6a0e4282556af8a8a1e6c4c18a629..657f684e3fb3a861d03f99cde64de1f7bb6e6476 100644 (file)
--- a/udevd.h
+++ b/udevd.h
@@ -4,6 +4,7 @@
  * Userspace devfs
  *
  * Copyright (C) 2004 Ling, Xiaofeng <xiaofeng.ling@intel.com>
+ * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
  *
  *
  *     This program is free software; you can redistribute it and/or modify it
@@ -23,21 +24,20 @@
 
 #include "list.h"
 
-#define UDEV_EXEC                      "./udev"
-#define UDEVD_EXEC                     "./udevd"
-#define UDEVD_TIMEOUT_SECONDS          60
-#define EVENT_TIMEOUT_SECONDS          5
-
-#define IPC_KEY_ID                     0
-#define HOTPLUGMSGTYPE                 44
+#define UDEV_MAGIC                     "udevd_" UDEV_VERSION
+#define EVENT_TIMEOUT_SEC              10
+#define UDEVD_SOCK_PATH                        "udevd"
+#define SEND_WAIT_MAX_SECONDS          3
+#define SEND_WAIT_LOOP_PER_SECOND      10
 
 
 struct hotplug_msg {
-       long mtype;
+       char magic[20];
        struct list_head list;
-       int seqnum;
-       time_t queue_time;
-       char action[8];
-       char devpath[128];
-       char subsystem[16];
+       pid_t pid;
+       unsigned long long seqnum;
+       long queue_time;
+       char action[ACTION_SIZE];
+       char devpath[DEVPATH_SIZE];
+       char subsystem[SUBSYSTEM_SIZE];
 };