X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fusb_id%2Fusb_id.c;h=36477669c50e56618733958e8568100750d578ae;hp=489f97e5376da9a9953dc91c73be4d6e9b1165f1;hb=241e5a21f9ad7bc986e1bb74093adf9fdb98b170;hpb=7e827bcde81cc702f232a53d84506cf065274ded

diff --git a/extras/usb_id/usb_id.c b/extras/usb_id/usb_id.c
index 489f97e53..36477669c 100644
--- a/extras/usb_id/usb_id.c
+++ b/extras/usb_id/usb_id.c
@@ -38,14 +38,18 @@ static void log_fn(struct udev *udev, int priority,
 }
 
 static char vendor_str[64];
+static char vendor_str_enc[256];
+static const char *vendor_id = "";
 static char model_str[64];
 static char model_str_enc[256];
-static char vendor_str_enc[256];
+static const char *product_id = "";
 static char serial_str[UTIL_NAME_SIZE];
 static char packed_if_str[UTIL_NAME_SIZE];
 static char revision_str[64];
 static char type_str[64];
 static char instance_str[64];
+static const char *ifnum;
+static const char *driver;
 
 static int use_usb_info;
 static int use_num_info;
@@ -186,7 +190,7 @@ static int dev_if_packed_info(struct udev_device *dev, char *ifs_str, size_t len
 		u_int8_t	bInterfaceProtocol;
 		u_int8_t	iInterface;
 	} __attribute__((packed));
-	int err;
+	int err = 0;
 
 	if (asprintf(&filename, "%s/descriptors", udev_device_get_syspath(dev)) < 0) {
 		err = -1;
@@ -233,14 +237,13 @@ static int dev_if_packed_info(struct udev_device *dev, char *ifs_str, size_t len
 	}
 out:
 	free(filename);
-	return 0;
+	return err;
 }
 
 /*
  * A unique USB identification is generated like this:
  *
- * 1.) Get the USB device type from DeviceClass, InterfaceClass
- *     and InterfaceSubClass
+ * 1.) Get the USB device type from InterfaceClass and InterfaceSubClass
  * 2.) If the device type is 'Mass-Storage/SPC-2' or 'Mass-Storage/RBC'
  *     use the SCSI vendor and model as USB-Vendor and USB-model.
  * 3.) Otherwise use the USB manufacturer and product as
@@ -257,14 +260,21 @@ out:
 static int usb_id(struct udev_device *dev)
 {
 	struct udev *udev = udev_device_get_udev(dev);
-	struct udev_device *dev_interface;
-	struct udev_device *dev_usb;
+	struct udev_device *dev_interface = NULL;
+	struct udev_device *dev_usb = NULL;
 	const char *if_class, *if_subclass;
 	int if_class_num;
 	int protocol = 0;
 
 	dbg(udev, "syspath %s\n", udev_device_get_syspath(dev));
 
+	/* shortcut, if we are called directly for a "usb_device" type */
+	if (udev_device_get_devtype(dev) != NULL && strcmp(udev_device_get_devtype(dev), "usb_device") == 0) {
+		dev_if_packed_info(dev, packed_if_str, sizeof(packed_if_str));
+		dev_usb = dev;
+		goto fallback;
+	}
+
 	/* usb interface directory */
 	dev_interface = udev_device_get_parent_with_subsystem_devtype(dev, "usb", "usb_interface");
 	if (dev_interface == NULL) {
@@ -273,6 +283,9 @@ static int usb_id(struct udev_device *dev)
 		return 1;
 	}
 
+	ifnum = udev_device_get_sysattr_value(dev_interface, "bInterfaceNumber");
+	driver = udev_device_get_sysattr_value(dev_interface, "driver");
+
 	if_class = udev_device_get_sysattr_value(dev_interface, "bInterfaceClass");
 	if (!if_class) {
 		info(udev, "%s: cannot get bInterfaceClass attribute\n",
@@ -368,6 +381,9 @@ static int usb_id(struct udev_device *dev)
 	}
 
 fallback:
+	vendor_id = udev_device_get_sysattr_value(dev_usb, "idVendor");
+	product_id = udev_device_get_sysattr_value(dev_usb, "idProduct");
+
 	/* fallback to USB vendor & device */
 	if (vendor_str[0] == '\0') {
 		const char *usb_vendor = NULL;
@@ -376,7 +392,7 @@ fallback:
 			usb_vendor = udev_device_get_sysattr_value(dev_usb, "manufacturer");
 
 		if (!usb_vendor)
-			usb_vendor = udev_device_get_sysattr_value(dev_usb, "idVendor");
+			usb_vendor = vendor_id;
 
 		if (!usb_vendor) {
 			info(udev, "No USB vendor information available\n");
@@ -394,7 +410,7 @@ fallback:
 			usb_model = udev_device_get_sysattr_value(dev_usb, "product");
 
 		if (!usb_model)
-			usb_model = udev_device_get_sysattr_value(dev_usb, "idProduct");
+			usb_model = product_id;
 
 		if (!usb_model) {
 			dbg(udev, "No USB model information available\n");
@@ -520,18 +536,25 @@ int main(int argc, char **argv)
 		if (export) {
 			printf("ID_VENDOR=%s\n", vendor_str);
 			printf("ID_VENDOR_ENC=%s\n", vendor_str_enc);
+			printf("ID_VENDOR_ID=%s\n", vendor_id);
 			printf("ID_MODEL=%s\n", model_str);
 			printf("ID_MODEL_ENC=%s\n", model_str_enc);
+			printf("ID_MODEL_ID=%s\n", product_id);
 			printf("ID_REVISION=%s\n", revision_str);
 			printf("ID_SERIAL=%s\n", serial);
 			if (serial_str[0] != '\0')
 				printf("ID_SERIAL_SHORT=%s\n", serial_str);
-			printf("ID_TYPE=%s\n", type_str);
+			if (type_str[0] != '\0')
+				printf("ID_TYPE=%s\n", type_str);
 			if (instance_str[0] != '\0')
 				printf("ID_INSTANCE=%s\n", instance_str);
 			printf("ID_BUS=usb\n");
 			if (packed_if_str[0] != '\0')
 				printf("ID_USB_INTERFACES=:%s\n", packed_if_str);
+			if (ifnum != NULL)
+				printf("ID_USB_INTERFACE_NUM=%s\n", ifnum);
+			if (driver != NULL)
+				printf("ID_USB_DRIVER=%s\n", driver);
 		} else
 			printf("%s\n", serial);
 	}