X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=namedev.h;h=10a5dcaf0c53733300005e88cbcd5c85881f2933;hp=4e75db64107a7fe5c6e519bcbc08b3ab49e733f1;hb=93656247f3b398959a0b40ac352b9f6ac195e86b;hpb=ac28b86d631f23b5df74dbeb33e76a2b3f5d88bb diff --git a/namedev.h b/namedev.h index 4e75db641..10a5dcaf0 100644 --- a/namedev.h +++ b/namedev.h @@ -3,7 +3,7 @@ * * Userspace devfs * - * Copyright (C) 2003 Greg Kroah-Hartman + * Copyright (C) 2003,2004 Greg Kroah-Hartman * * 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,25 +28,29 @@ struct sysfs_class_device; -#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 CALLOUT_MAXARG 10 -#define MAX_SYSFS_PAIRS 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]; @@ -65,6 +69,8 @@ struct config_device { char name[NAME_SIZE]; char symlink[NAME_SIZE]; struct sysfs_pair sysfs_pair[MAX_SYSFS_PAIRS]; + int partitions; + int config_line; }; struct perm_device { @@ -73,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; @@ -90,6 +96,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