*/
/* define this to enable parsing debugging */
-#define DEBUG_PARSER
+#define DEBUG_PARSER
#include <stddef.h>
#include <stdlib.h>
return retval;
}
+static int do_callout(struct sysfs_class_device *class_dev, struct udevice *udev)
+{
+ struct config_device *dev;
+ struct list_head *tmp;
+ char value[ID_SIZE];
+
+ list_for_each(tmp, &config_device_list) {
+ dev = list_entry(tmp, struct config_device, node);
+ if (dev->type != CALLOUT)
+ continue;
+
+ if (exec_callout(dev, value, sizeof(value)))
+ continue;
+ if (strncmp(value, dev->id, sizeof(value)) != 0)
+ continue;
+ strcpy(udev->name, dev->name);
+ if (dev->mode != 0) {
+ udev->mode = dev->mode;
+ strcpy(udev->owner, dev->owner);
+ strcpy(udev->group, dev->group);
+ }
+ dbg_parse("device callout '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
+ dev->id, udev->name,
+ dev->owner, dev->group, dev->mode);
+ return 0;
+ }
+ return -ENODEV;
+}
+
+static int do_replace(struct sysfs_class_device *class_dev, struct udevice *udev)
+{
+ struct config_device *dev;
+ struct list_head *tmp;
+
+ list_for_each(tmp, &config_device_list) {
+ dev = list_entry(tmp, struct config_device, node);
+ if (dev->type != REPLACE)
+ continue;
+
+ dbg_parse("REPLACE: replace name '%s' with '%s'",
+ dev->kernel_name, dev->name);
+ if (strcmp(dev->kernel_name, class_dev->name) != 0)
+ continue;
+
+ strcpy(udev->name, dev->name);
+ if (dev->mode != 0) {
+ udev->mode = dev->mode;
+ strcpy(udev->owner, dev->owner);
+ strcpy(udev->group, dev->group);
+ }
+ dbg_parse("'%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
+ dev->kernel_name, udev->name,
+ dev->owner, dev->group, dev->mode);
+
+ return 0;
+ }
+ return -ENODEV;
+}
+
static int get_attr(struct sysfs_class_device *class_dev, struct udevice *udev)
{
struct list_head *tmp;
+ struct sysfs_device *sysfs_device = NULL;
+ struct sysfs_class_device *class_dev_parent = NULL;
int retval = 0;
int found;
+ char *temp = NULL;
udev->mode = 0;
+
+ /* find the sysfs_device for this class device */
+ /* Wouldn't it really be nice if libsysfs could do this for us? */
if (class_dev->sysdevice) {
- dbg_parse("class_dev->sysdevice->path = '%s'", class_dev->sysdevice->path);
- dbg_parse("class_dev->sysdevice->bus_id = '%s'", class_dev->sysdevice->bus_id);
+ sysfs_device = class_dev->sysdevice;
+ } else {
+ /* bah, let's go backwards up a level to see if the device is there,
+ * as block partitions don't point to the physical device. Need to fix that
+ * up in the kernel...
+ */
+ if (strstr(class_dev->path, "block")) {
+ dbg_parse("looking at block device...");
+ if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
+ char path[SYSFS_PATH_MAX];
+
+ dbg_parse("really is a partition...");
+ strcpy(path, class_dev->path);
+ temp = strrchr(path, '/');
+ *temp = 0x00;
+ dbg_parse("looking for a class device at '%s'", path);
+ class_dev_parent = sysfs_open_class_device(path);
+ if (class_dev_parent == NULL) {
+ dbg("sysfs_open_class_device at '%s' failed", path);
+ } else {
+ dbg_parse("class_dev_parent->name = %s", class_dev_parent->name);
+ if (class_dev_parent->sysdevice)
+ sysfs_device = class_dev_parent->sysdevice;
+ }
+ }
+ }
+ }
+
+ if (sysfs_device) {
+ dbg_parse("sysfs_device->path = '%s'", sysfs_device->path);
+ dbg_parse("sysfs_device->bus_id = '%s'", sysfs_device->bus_id);
} else {
dbg_parse("class_dev->name = '%s'", class_dev->name);
}
case LABEL:
{
struct sysfs_attribute *tmpattr = NULL;
- struct sysfs_class_device *class_dev_parent = NULL;
- char *temp = NULL;
dbg_parse("LABEL: match file '%s' with value '%s'",
dev->sysfs_file, dev->sysfs_value);
goto label_found;
/* look in the class device directory if present */
- if (class_dev->sysdevice) {
- tmpattr = sysfs_get_device_attr(class_dev->sysdevice, dev->sysfs_file);
+ if (sysfs_device) {
+ tmpattr = sysfs_get_device_attr(sysfs_device, dev->sysfs_file);
if (tmpattr)
goto label_found;
}
- /* bah, let's go backwards up a level to see if the device is there,
- * as block partitions don't point to the physical device. Need to fix that
- * up in the kernel...
- */
- if (strstr(class_dev->path, "block")) {
- dbg_parse("looking at block device...");
- if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
- char path[SYSFS_PATH_MAX];
-
- dbg_parse("really is a partition...");
- strcpy(path, class_dev->path);
- temp = strrchr(path, '/');
- *temp = 0x00;
- dbg_parse("looking for a class device at '%s'", path);
- class_dev_parent = sysfs_open_class_device(path);
- if (class_dev_parent == NULL) {
- dbg("sysfs_open_class_device at '%s' failed", path);
- continue;
- }
- dbg_parse("class_dev_parent->name = %s", class_dev_parent->name);
-
- /* try to find the attribute in the class device directory */
- tmpattr = sysfs_get_classdev_attr(class_dev_parent, dev->sysfs_file);
- if (tmpattr)
- goto label_found;
-
- /* look in the class device directory if present */
- if (class_dev_parent->sysdevice) {
- tmpattr = sysfs_get_device_attr(class_dev_parent->sysdevice, dev->sysfs_file);
- if (tmpattr)
- goto label_found;
- }
-
- }
- }
- if (class_dev_parent)
- sysfs_close_class_device(class_dev_parent);
-
continue;
label_found:
tmpattr->value[strlen(tmpattr->value)-1] = 0x00;
dbg_parse("file '%s' found with value '%s' compare with '%s'", dev->sysfs_file, tmpattr->value, dev->sysfs_value);
- if (strcmp(dev->sysfs_value, tmpattr->value) != 0) {
- if (class_dev_parent)
- sysfs_close_class_device(class_dev_parent);
+ if (strcmp(dev->sysfs_value, tmpattr->value) != 0)
continue;
- }
strcpy(udev->name, dev->name);
if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
dbg_parse("file '%s' with value '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
dev->sysfs_file, dev->sysfs_value, udev->name,
dev->owner, dev->group, dev->mode);
- if (class_dev_parent)
- sysfs_close_class_device(class_dev_parent);
goto done;
break;
}
case NUMBER:
{
char path[SYSFS_PATH_MAX];
- char *temp;
found = 0;
- if (!class_dev->sysdevice)
+ if (!sysfs_device)
continue;
- strcpy(path, class_dev->sysdevice->path);
+ strcpy(path, sysfs_device->path);
temp = strrchr(path, '/');
dbg_parse("NUMBER path = '%s'", path);
dbg_parse("NUMBER temp = '%s' id = '%s'", temp, dev->id);
case TOPOLOGY:
{
char path[SYSFS_PATH_MAX];
- char *temp;
- if (!class_dev->sysdevice)
+ if (!sysfs_device)
continue;
found = 0;
- strcpy(path, class_dev->sysdevice->path);
+ strcpy(path, sysfs_device->path);
temp = strrchr(path, '/');
dbg_parse("TOPOLOGY path = '%s'", path);
dbg_parse("TOPOLOGY temp = '%s' place = '%s'", temp, dev->place);
goto done;
break;
}
- case CALLOUT:
- {
- char value[ID_SIZE];
-
- if (exec_callout(dev, value, sizeof(value)))
- continue;
- if (strncmp(value, dev->id, sizeof(value)) != 0)
- continue;
- strcpy(udev->name, dev->name);
- if (dev->mode != 0) {
- udev->mode = dev->mode;
- strcpy(udev->owner, dev->owner);
- strcpy(udev->group, dev->group);
- }
- dbg_parse("device callout '%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
- dev->id, udev->name,
- dev->owner, dev->group, dev->mode);
- goto done;
- break;
- }
- case REPLACE:
- if (strcmp(dev->kernel_name, class_dev->name) != 0)
- continue;
- strcpy(udev->name, dev->name);
- if (dev->mode != 0) {
- udev->mode = dev->mode;
- strcpy(udev->owner, dev->owner);
- strcpy(udev->group, dev->group);
- }
- dbg_parse("'%s' becomes '%s' - owner = %s, group = %s, mode = %#o",
- dev->kernel_name, udev->name,
- dev->owner, dev->group, dev->mode);
- goto done;
- break;
case KERNEL_NAME:
- break;
default:
- dbg_parse("Unknown type of device '%d'", dev->type);
break;
}
}
+
+ /* rules are looked at in priority order */
+
+ retval = do_callout(class_dev, udev);
+ if (retval == 0)
+ goto done;
+
+ retval = do_replace(class_dev, udev);
+ if (retval == 0)
+ goto done;
+
strcpy(udev->name, class_dev->name);
done:
udev->owner[0] = 0x00;
udev->group[0] = 0x00;
}
- return retval;
+
+ if (class_dev_parent)
+ sysfs_close_class_device(class_dev_parent);
+
+ return 0;
}
int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *dev)
~ianmdlvl / elogind.git / blobdiff