X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=namedev.h;h=e38c4f525741b0d4bdfd2616c50715f0a735d7d6;hb=bb7386472466e55f75df024d18e8da37a222bb41;hp=1ac71069ad219784d8c227610a7e911e1329a826;hpb=f732a97ebe079413524fb992a119b9579bd04136;p=elogind.git

diff --git a/namedev.h b/namedev.h
index 1ac71069a..e38c4f525 100644
--- 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
@@ -28,16 +28,6 @@
 
 struct sysfs_class_device;
 
-
-enum config_type {
-	KERNEL_NAME	= 0,	/* must be 0 to let memset() default to this value */
-	LABEL		= 1,
-	NUMBER		= 2,
-	TOPOLOGY	= 3,
-	REPLACE		= 4,
-	CALLOUT		= 5,
-};
-
 #define BUS_SIZE	30
 #define FILE_SIZE	50
 #define VALUE_SIZE	100
@@ -45,22 +35,17 @@ enum config_type {
 #define PLACE_SIZE	50
 #define PROGRAM_SIZE	100
 
-#define TYPE_LABEL	"LABEL"
-#define TYPE_NUMBER	"NUMBER"
-#define TYPE_TOPOLOGY	"TOPOLOGY"
-#define TYPE_REPLACE	"REPLACE"
-#define TYPE_CALLOUT	"CALLOUT"
-
 #define FIELD_BUS	"BUS"
+#define FIELD_SYSFS	"SYSFS"
 #define FIELD_ID	"ID"
-#define FIELD_SYSFS	"SYSFS_"
 #define FIELD_PLACE	"PLACE"
 #define FIELD_PROGRAM	"PROGRAM"
+#define FIELD_RESULT	"RESULT"
 #define FIELD_KERNEL	"KERNEL"
 #define FIELD_NAME	"NAME"
 #define FIELD_SYMLINK	"SYMLINK"
 
-#define CALLOUT_MAXARG	8
+#define PROGRAM_MAXARG	10
 #define MAX_SYSFS_PAIRS	5
 
 struct sysfs_pair {
@@ -71,15 +56,16 @@ struct sysfs_pair {
 struct config_device {
 	struct list_head node;
 
-	enum config_type type;
 	char bus[BUS_SIZE];
 	char id[ID_SIZE];
 	char place[PLACE_SIZE];
-	char kernel_name[NAME_SIZE];
-	char exec_program[PROGRAM_SIZE];
+	char kernel[NAME_SIZE];
+	char program[PROGRAM_SIZE];
+	char result[PROGRAM_SIZE];
 	char name[NAME_SIZE];
 	char symlink[NAME_SIZE];
 	struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS];
+	int config_line;
 };
 
 struct perm_device {
@@ -88,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;
@@ -105,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