case 1:
type = "audio";
break;
+ case 2: /* CDC-Control */
+ break;
case 3:
type = "hid";
break;
+ case 5: /* Physical */
+ break;
+ case 6:
+ type = "image";
+ break;
case 7:
type = "printer";
break;
case 8:
type = "storage";
break;
- case 2: /* CDC-Control */
- case 5: /* Physical */
- case 6: /* Image */
- case 9: /* HUB */
+ case 9:
+ type = "hub";
+ break;
case 0x0a: /* CDC-Data */
+ break;
case 0x0b: /* Chip/Smart Card */
+ break;
case 0x0d: /* Content Security */
+ break;
case 0x0e:
type = "video";
break;
case 0xdc: /* Diagnostic Device */
+ break;
case 0xe0: /* Wireless Controller */
- case 0xf2: /* Application-specific */
+ break;
+ case 0xfe: /* Application-specific */
+ break;
case 0xff: /* Vendor-specific */
break;
default:
goto fallback;
}
udev_util_replace_whitespace(scsi_vendor, vendor_str, sizeof(vendor_str)-1);
+ udev_util_replace_chars(vendor_str, NULL);
scsi_model = udev_device_get_sysattr_value(dev_scsi, "model");
if (!scsi_model) {
goto fallback;
}
udev_util_replace_whitespace(scsi_model, model_str, sizeof(model_str)-1);
+ udev_util_replace_chars(model_str, NULL);
scsi_type = udev_device_get_sysattr_value(dev_scsi, "type");
if (!scsi_type) {
goto fallback;
}
udev_util_replace_whitespace(scsi_rev, revision_str, sizeof(revision_str)-1);
+ udev_util_replace_chars(revision_str, NULL);
/*
* some broken devices have the same identifiers
return 1;
}
udev_util_replace_whitespace(usb_vendor, vendor_str, sizeof(vendor_str)-1);
+ udev_util_replace_chars(vendor_str, NULL);
}
if (model_str[0] == '\0') {
return 1;
}
udev_util_replace_whitespace(usb_model, model_str, sizeof(model_str)-1);
+ udev_util_replace_chars(model_str, NULL);
}
if (revision_str[0] == '\0') {
const char *usb_rev;
usb_rev = udev_device_get_sysattr_value(dev_usb, "bcdDevice");
- if (usb_rev)
+ if (usb_rev) {
udev_util_replace_whitespace(usb_rev, revision_str, sizeof(revision_str)-1);
+ udev_util_replace_chars(revision_str, NULL);
+ }
}
if (serial_str[0] == '\0') {
const char *usb_serial;
usb_serial = udev_device_get_sysattr_value(dev_usb, "serial");
- if (usb_serial)
+ if (usb_serial) {
udev_util_replace_whitespace(usb_serial, serial_str, sizeof(serial_str)-1);
+ udev_util_replace_chars(serial_str, NULL);
+ }
}
return 0;
}