#include <sys/stat.h>
#include "logging.h"
+#include "udev_version.h"
#include "libsysfs/sysfs/libsysfs.h"
#ifdef LOG
}
#endif
-#define WAIT_MAX_SECONDS 5
+#define WAIT_MAX_SECONDS 10
#define WAIT_LOOP_PER_SECOND 20
/* wait for specific file to show up, normally the "dev"-file */
{ .subsystem = "net", .file = "ifindex" },
{ .subsystem = "scsi_host", .file = "unique_id" },
{ .subsystem = "scsi_device", .file = NULL },
- { .subsystem = "pcmcia_socket", .file = "card_type" },
+ { .subsystem = "pcmcia_socket", .file = NULL }, /* all files are unreadable in empty slot :( */
{ .subsystem = "usb_host", .file = NULL },
{ .subsystem = "bluetooth", .file = "address" },
+ { .subsystem = "firmware", .file = "data" },
+ { .subsystem = "i2c-adapter", .file = NULL },
+ { .subsystem = "pci_bus", .file = NULL },
+ { .subsystem = "ieee1394", .file = NULL },
+ { .subsystem = "ieee1394_host", .file = NULL },
+ { .subsystem = "ieee1394_node", .file = NULL },
{ NULL, NULL }
};
struct class_file *classfile;
return -1;
}
-/* skip waiting for physical device */
+/* check if we need to wait for a physical device */
static int class_device_expect_no_device_link(struct sysfs_class_device *class_dev)
{
- static char *devices_without_link[] = {
- "nb",
- "ram",
- "loop",
- "fd",
- "md",
- "dos_cd",
- "double",
- "flash",
- "msd",
- "rflash",
- "rom",
- "rrom",
- "sbpcd",
- "pcd",
- "pf",
- "scd",
- "sit",
- "lp",
- "ubd",
- "vcs",
- "vcsa",
- "console",
- "tty",
- "ttyS",
- NULL
+ /* 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;
+ } class_device[] = {
+ { .subsystem = "block", .device = "double" },
+ { .subsystem = "block", .device = "nb" },
+ { .subsystem = "block", .device = "ram" },
+ { .subsystem = "block", .device = "loop" },
+ { .subsystem = "block", .device = "fd" },
+ { .subsystem = "block", .device = "md" },
+ { .subsystem = "block", .device = "dos_cd" },
+ { .subsystem = "block", .device = "rflash" },
+ { .subsystem = "block", .device = "rom" },
+ { .subsystem = "block", .device = "rrom" },
+ { .subsystem = "block", .device = "flash" },
+ { .subsystem = "block", .device = "msd" },
+ { .subsystem = "block", .device = "sbpcd" },
+ { .subsystem = "block", .device = "pcd" },
+ { .subsystem = "block", .device = "pf" },
+ { .subsystem = "block", .device = "scd" },
+ { .subsystem = "block", .device = "ubd" },
+ { .subsystem = "input", .device = "event" },
+ { .subsystem = "input", .device = "mice" },
+ { .subsystem = "input", .device = "mouse" },
+ { .subsystem = "input", .device = "ts" },
+ { .subsystem = "vc", .device = NULL },
+ { .subsystem = "tty", .device = NULL },
+ { .subsystem = "cpuid", .device = "cpu" },
+ { .subsystem = "graphics", .device = "fb" },
+ { .subsystem = "mem", .device = NULL },
+ { .subsystem = "misc", .device = NULL },
+ { .subsystem = "msr", .device = NULL },
+ { .subsystem = "netlink", .device = NULL },
+ { .subsystem = "net", .device = "sit" },
+ { .subsystem = "net", .device = "ppp" },
+ { .subsystem = "net", .device = "lo" },
+ { .subsystem = "net", .device = "tap" },
+ { .subsystem = "net", .device = "ipsec" },
+ { .subsystem = "net", .device = "irda" },
+ { .subsystem = "sound", .device = NULL },
+ { .subsystem = "printer", .device = "lp" },
+ { .subsystem = "nvidia", .device = NULL },
+ { .subsystem = "video4linux", .device = "vbi" },
+ { .subsystem = "lirc", .device = NULL },
+ { .subsystem = "firmware", .device = NULL },
+ { .subsystem = "drm", .device = NULL },
+ { .subsystem = "pci_bus", .device = NULL },
+ { .subsystem = "ieee1394", .device = NULL },
+ { .subsystem = "ieee1394_host", .device = NULL },
+ { .subsystem = "ieee1394_node", .device = NULL },
+ { .subsystem = "raw", .device = NULL },
+ { NULL, NULL }
};
- char **device;
+ struct class_device *classdevice;
+ int len;
- for (device = devices_without_link; *device != NULL; device++) {
- int len = strlen(*device);
+ for (classdevice = class_device; classdevice->subsystem != NULL; classdevice++) {
+ if (strcmp(class_dev->classname, classdevice->subsystem) == 0) {
+ /* see if no device in this class is expected to have a device-link */
+ if (classdevice->device == NULL)
+ return 1;
- /* look if name matches */
- if (strncmp(class_dev->name, *device, len) != 0)
- continue;
+ len = strlen(classdevice->device);
- /* exact match */
- if (strlen(class_dev->name) == len)
- return 1;
+ /* see if device name matches */
+ if (strncmp(class_dev->name, classdevice->device, len) != 0)
+ continue;
- /* instance numbers are matching too */
- if (isdigit(class_dev->name[len]))
- return 1;
+ /* exact name match */
+ if (strlen(class_dev->name) == len)
+ return 1;
+
+ /* name match with instance number */
+ if (isdigit(class_dev->name[len]))
+ return 1;
+ }
}
return 0;
{
static char *devices_without_bus[] = {
"scsi_host",
+ "i2c-adapter",
NULL
};
char **device;
{ .bus = "ide", .file = "detach_state" },
{ .bus = "pci", .file = "vendor" },
{ .bus = "platform", .file = "detach_state" },
+ { .bus = "i2c", .file = "detach_state" },
{ NULL }
};
struct bus_file *busfile;
if (rc == 0)
dbg("result: waiting for sysfs successful '%s'", devpath);
else
- info("error: wait_for_sysfs needs an update to handle the device '%s' "
- "properly, please report to <linux-hotplug-devel@lists.sourceforge.net>",
- devpath);
+ info("either wait_for_sysfs (udev %s) needs an update to handle the device '%s' "
+ "properly (%d) or the sysfs-support of your device's driver needs to be fixed, "
+ "please report to <linux-hotplug-devel@lists.sourceforge.net>",
+ UDEV_VERSION, devpath, rc);
return rc;
}
~ianmdlvl / elogind.git / blobdiff