static int get_major_minor(struct sysfs_class_device *class_dev, struct udevice *udev)
{
int retval = -ENODEV;
+ struct sysfs_attribute *attr = NULL;
- char *dev;
-
- dev = sysfs_get_value_from_attributes(class_dev->directory->attributes, "dev");
- if (dev == NULL)
+ attr = sysfs_get_classdev_attr(class_dev, "dev");
+ if (attr == NULL)
goto exit;
+ dbg("dev='%s'", attr->value);
- dbg("dev='%s'", dev);
-
- if (sscanf(dev, "%u:%u", &udev->major, &udev->minor) != 2)
+ if (sscanf(attr->value, "%u:%u", &udev->major, &udev->minor) != 2)
goto exit;
-
dbg("found major=%d, minor=%d", udev->major, udev->minor);
retval = 0;
return 0;
}
-/*
- * we possibly want to add some symlinks here
- * only numeric owner/group id's are supported
- */
static int create_node(struct udevice *dev)
{
char filename[255];
char linktarget[255];
+ char *linkname;
+ char *symlinks;
int retval = 0;
uid_t uid = 0;
gid_t gid = 0;
int i;
int tail;
-
strncpy(filename, udev_root, sizeof(filename));
strncat(filename, dev->name, sizeof(filename));
filename, uid, gid, strerror(errno));
}
-
/* create symlink if requested */
if (*dev->symlink) {
- strncpy(filename, udev_root, sizeof(filename));
- strncat(filename, dev->symlink, sizeof(filename));
- dbg("symlink '%s' to node '%s' requested", filename, dev->name);
- if (strrchr(dev->symlink, '/'))
- create_path(filename);
-
- /* optimize relative link */
- linktarget[0] = '\0';
- i = 0;
- tail = 0;
- while ((dev->name[i] == dev->symlink[i]) && dev->name[i]) {
- if (dev->name[i] == '/')
- tail = i+1;
- i++;
- }
- while (dev->symlink[i]) {
- if (dev->symlink[i] == '/')
- strcat(linktarget, "../");
- i++;
- }
+ symlinks = dev->symlink;
+ while (1) {
+ linkname = strsep(&symlinks, " ");
+ if (linkname == NULL)
+ break;
+
+ strncpy(filename, udev_root, sizeof(filename));
+ strncat(filename, linkname, sizeof(filename));
+ dbg("symlink '%s' to node '%s' requested", filename, dev->name);
+ if (strrchr(linkname, '/'))
+ create_path(filename);
+
+ /* optimize relative link */
+ linktarget[0] = '\0';
+ i = 0;
+ tail = 0;
+ while ((dev->name[i] == linkname[i]) && dev->name[i]) {
+ if (dev->name[i] == '/')
+ tail = i+1;
+ i++;
+ }
+ while (linkname[i]) {
+ if (linkname[i] == '/')
+ strcat(linktarget, "../");
+ i++;
+ }
- if (*linktarget == '\0')
- strcpy(linktarget, "./");
- strcat(linktarget, &dev->name[tail]);
+ if (*linktarget == '\0')
+ strcpy(linktarget, "./");
+ strcat(linktarget, &dev->name[tail]);
- dbg("symlink(%s, %s)", linktarget, filename);
- retval = symlink(linktarget, filename);
- if (retval)
- dbg("symlink(%s, %s) failed with error '%s'",
- linktarget, filename, strerror(errno));
+ dbg("symlink(%s, %s)", linktarget, filename);
+ retval = symlink(linktarget, filename);
+ if (retval)
+ dbg("symlink(%s, %s) failed with error '%s'",
+ linktarget, filename, strerror(errno));
+ }
}
return retval;
strcpy(dev_path, sysfs_path);
strcat(dev_path, device_name);
-
dbg("looking at '%s'", dev_path);
/* open up the sysfs class device for this thing... */
- class_dev = sysfs_open_class_device(dev_path);
+ class_dev = sysfs_open_class_device_path(dev_path);
if (class_dev == NULL) {
- dbg ("sysfs_open_class_device failed");
+ dbg ("sysfs_open_class_device_path failed");
goto exit;
}
dbg("class_dev->name='%s'", class_dev->name);