#include <errno.h>
#include <sys/stat.h>
-#include "logging.h"
+#include "libsysfs/sysfs/libsysfs.h"
#include "udev_version.h"
#include "udev_sysfs.h"
-#include "libsysfs/sysfs/libsysfs.h"
+#include "udev_utils.h"
+#include "logging.h"
-/* list of subsystem specific files
- * NULL if there is no file to wait for
- */
-static struct subsystem_file {
- char *subsystem;
- char *file;
+/* list of subsystem specific files, NULL if there is no file to wait for */
+static const struct subsystem_file {
+ const char *subsystem;
+ const char *file;
} subsystem_files[] = {
+ { .subsystem = "class", .file = NULL },
{ .subsystem = "net", .file = "ifindex" },
{ .subsystem = "scsi_host", .file = "unique_id" },
{ .subsystem = "scsi_device", .file = NULL },
{ .subsystem = "ieee1394", .file = NULL },
{ .subsystem = "ieee1394_host", .file = NULL },
{ .subsystem = "ieee1394_node", .file = NULL },
+ { .subsystem = "fc_transport", .file = "port_id" },
+ { .subsystem = "fc_host", .file = "port_id" },
+ { .subsystem = "spi_transport", .file = "width" },
+ { .subsystem = "spi_host", .file = "width" },
{ NULL, NULL }
};
+dev_t get_devt(struct sysfs_class_device *class_dev)
+{
+ struct sysfs_attribute *attr = NULL;
+ unsigned int major, minor;
+
+ attr = sysfs_get_classdev_attr(class_dev, "dev");
+ if (attr == NULL)
+ return 0;
+ dbg("dev='%s'", attr->value);
+
+ if (sscanf(attr->value, "%u:%u", &major, &minor) != 2)
+ return 0;
+ dbg("found major=%d, minor=%d", major, minor);
+
+ return makedev(major, minor);
+}
+
int subsystem_expect_no_dev(const char *subsystem)
{
- struct subsystem_file *file;
+ const struct subsystem_file *file;
for (file = subsystem_files; file->subsystem != NULL; file++)
if (strcmp(subsystem, file->subsystem) == 0)
}
/* get subsystem specific files, returns "dev" if no other found */
-static char *get_subsystem_specific_file(const char *subsystem)
+static const char *get_subsystem_specific_file(const char *subsystem)
{
- struct subsystem_file *file;
+ const struct subsystem_file *file;
/* look if we want to look for another file instead of "dev" */
for (file = subsystem_files; file->subsystem != NULL; file++)
{
/* list of devices without a "device" symlink to the physical device
* if device is set to NULL, no devices in that subsystem has a link */
- static struct class_device {
- char *subsystem;
- char *device;
+ static const struct class_device {
+ const char *subsystem;
+ const char *device;
} class_device[] = {
{ .subsystem = "block", .device = "double" },
{ .subsystem = "block", .device = "nb" },
{ .subsystem = "block", .device = "scd" },
{ .subsystem = "block", .device = "ubd" },
{ .subsystem = "block", .device = "dm-" },
+ { .subsystem = "block", .device = "bcrypt" },
{ .subsystem = "input", .device = "event" },
{ .subsystem = "input", .device = "mice" },
{ .subsystem = "input", .device = "mouse" },
{ .subsystem = "input", .device = "ts" },
+ { .subsystem = "input", .device = "js" },
{ .subsystem = "vc", .device = NULL },
{ .subsystem = "tty", .device = NULL },
{ .subsystem = "cpuid", .device = "cpu" },
{ .subsystem = "net", .device = "pan" },
{ .subsystem = "net", .device = "bnep" },
{ .subsystem = "net", .device = "vmnet" },
+ { .subsystem = "net", .device = "ippp" },
+ { .subsystem = "net", .device = "nlv" },
+ { .subsystem = "net", .device = "atml" },
{ .subsystem = "ppp", .device = NULL },
{ .subsystem = "sound", .device = NULL },
{ .subsystem = "printer", .device = "lp" },
+ { .subsystem = "ppdev", .device = NULL },
{ .subsystem = "nvidia", .device = NULL },
{ .subsystem = "video4linux", .device = "vbi" },
{ .subsystem = "dvb", .device = NULL },
{ .subsystem = "capi", .device = NULL },
{ NULL, NULL }
};
- struct class_device *classdevice;
- int len;
+ const struct class_device *classdevice;
+ unsigned int len;
+
+ /* the kernel may tell us what to wait for */
+ if (kernel_release_satisfactory(2,6,10) > 0)
+ if (getenv("PHYSDEVPATH") == NULL) {
+ dbg("the kernel says, that there is no physical device for '%s'", class_dev->path);
+ return 1;
+ }
for (classdevice = class_device; classdevice->subsystem != NULL; classdevice++) {
if (strcmp(class_dev->classname, classdevice->subsystem) == 0) {
return 0;
}
-/* skip waiting for the bus */
+/* skip waiting for the bus of the devices device */
static int class_device_expect_no_bus(struct sysfs_class_device *class_dev)
{
- static char *devices_without_bus[] = {
+ static const char *devices_without_bus[] = {
"scsi_host",
"i2c-adapter",
"i2c-dev",
NULL
};
- char **device;
+ const char **device;
for (device = devices_without_bus; *device != NULL; device++) {
int len = strlen(*device);
return 0;
}
-/* wait for the bus and for a bus specific file to show up */
-int wait_for_bus_device(struct sysfs_device *devices_dev,
+/* wait for a devices device specific file to show up */
+int wait_for_devices_device(struct sysfs_device *devices_dev,
const char **error)
{
- static struct bus_file {
- char *bus;
- char *file;
- } bus_files[] = {
+ static const struct device_file {
+ const char *bus;
+ const char *file;
+ } device_files[] = {
{ .bus = "scsi", .file = "vendor" },
{ .bus = "usb", .file = "idVendor" },
{ .bus = "usb", .file = "iInterface" },
{ .bus = "ide", .file = "detach_state" },
{ .bus = "pci", .file = "vendor" },
{ .bus = "platform", .file = "detach_state" },
+ { .bus = "pcmcia", .file = "detach_state" },
{ .bus = "i2c", .file = "detach_state" },
{ .bus = "ieee1394", .file = "node_count" },
{ .bus = "ieee1394", .file = "nodeid" },
{ .bus = "ieee1394", .file = "address" },
+ { .bus = "bttv-sub", .file = NULL },
+ { .bus = "pnp", .file = "detach_state" },
+ { .bus = "eisa", .file = "detach_state" },
+ { .bus = "serio", .file = "detach_state" },
+ { .bus = "pseudo", .file = "detach_state" },
+ { .bus = "mmc", .file = "detach_state" },
+ { .bus = "macio", .file = "detach_state" },
+ { .bus = "of_platform", .file = "detach_state" },
+ { .bus = "vio", .file = "detach_state" },
+ { .bus = "ecard", .file = "detach_state" },
+ { .bus = "sa1111-rab", .file = "detach_state" },
+ { .bus = "amba", .file = "detach_state" },
+ { .bus = "locomo-bus", .file = "detach_state" },
+ { .bus = "logicmodule", .file = "detach_state" },
+ { .bus = "parisc", .file = "detach_state" },
+ { .bus = "ocp", .file = "detach_state" },
+ { .bus = "dio", .file = "detach_state" },
+ { .bus = "MCA", .file = "detach_state" },
+ { .bus = "wl", .file = "detach_state" },
+ { .bus = "ccwgroup", .file = "detach_state" },
+ { .bus = "css", .file = "detach_state" },
+ { .bus = "ccw", .file = "detach_state" },
+ { .bus = "iucv", .file = "detach_state" },
{ NULL, NULL }
};
- struct bus_file *busfile;
+ const struct device_file *devicefile = NULL;
int loop;
+ /* the kernel may tell us what to wait for */
+ if (kernel_release_satisfactory(2,6,10) > 0)
+ if (getenv("PHYSDEVBUS") == NULL) {
+ dbg("the kernel says, that there is no bus for '%s'", devices_dev->path);
+ return 0;
+ }
+
/* wait for the bus device link to the devices device */
loop = WAIT_MAX_SECONDS * WAIT_LOOP_PER_SECOND;
while (--loop) {
}
dbg("bus device link found for bus '%s'", devices_dev->bus);
- /* wait for a bus specific file to show up */
+ /* wait for a bus device specific file to show up */
loop = WAIT_MAX_SECONDS * WAIT_LOOP_PER_SECOND;
while (--loop) {
int found_bus_type = 0;
- for (busfile = bus_files; busfile->bus != NULL; busfile++) {
- if (strcmp(devices_dev->bus, busfile->bus) == 0) {
+ for (devicefile = device_files; devicefile->bus != NULL; devicefile++) {
+ if (strcmp(devices_dev->bus, devicefile->bus) == 0) {
char filename[SYSFS_PATH_MAX];
struct stat stats;
+ if (devicefile->file == NULL) {
+ dbg("bus '%s' has no file to wait for", devices_dev->bus);
+ return 0;
+ }
+
found_bus_type = 1;
- snprintf(filename, SYSFS_PATH_MAX-1, "%s/%s", devices_dev->path, busfile->file);
- dbg("looking at bus '%s' for specific file '%s'", devices_dev->bus, filename);
+ snprintf(filename, SYSFS_PATH_MAX-1, "%s/%s", devices_dev->path, devicefile->file);
+ dbg("looking at bus '%s' device for specific file '%s'", devices_dev->bus, filename);
if (stat(filename, &stats) == 0) {
- dbg("bus '%s' specific file '%s' found", devices_dev->bus, busfile->file);
+ dbg("bus '%s' device specific file '%s' found", devices_dev->bus, devicefile->file);
return 0;
}
}
usleep(1000 * 1000 / WAIT_LOOP_PER_SECOND);
}
- dbg("error: getting bus '%s' specific file '%s'", devices_dev->bus, busfile->file);
+ dbg("error: getting '%s' device specific file '%s'", devices_dev->bus, devicefile->file);
if (error)
- *error = "bus specific file unavailable";
+ *error = "bus device specific file unavailable";
return -1;
}
-struct sysfs_class_device *open_class_device_wait(const char *path)
+struct sysfs_class_device *wait_class_device_open(const char *path)
{
- struct sysfs_class_device *class_dev;
+ struct sysfs_class_device *class_dev = NULL;
int loop;
loop = WAIT_MAX_SECONDS * WAIT_LOOP_PER_SECOND;
usleep(1000 * 1000 / WAIT_LOOP_PER_SECOND);
}
- return (class_dev);
+ return class_dev;
}
int wait_for_class_device(struct sysfs_class_device *class_dev,
/* skip devices without devices-link */
if (class_device_expect_no_device_link(class_dev)) {
dbg("no device symlink expected for '%s', ", class_dev->name);
- return -ENODEV;
+ return 0;
}
/* the symlink may be on the parent device */
}
dbg("device symlink found pointing to '%s'", devices_dev->path);
- /* wait for the bus value */
+ /* wait for the devices device */
if (class_device_expect_no_bus(class_dev)) {
dbg("no bus device expected for '%s', ", class_dev->classname);
return 0;
- } else {
- return wait_for_bus_device(devices_dev, error);
}
+
+ return wait_for_devices_device(devices_dev, error);
}
-struct sysfs_device *open_devices_device_wait(const char *path)
+struct sysfs_device *wait_devices_device_open(const char *path)
{
- struct sysfs_device *devices_dev;
+ struct sysfs_device *devices_dev = NULL;
int loop;
loop = WAIT_MAX_SECONDS * WAIT_LOOP_PER_SECOND;
usleep(1000 * 1000 / WAIT_LOOP_PER_SECOND);
}
- return(devices_dev);
+ return devices_dev;
}
~ianmdlvl / elogind.git / blobdiff