#include "udev.h"
+_printf_(2,3)
static int path_prepend(char **path, const char *fmt, ...)
{
va_list va;
/* address method 0, peripheral device addressing with bus id of zero */
if (lun < 256)
- return path_prepend(path, "lun-%d", lun);
+ return path_prepend(path, "lun-%lu", lun);
/* handle all other lun addressing methods by using a variant of the original lun format */
- return path_prepend(path, "lun-0x%04x%04x00000000", (lun & 0xffff), (lun >> 16) & 0xffff);
+ return path_prepend(path, "lun-0x%04lx%04lx00000000", lun & 0xffff, (lun >> 16) & 0xffff);
}
static struct udev_device *skip_subsystem(struct udev_device *dev, const char *subsys)
const char *subsystem;
subsystem = udev_device_get_subsystem(parent);
- if (subsystem == NULL || strcmp(subsystem, subsys) != 0)
+ if (subsystem == NULL || !streq(subsystem, subsys))
break;
dev = parent;
parent = udev_device_get_parent(parent);
const char *id;
devtype = udev_device_get_devtype(parent);
- if (devtype == NULL || strcmp(devtype, "scsi_device") != 0)
+ if (devtype == NULL || !streq(devtype, "scsi_device"))
return parent;
/* firewire */
devtype = udev_device_get_devtype(parent);
if (devtype == NULL)
return parent;
- if (strcmp(devtype, "usb_interface") != 0 && strcmp(devtype, "usb_device") != 0)
+ if (!streq(devtype, "usb_interface") && !streq(devtype, "usb_device"))
return parent;
str = udev_device_get_sysname(parent);
return parent;
}
+static struct udev_device *handle_bcma(struct udev_device *parent, char **path)
+{
+ const char *sysname;
+ unsigned int core;
+
+ sysname = udev_device_get_sysname(parent);
+ if (sscanf(sysname, "bcma%*u:%u", &core) != 1)
+ return NULL;
+
+ path_prepend(path, "bcma-%u", core);
+ return parent;
+}
+
static struct udev_device *handle_ccw(struct udev_device *parent, struct udev_device *dev, char **path)
{
struct udev_device *scsi_dev;
subsys = udev_device_get_subsystem(parent);
if (subsys == NULL) {
;
- } else if (strcmp(subsys, "scsi_tape") == 0) {
+ } else if (streq(subsys, "scsi_tape")) {
handle_scsi_tape(parent, &path);
- } else if (strcmp(subsys, "scsi") == 0) {
+ } else if (streq(subsys, "scsi")) {
parent = handle_scsi(parent, &path);
some_transport = true;
- } else if (strcmp(subsys, "cciss") == 0) {
+ } else if (streq(subsys, "cciss")) {
parent = handle_cciss(parent, &path);
some_transport = true;
- } else if (strcmp(subsys, "usb") == 0) {
+ } else if (streq(subsys, "usb")) {
parent = handle_usb(parent, &path);
some_transport = true;
- } else if (strcmp(subsys, "serio") == 0) {
+ } else if (streq(subsys, "bcma")) {
+ parent = handle_bcma(parent, &path);
+ some_transport = true;
+ } else if (streq(subsys, "serio")) {
path_prepend(&path, "serio-%s", udev_device_get_sysnum(parent));
parent = skip_subsystem(parent, "serio");
- } else if (strcmp(subsys, "pci") == 0) {
+ } else if (streq(subsys, "pci")) {
path_prepend(&path, "pci-%s", udev_device_get_sysname(parent));
parent = skip_subsystem(parent, "pci");
- } else if (strcmp(subsys, "platform") == 0) {
+ } else if (streq(subsys, "platform")) {
path_prepend(&path, "platform-%s", udev_device_get_sysname(parent));
parent = skip_subsystem(parent, "platform");
some_transport = true;
- } else if (strcmp(subsys, "acpi") == 0) {
+ } else if (streq(subsys, "acpi")) {
path_prepend(&path, "acpi-%s", udev_device_get_sysname(parent));
parent = skip_subsystem(parent, "acpi");
- } else if (strcmp(subsys, "xen") == 0) {
+ } else if (streq(subsys, "xen")) {
path_prepend(&path, "xen-%s", udev_device_get_sysname(parent));
parent = skip_subsystem(parent, "xen");
- } else if (strcmp(subsys, "virtio") == 0) {
+ } else if (streq(subsys, "virtio")) {
path_prepend(&path, "virtio-pci-%s", udev_device_get_sysname(parent));
parent = skip_subsystem(parent, "virtio");
- } else if (strcmp(subsys, "scm") == 0) {
+ } else if (streq(subsys, "scm")) {
path_prepend(&path, "scm-%s", udev_device_get_sysname(parent));
parent = skip_subsystem(parent, "scm");
+ some_transport = true;
}
parent = udev_device_get_parent(parent);