[PATCH] added dri rule to the default config file.

[elogind.git] / namedev.c

diff --git a/namedev.c b/namedev.c
index e474b48e57fbb973221e50b68b13cb3f6e671c0f..e502ba1a394fbb1611615b1568cd7ccaac310c80 100644 (file)
--- a/namedev.c
+++ b/namedev.c
@@ -104,12 +104,11 @@ static int strcmp_pattern(const char *p, const char *s)
 
 int add_perm_dev(struct perm_device *new_dev)
 {
-       struct list_head *tmp;
+       struct perm_device *dev;
        struct perm_device *tmp_dev;
 
        /* update the values if we already have the device */
-       list_for_each(tmp, &perm_device_list) {
-               struct perm_device *dev = list_entry(tmp, struct perm_device, node);
+       list_for_each_entry(dev, &perm_device_list, node) {
                if (strcmp_pattern(new_dev->name, dev->name))
                        continue;
                copy_var(dev, new_dev, mode);
@@ -130,11 +129,9 @@ int add_perm_dev(struct perm_device *new_dev)
 
 static struct perm_device *find_perm(char *name)
 {
-       struct list_head *tmp;
-       struct perm_device *perm = NULL;
+       struct perm_device *perm;
 
-       list_for_each(tmp, &perm_device_list) {
-               perm = list_entry(tmp, struct perm_device, node);
+       list_for_each_entry(perm, &perm_device_list, node) {
                if (strcmp_pattern(perm->name, name))
                        continue;
                return perm;
@@ -200,11 +197,12 @@ static void apply_format(struct udevice *udev, unsigned char *string)
                        case 'D':
                                if (strlen(udev->kernel_number) == 0) {
                                        strcat(pos, "disc");
+                                       dbg("substitute devfs disc");
                                        break;
                                }
                                strcat(pos, "part");
                                strcat(pos, udev->kernel_number);
-                               dbg("substitute kernel number '%s'", udev->kernel_number);
+                               dbg("substitute devfs part '%s'", udev->kernel_number);
                                break;
                        case 'm':
                                sprintf(pos, "%u", udev->minor);
@@ -229,8 +227,10 @@ static void apply_format(struct udevice *udev, unsigned char *string)
                                                        break;
                                                }
                                        }
-                                       strcat(pos, pos3);
-                                       dbg("substitute partial callout output '%s'", pos3);
+                                       if (pos3) {
+                                               strcat(pos, pos3);
+                                               dbg("substitute partial callout output '%s'", pos3);
+                                       }
                                } else {
                                        strcat(pos, udev->callout_value);
                                        dbg("substitute callout output '%s'", udev->callout_value);
@@ -252,6 +252,7 @@ static struct bus_file {
 } bus_files[] = {
        { .bus = "scsi",        .file = "vendor" },
        { .bus = "usb",         .file = "idVendor" },
+       { .bus = "ide",         .file = "detach_state" },
        { .bus = "pci",         .file = "vendor" },
        {}
 };
@@ -297,7 +298,28 @@ exit:
        return; /* here to prevent compiler warning... */
 }
 
-static int exec_callout(struct config_device *dev, char *value, int len)
+static int do_ignore(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
+{
+       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 != IGNORE)
+                       continue;
+
+               dbg("compare name '%s' with '%s'", dev->kernel_name, class_dev->name);
+               if (strcmp_pattern(dev->kernel_name, class_dev->name) != 0)
+                       continue;
+
+               dbg("found name, '%s' will be ignored", dev->kernel_name);
+
+               return 0;
+       }
+       return -ENODEV;
+}
+
+static int exec_program(char *path, char *value, int len)
 {
        int retval;
        int res;
@@ -310,7 +332,7 @@ static int exec_callout(struct config_device *dev, char *value, int len)
        char *args[CALLOUT_MAXARG];
        int i;
 
-       dbg("callout to '%s'", dev->exec_program);
+       dbg("callout to '%s'", path);
        retval = pipe(fds);
        if (retval != 0) {
                dbg("pipe failed");
@@ -326,9 +348,9 @@ static int exec_callout(struct config_device *dev, char *value, int len)
                /* child */
                close(STDOUT_FILENO);
                dup(fds[1]);    /* dup write side of pipe to STDOUT */
-               if (strchr(dev->exec_program, ' ')) {
+               if (strchr(path, ' ')) {
                        /* callout with arguments */
-                       pos = dev->exec_program;
+                       pos = path;
                        for (i=0; i < CALLOUT_MAXARG-1; i++) {
                                args[i] = strsep(&pos, " ");
                                if (args[i] == NULL)
@@ -340,7 +362,7 @@ static int exec_callout(struct config_device *dev, char *value, int len)
                        }
                        retval = execve(args[0], args, main_envp);
                } else {
-                       retval = execve(dev->exec_program, main_argv, main_envp);
+                       retval = execve(path, main_argv, main_envp);
                }
                if (retval != 0) {
                        dbg("child execve failed");
@@ -379,12 +401,10 @@ static int exec_callout(struct config_device *dev, char *value, int len)
                        retval = -1;
                }
 
-#ifndef __KLIBC__
                if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) {
                        dbg("callout program status 0x%x", status);
                        retval = -1;
                }
-#endif
        }
        return retval;
 }
@@ -392,14 +412,15 @@ static int exec_callout(struct config_device *dev, char *value, int len)
 static int do_callout(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
 {
        struct config_device *dev;
-       struct list_head *tmp;
 
-       list_for_each(tmp, &config_device_list) {
-               dev = list_entry(tmp, struct config_device, node);
+       list_for_each_entry(dev, &config_device_list, node) {
                if (dev->type != CALLOUT)
                        continue;
 
-               if (sysfs_device) {
+               if (dev->bus[0] != '\0') {
+                       /* as the user specified a bus, we must match it up */
+                       if (!sysfs_device)
+                               continue;
                        dbg("dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
                        if (strcasecmp(dev->bus, sysfs_device->bus) != 0)
                                continue;
@@ -407,7 +428,7 @@ static int do_callout(struct sysfs_class_device *class_dev, struct udevice *udev
 
                /* substitute anything that needs to be in the program name */
                apply_format(udev, dev->exec_program);
-               if (exec_callout(dev, udev->callout_value, NAME_SIZE))
+               if (exec_program(dev->exec_program, udev->callout_value, NAME_SIZE))
                        continue;
                if (strcmp_pattern(dev->id, udev->callout_value) != 0)
                        continue;
@@ -461,16 +482,17 @@ static int do_label(struct sysfs_class_device *class_dev, struct udevice *udev,
 {
        struct sysfs_pair *pair;
        struct config_device *dev;
-       struct list_head *tmp;
        int i;
        int match;
 
-       list_for_each(tmp, &config_device_list) {
-               dev = list_entry(tmp, struct config_device, node);
+       list_for_each_entry(dev, &config_device_list, node) {
                if (dev->type != LABEL)
                        continue;
 
-               if (sysfs_device) {
+               if (dev->bus[0] != '\0') {
+                       /* as the user specified a bus, we must match it up */
+                       if (!sysfs_device)
+                               continue;
                        dbg("dev->bus='%s' sysfs_device->bus='%s'", dev->bus, sysfs_device->bus);
                        if (strcasecmp(dev->bus, sysfs_device->bus) != 0)
                                continue;
@@ -503,7 +525,6 @@ static int do_label(struct sysfs_class_device *class_dev, struct udevice *udev,
 static int do_number(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
 {
        struct config_device *dev;
-       struct list_head *tmp;
        char path[SYSFS_PATH_MAX];
        int found;
        char *temp = NULL;
@@ -512,8 +533,7 @@ static int do_number(struct sysfs_class_device *class_dev, struct udevice *udev,
        if (!sysfs_device)
                return -ENODEV;
 
-       list_for_each(tmp, &config_device_list) {
-               dev = list_entry(tmp, struct config_device, node);
+       list_for_each_entry(dev, &config_device_list, node) {
                if (dev->type != NUMBER)
                        continue;
 
@@ -548,7 +568,6 @@ static int do_number(struct sysfs_class_device *class_dev, struct udevice *udev,
 static int do_topology(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
 {
        struct config_device *dev;
-       struct list_head *tmp;
        char path[SYSFS_PATH_MAX];
        int found;
        char *temp = NULL;
@@ -557,8 +576,7 @@ static int do_topology(struct sysfs_class_device *class_dev, struct udevice *ude
        if (!sysfs_device)
                return -ENODEV;
 
-       list_for_each(tmp, &config_device_list) {
-               dev = list_entry(tmp, struct config_device, node);
+       list_for_each_entry(dev, &config_device_list, node) {
                if (dev->type != TOPOLOGY)
                        continue;
 
@@ -594,10 +612,8 @@ static int do_topology(struct sysfs_class_device *class_dev, struct udevice *ude
 static int do_replace(struct sysfs_class_device *class_dev, struct udevice *udev, struct sysfs_device *sysfs_device)
 {
        struct config_device *dev;
-       struct list_head *tmp;
 
-       list_for_each(tmp, &config_device_list) {
-               dev = list_entry(tmp, struct config_device, node);
+       list_for_each_entry(dev, &config_device_list, node) {
                if (dev->type != REPLACE)
                        continue;
 
@@ -645,9 +661,9 @@ static struct sysfs_device *get_sysfs_device(struct sysfs_class_device *class_de
                if (isdigit(class_dev->path[strlen(class_dev->path)-1])) {
                        temp = strrchr(filename, '/');
                        if (temp) {
+                               char *temp2 = strrchr(filename, '/');
                                partition = 1;
                                *temp = 0x00;
-                               char *temp2 = strrchr(filename, '/');
                                dbg("temp2 = %s", temp2);
                                if (temp2 && (strcmp(temp2, "/block") == 0)) {
                                        /* oops, we have no parent block device, so go back to original directory */
@@ -737,6 +753,12 @@ int namedev_name_device(struct sysfs_class_device *class_dev, struct udevice *ud
        dbg("kernel_number='%s'", udev->kernel_number);
 
        /* rules are looked at in priority order */
+       retval = do_ignore(class_dev, udev, sysfs_device);
+       if (retval == 0) {
+               dbg("name, '%s' is being ignored", class_dev->name);
+               return 1;
+       }
+
        retval = do_callout(class_dev, udev, sysfs_device);
        if (retval == 0)
                goto found;