Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Add alternate interface printing to usb_dev_info, which is now pretty straight 

forward using the new USBKit interface.
* Make the output indents a bit more natural and wider to make things more
  readable.
* Minor cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27410 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz 2008-09-10 22:14:00 +00:00
parent 89dda28052
commit 9de98b30cf
1 changed files with 47 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/bin/usb_dev_info.cpp
View File

@ -3,7 +3,7 @@
* Copyright 2000, Be Incorporated. All rights reserved.
*
* Modified for Haiku by François Revol and Michael Lotz.
* Copyright 2007, Haiku Inc. All rights reserved.
* Copyright 2007-2008, Haiku Inc. All rights reserved.
*/
#include <USBKit.h>
@ -16,41 +16,48 @@ DumpInterface(const BUSBInterface *interface)
if (!interface)
return;
printf(" Class .............. 0x%02x\n", interface->Class());
printf(" Subclass ........... 0x%02x\n", interface->Subclass());
printf(" Protocol ........... 0x%02x\n", interface->Protocol());
printf(" Interface String ... \"%s\"\n", interface->InterfaceString());
printf(" Class .............. 0x%02x\n",
interface->Class());
printf(" Subclass ........... 0x%02x\n",
interface->Subclass());
printf(" Protocol ........... 0x%02x\n",
interface->Protocol());
printf(" Interface String ... \"%s\"\n",
interface->InterfaceString());
for (uint32 i = 0; i < interface->CountEndpoints(); i++) {
const BUSBEndpoint *endpoint = interface->EndpointAt(i);
if (!endpoint)
continue;
printf(" [Endpoint %lu]\n", i);
printf(" MaxPacketSize .... %d\n", endpoint->MaxPacketSize());
printf(" Interval ......... %d\n", endpoint->Interval());
printf(" [Endpoint %lu]\n", i);
printf(" MaxPacketSize .... %d\n",
endpoint->MaxPacketSize());
printf(" Interval ......... %d\n",
endpoint->Interval());
if (endpoint->IsControl())
printf(" Type ............. Control\n");
printf(" Type ............. Control\n");
else if (endpoint->IsBulk())
printf(" Type ............. Bulk\n");
printf(" Type ............. Bulk\n");
else if (endpoint->IsIsochronous())
printf(" Type ............. Isochronous\n");
printf(" Type ............. Isochronous\n");
else if (endpoint->IsInterrupt())
printf(" Type ............. Interrupt\n");
printf(" Type ............. Interrupt\n");
if(endpoint->IsInput())
printf(" Direction ........ Input\n");
printf(" Direction ........ Input\n");
else
printf(" Direction ........ Output\n");
printf(" Direction ........ Output\n");
}
char buffer[256];
usb_descriptor *generic = (usb_descriptor *)buffer;
for (uint32 i = 0; interface->OtherDescriptorAt(i, generic, 256) == B_OK; i++) {
printf(" [Descriptor %lu]\n", i);
printf(" Type ............. 0x%02x\n", generic->generic.descriptor_type);
printf(" Data ............. ");
printf(" [Descriptor %lu]\n", i);
printf(" Type ............. 0x%02x\n",
generic->generic.descriptor_type);
printf(" Data ............. ");
// the length includes the length and descriptor_type field
for(int32 j = 0; j < generic->generic.length - 2; j++)
printf("%02x ", generic->generic.data[j]);
@ -65,10 +72,18 @@ DumpConfiguration(const BUSBConfiguration *configuration)
if (!configuration)
return;
printf(" Configuration String . \"%s\"\n", configuration->ConfigurationString());
printf(" Configuration String . \"%s\"\n",
configuration->ConfigurationString());
for (uint32 i = 0; i < configuration->CountInterfaces(); i++) {
printf(" [Interface %lu]\n", i);
DumpInterface(configuration->InterfaceAt(i));
printf(" [Interface %lu]\n", i);
const BUSBInterface *interface = configuration->InterfaceAt(i);
for (uint32 j = 0; j < interface->CountAlternates(); j++) {
const BUSBInterface *alternate = interface->AlternateAt(j);
printf(" [Alternate %lu%s]\n", j,
j == interface->AlternateIndex() ? " active" : "");
DumpInterface(alternate);
}
}
}
@ -77,20 +92,20 @@ static void
DumpInfo(BUSBDevice &device)
{
printf("[Device]\n");
printf("Class .................. 0x%02x\n", device.Class());
printf("Subclass ............... 0x%02x\n", device.Subclass());
printf("Protocol ............... 0x%02x\n", device.Protocol());
printf("Max Endpoint 0 Packet .. %d\n", device.MaxEndpoint0PacketSize());
printf("USB Version ............ 0x%04x\n", device.USBVersion());
printf("Vendor ID .............. 0x%04x\n", device.VendorID());
printf("Product ID ............. 0x%04x\n", device.ProductID());
printf("Product Version ........ 0x%04x\n", device.Version());
printf("Manufacturer String .... \"%s\"\n", device.ManufacturerString());
printf("Product String ......... \"%s\"\n", device.ProductString());
printf("Serial Number .......... \"%s\"\n", device.SerialNumberString());
printf(" Class .................. 0x%02x\n", device.Class());
printf(" Subclass ............... 0x%02x\n", device.Subclass());
printf(" Protocol ............... 0x%02x\n", device.Protocol());
printf(" Max Endpoint 0 Packet .. %d\n", device.MaxEndpoint0PacketSize());
printf(" USB Version ............ 0x%04x\n", device.USBVersion());
printf(" Vendor ID .............. 0x%04x\n", device.VendorID());
printf(" Product ID ............. 0x%04x\n", device.ProductID());
printf(" Product Version ........ 0x%04x\n", device.Version());
printf(" Manufacturer String .... \"%s\"\n", device.ManufacturerString());
printf(" Product String ......... \"%s\"\n", device.ProductString());
printf(" Serial Number .......... \"%s\"\n", device.SerialNumberString());
for (uint32 i = 0; i < device.CountConfigurations(); i++) {
printf(" [Configuration %lu]\n", i);
printf(" [Configuration %lu]\n", i);
DumpConfiguration(device.ConfigurationAt(i));
}
}