[PATCH] allow SYSFS{file}

[elogind.git] / namedev.h

diff --git a/namedev.h b/namedev.h
index 4e75db64107a7fe5c6e519bcbc08b3ab49e733f1..e38c4f525741b0d4bdfd2616c50715f0a735d7d6 100644 (file)
--- a/namedev.h
+++ b/namedev.h
@@ -3,7 +3,7 @@
  *
  * Userspace devfs
  *
- * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (C) 2003,2004 Greg Kroah-Hartman <greg@kroah.com>
  *
  *     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 the
@@ -36,7 +36,7 @@ struct sysfs_class_device;
 #define PROGRAM_SIZE   100
 
 #define FIELD_BUS      "BUS"
-#define FIELD_SYSFS    "SYSFS_"
+#define FIELD_SYSFS    "SYSFS"
 #define FIELD_ID       "ID"
 #define FIELD_PLACE    "PLACE"
 #define FIELD_PROGRAM  "PROGRAM"
@@ -45,7 +45,7 @@ struct sysfs_class_device;
 #define FIELD_NAME     "NAME"
 #define FIELD_SYMLINK  "SYMLINK"
 
-#define CALLOUT_MAXARG 10
+#define PROGRAM_MAXARG 10
 #define MAX_SYSFS_PAIRS        5
 
 struct sysfs_pair {
@@ -65,6 +65,7 @@ struct config_device {
        char name[NAME_SIZE];
        char symlink[NAME_SIZE];
        struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
+       int config_line;
 };
 
 struct perm_device {
@@ -73,7 +74,7 @@ struct perm_device {
        char name[NAME_SIZE];
        char owner[OWNER_SIZE];
        char group[GROUP_SIZE];
-       mode_t mode;
+       unsigned int mode;
 };
 
 extern struct list_head config_device_list;
@@ -90,6 +91,4 @@ extern void dump_config_dev_list(void);
 extern void dump_perm_dev(struct perm_device *dev);
 extern void dump_perm_dev_list(void);
 
-extern int get_pair(char **orig_string, char **left, char **right);
-
 #endif