diff --git a/Userland/Utilities/lsusb.cpp b/Userland/Utilities/lsusb.cpp index f8801208d9..9769e44949 100644 --- a/Userland/Utilities/lsusb.cpp +++ b/Userland/Utilities/lsusb.cpp @@ -5,6 +5,7 @@ */ #include +#include #include #include #include @@ -25,8 +26,10 @@ ErrorOr serenity_main(Main::Arguments arguments) TRY(Core::System::unveil("/res/usb.ids", "r")); TRY(Core::System::unveil(nullptr, nullptr)); + bool print_verbose; Core::ArgsParser args; args.set_general_help("List USB devices."); + args.add_option(print_verbose, "Print all device descriptors", "verbose", 'v'); args.parse(arguments); Core::DirIterator usb_devices("/sys/bus/usb", Core::DirIterator::SkipDots); @@ -53,7 +56,7 @@ ErrorOr serenity_main(Main::Arguments arguments) } auto json = json_or_error.release_value(); - json.as_array().for_each([usb_db](auto& value) { + json.as_array().for_each([usb_db, print_verbose](auto& value) { auto& device_descriptor = value.as_object(); auto device_address = device_descriptor.get("device_address").to_u32(); @@ -66,6 +69,71 @@ ErrorOr serenity_main(Main::Arguments arguments) device_string = "Unknown Device"; outln("Device {}: ID {:04x}:{:04x} {} {}", device_address, vendor_id, product_id, vendor_string, device_string); + + if (print_verbose) { + outln("Device Descriptor"); + outln(" bLength {}", device_descriptor.get("length").to_u32()); + outln(" bDescriptorType {}", device_descriptor.get("descriptor_type").to_u32()); + outln(" bcdUSB {}", device_descriptor.get("usb_spec_compliance_bcd").to_u32()); + outln(" bDeviceClass {}", device_descriptor.get("device_class").to_u32()); + outln(" bDeviceSubClass {}", device_descriptor.get("device_sub_class").to_u32()); + outln(" bDeviceProtocol {}", device_descriptor.get("device_protocol").to_u32()); + outln(" bMaxPacketSize {}", device_descriptor.get("max_packet_size").to_u32()); + outln(" idVendor 0x{:04x} {}", device_descriptor.get("vendor_id").to_u32(), vendor_string); + outln(" idProduct 0x{:04x} {}", device_descriptor.get("product_id").to_u32(), device_string); + outln(" bcdDevice {}", device_descriptor.get("device_release_bcd").to_u32()); + outln(" iManufacturer {}", device_descriptor.get("manufacturer_id_descriptor_index").to_u32()); + outln(" iProduct {}", device_descriptor.get("product_string_descriptor_index").to_u32()); + outln(" iSerial {}", device_descriptor.get("serial_number_descriptor_index").to_u32()); + outln(" bNumConfigurations {}", device_descriptor.get("num_configurations").to_u32()); + + auto const& configuration_descriptors = value.as_object().get("configurations"); + configuration_descriptors.as_array().for_each([&](auto& config_value) { + auto const& configuration_descriptor = config_value.as_object(); + outln(" Configuration Descriptor:"); + outln(" bLength {}", configuration_descriptor.get("length").as_u32()); + outln(" bDescriptorType {}", configuration_descriptor.get("descriptor_type").as_u32()); + outln(" wTotalLength {}", configuration_descriptor.get("total_length").as_u32()); + outln(" bNumInterfaces {}", configuration_descriptor.get("number_of_interfaces").as_u32()); + outln(" bmAttributes 0x{:02x}", configuration_descriptor.get("attributes_bitmap").as_u32()); + outln(" MaxPower {}mA", configuration_descriptor.get("max_power").as_u32() * 2u); + + auto const& interface_descriptors = config_value.as_object().get("interfaces"); + interface_descriptors.as_array().for_each([&](auto& interface_value) { + auto const& interface_descriptor = interface_value.as_object(); + auto const interface_class_code = interface_descriptor.get("interface_class_code").to_u32(); + auto const interface_subclass_code = interface_descriptor.get("interface_sub_class_code").to_u32(); + auto const interface_protocol_code = interface_descriptor.get("interface_protocol").to_u32(); + auto const interface_class = usb_db->get_class(interface_class_code); + auto const interface_subclass = usb_db->get_subclass(interface_class_code, interface_subclass_code); + auto const interface_protocol = usb_db->get_protocol(interface_class_code, interface_subclass_code, interface_protocol_code); + + outln(" Interface Descriptor:"); + outln(" bLength {}", interface_descriptor.get("length").to_u32()); + outln(" bDescriptorType {}", interface_descriptor.get("descriptor_type").to_u32()); + outln(" bInterfaceNumber {}", interface_descriptor.get("interface_number").to_u32()); + outln(" bAlternateSetting {}", interface_descriptor.get("alternate_setting").to_u32()); + outln(" bNumEndpoints {}", interface_descriptor.get("num_endpoints").to_u32()); + outln(" bInterfaceClass {} {}", interface_class_code, interface_class); + outln(" bInterfaceSubClass {} {}", interface_subclass_code, interface_subclass); + outln(" bInterfaceProtocol {} {}", interface_protocol_code, interface_protocol); + outln(" iInterface {}", interface_descriptor.get("interface_string_desc_index").to_u32()); + + auto const& endpoint_descriptors = interface_value.as_object().get("endpoints"); + endpoint_descriptors.as_array().for_each([&](auto& endpoint_value) { + auto const& endpoint_descriptor = endpoint_value.as_object(); + auto const endpoint_address = endpoint_descriptor.get("endpoint_address").to_u32(); + outln(" Endpoint Descriptor:"); + outln(" bLength {}", endpoint_descriptor.get("length").to_u32()); + outln(" bDescriptorType {}", endpoint_descriptor.get("descriptor_type").to_u32()); + outln(" bEndpointAddress 0x{:02x} EP {} {}", endpoint_address, (endpoint_address & 0xFu), ((endpoint_address & 0x80u) ? "IN" : "OUT")); + outln(" bmAttributes 0x{:02x}", endpoint_descriptor.get("attribute_bitmap").to_u32()); + outln(" wMaxPacketSize 0x{:04x}", endpoint_descriptor.get("max_packet_size").to_u32()); + outln(" bInterval {}", endpoint_descriptor.get("polling_interval").to_u32()); + }); + }); + }); + } }); }