X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=namedev.h;h=10a5dcaf0c53733300005e88cbcd5c85881f2933;hp=f7b8a676673afc6235f22aa7cd4261350a77651c;hb=93656247f3b398959a0b40ac352b9f6ac195e86b;hpb=61219c756ad0ad622decaf81b92a558ba2a1bc59

diff --git a/namedev.h b/namedev.h
index f7b8a6766..10a5dcaf0 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,41 +28,49 @@
 
 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
+#define ID_SIZE			50
+#define PLACE_SIZE		50
+#define PROGRAM_SIZE		100
+
+#define FIELD_BUS		"BUS"
+#define FIELD_SYSFS		"SYSFS"
+#define FIELD_ID		"ID"
+#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 ATTR_PARTITIONS		"all_partitions"
+#define PARTITIONS_COUNT	15
+
+
+#define PROGRAM_MAXARG		10
+#define MAX_SYSFS_PAIRS		5
+
+struct sysfs_pair {
+	char file[FILE_SIZE];
+	char value[VALUE_SIZE];
 };
 
-#define BUS_SIZE	30
-#define FILE_SIZE	50
-#define VALUE_SIZE	100
-#define ID_SIZE		50
-#define PLACE_SIZE	50
-
-#define TYPE_LABEL	"LABEL"
-#define TYPE_NUMBER	"NUMBER"
-#define TYPE_TOPOLOGY	"TOPOLOGY"
-#define TYPE_REPLACE	"REPLACE"
-#define TYPE_CALLOUT	"CALLOUT"
-#define CALLOUT_MAXARG	8
-
 struct config_device {
 	struct list_head node;
 
-	enum config_type type;
 	char bus[BUS_SIZE];
-	char sysfs_file[FILE_SIZE];
-	char sysfs_value[VALUE_SIZE];
 	char id[ID_SIZE];
 	char place[PLACE_SIZE];
-	char kernel_name[NAME_SIZE];
-	char exec_program[FILE_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 partitions;
+	int config_line;
 };
 
 struct perm_device {
@@ -71,7 +79,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;
@@ -82,13 +90,10 @@ extern int namedev_name_device(struct sysfs_class_device *class_dev, struct udev
 extern int namedev_init_permissions(void);
 extern int namedev_init_rules(void);
 
-extern int add_config_dev(struct config_device *new_dev);
 extern int add_perm_dev(struct perm_device *new_dev);
 extern void dump_config_dev(struct config_device *dev);
 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