i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: coding style cleanup.

Browse Source 
* Removed a few superfluous comments, too.
This commit is contained in:
Axel Dörfler
2014-05-22 18:33:26 +02:00
parent ee6a0b91b2
commit 1152f83ddc
1 changed files with 197 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/bus_managers/usb/Device.cpp
+133 -132
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2003-2006, Haiku Inc. All rights reserved.
* Copyright 2003-2014, Haiku Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
@@ -7,13 +7,15 @@
* Niels S. Reedijk
*/
#include "usb_private.h"
Device::Device(Object* parent, int8 hubAddress, uint8 hubPort,
usb_device_descriptor& desc, int8 deviceAddress, usb_speed speed,
bool isRootHub, void* controllerCookie)
: Object(parent),
:
Object(parent),
fDeviceDescriptor(desc),
fInitOK(false),
fAvailable(true),
@@ -29,7 +31,7 @@ Device::Device(Object *parent, int8 hubAddress, uint8 hubPort,
TRACE("creating device\n");
fDefaultPipe = new(std::nothrow) ControlPipe(this);
if (!fDefaultPipe) {
if (fDefaultPipe == NULL) {
TRACE_ERROR("could not allocate default pipe\n");
return;
}
@@ -80,18 +82,23 @@ Device::Device(Object *parent, int8 hubAddress, uint8 hubPort,
(void*)&configDescriptor, sizeof(usb_configuration_descriptor),
&actualLength);
if (status < B_OK || actualLength != sizeof(usb_configuration_descriptor)) {
if (status < B_OK
|| actualLength != sizeof(usb_configuration_descriptor)) {
TRACE_ERROR("error fetching configuration %" B_PRId32 "\n", i);
return;
}
TRACE("configuration %" B_PRId32 "\n", i);
TRACE("\tlength:..............%d\n", configDescriptor.length);
TRACE("\tdescriptor_type:.....0x%02x\n", configDescriptor.descriptor_type);
TRACE("\tdescriptor_type:.....0x%02x\n",
configDescriptor.descriptor_type);
TRACE("\ttotal_length:........%d\n", configDescriptor.total_length);
TRACE("\tnumber_interfaces:...%d\n", configDescriptor.number_interfaces);
TRACE("\tconfiguration_value:.0x%02x\n", configDescriptor.configuration_value);
TRACE("\tconfiguration:.......0x%02x\n", configDescriptor.configuration);
TRACE("\tnumber_interfaces:...%d\n",
configDescriptor.number_interfaces);
TRACE("\tconfiguration_value:.0x%02x\n",
configDescriptor.configuration_value);
TRACE("\tconfiguration:.......0x%02x\n",
configDescriptor.configuration);
TRACE("\tattributes:..........0x%02x\n", configDescriptor.attributes);
TRACE("\tmax_power:...........%d\n", configDescriptor.max_power);
@@ -130,29 +137,42 @@ Device::Device(Object *parent, int8 hubAddress, uint8 hubPort,
uint32 descriptorStart = sizeof(usb_configuration_descriptor);
while (descriptorStart < actualLength) {
switch (configData[descriptorStart + 1]) {
case USB_DESCRIPTOR_INTERFACE: {
case USB_DESCRIPTOR_INTERFACE:
{
TRACE("got interface descriptor\n");
usb_interface_descriptor* interfaceDescriptor
= (usb_interface_descriptor *)&configData[descriptorStart];
TRACE("\tlength:.............%d\n", interfaceDescriptor->length);
TRACE("\tdescriptor_type:....0x%02x\n", interfaceDescriptor->descriptor_type);
TRACE("\tinterface_number:...%d\n", interfaceDescriptor->interface_number);
TRACE("\talternate_setting:..%d\n", interfaceDescriptor->alternate_setting);
TRACE("\tnum_endpoints:......%d\n", interfaceDescriptor->num_endpoints);
TRACE("\tinterface_class:....0x%02x\n", interfaceDescriptor->interface_class);
TRACE("\tinterface_subclass:.0x%02x\n", interfaceDescriptor->interface_subclass);
TRACE("\tinterface_protocol:.0x%02x\n", interfaceDescriptor->interface_protocol);
TRACE("\tinterface:..........%d\n", interfaceDescriptor->interface);
= (usb_interface_descriptor*)&configData[
descriptorStart];
TRACE("\tlength:.............%d\n",
interfaceDescriptor->length);
TRACE("\tdescriptor_type:....0x%02x\n",
interfaceDescriptor->descriptor_type);
TRACE("\tinterface_number:...%d\n",
interfaceDescriptor->interface_number);
TRACE("\talternate_setting:..%d\n",
interfaceDescriptor->alternate_setting);
TRACE("\tnum_endpoints:......%d\n",
interfaceDescriptor->num_endpoints);
TRACE("\tinterface_class:....0x%02x\n",
interfaceDescriptor->interface_class);
TRACE("\tinterface_subclass:.0x%02x\n",
interfaceDescriptor->interface_subclass);
TRACE("\tinterface_protocol:.0x%02x\n",
interfaceDescriptor->interface_protocol);
TRACE("\tinterface:..........%d\n",
interfaceDescriptor->interface);
if (interfaceDescriptor->interface_number >= fConfigurations[i].interface_count) {
interfaceDescriptor->interface_number = fConfigurations[i].interface_count - 1;
if (interfaceDescriptor->interface_number
>= fConfigurations[i].interface_count) {
interfaceDescriptor->interface_number
= fConfigurations[i].interface_count - 1;
TRACE_ERROR("Corrected invalid interface_number!\n");
}
usb_interface_list *interfaceList
= &fConfigurations[i].interface[interfaceDescriptor->interface_number];
usb_interface_list* interfaceList = &fConfigurations[i]
.interface[interfaceDescriptor->interface_number];
/* Allocate this alternate */
// Allocate this alternate
interfaceList->alt_count++;
usb_interface_info* newAlternates
= (usb_interface_info*)realloc(interfaceList->alt,
@@ -166,12 +186,12 @@ Device::Device(Object *parent, int8 hubAddress, uint8 hubPort,
interfaceList->alt = newAlternates;
/* Set active interface always to the first one */
// Set active interface always to the first one
interfaceList->active = interfaceList->alt;
/* Setup this alternate */
usb_interface_info *interfaceInfo =
&interfaceList->alt[interfaceList->alt_count - 1];
// Setup this alternate
usb_interface_info* interfaceInfo
= &interfaceList->alt[interfaceList->alt_count - 1];
interfaceInfo->descr = interfaceDescriptor;
interfaceInfo->endpoint_count = 0;
interfaceInfo->endpoint = NULL;
@@ -191,39 +211,44 @@ Device::Device(Object *parent, int8 hubAddress, uint8 hubPort,
break;
}
case USB_DESCRIPTOR_ENDPOINT: {
case USB_DESCRIPTOR_ENDPOINT:
{
TRACE("got endpoint descriptor\n");
usb_endpoint_descriptor* endpointDescriptor
= (usb_endpoint_descriptor*)&configData[descriptorStart];
TRACE("\tlength:.............%d\n", endpointDescriptor->length);
TRACE("\tdescriptor_type:....0x%02x\n", endpointDescriptor->descriptor_type);
TRACE("\tendpoint_address:...0x%02x\n", endpointDescriptor->endpoint_address);
TRACE("\tattributes:.........0x%02x\n", endpointDescriptor->attributes);
TRACE("\tmax_packet_size:....%d\n", endpointDescriptor->max_packet_size);
TRACE("\tinterval:...........%d\n", endpointDescriptor->interval);
TRACE("\tlength:.............%d\n",
endpointDescriptor->length);
TRACE("\tdescriptor_type:....0x%02x\n",
endpointDescriptor->descriptor_type);
TRACE("\tendpoint_address:...0x%02x\n",
endpointDescriptor->endpoint_address);
TRACE("\tattributes:.........0x%02x\n",
endpointDescriptor->attributes);
TRACE("\tmax_packet_size:....%d\n",
endpointDescriptor->max_packet_size);
TRACE("\tinterval:...........%d\n",
endpointDescriptor->interval);
if (!currentInterface)
if (currentInterface == NULL)
break;
/* allocate this endpoint */
// Allocate this endpoint
currentInterface->endpoint_count++;
usb_endpoint_info *newEndpoints
= (usb_endpoint_info *)realloc(
currentInterface->endpoint,
usb_endpoint_info* newEndpoints = (usb_endpoint_info*)
realloc(currentInterface->endpoint,
currentInterface->endpoint_count
* sizeof(usb_endpoint_info));
if (newEndpoints == NULL) {
TRACE_ERROR("out of memory allocating"
" new endpoint\n");
TRACE_ERROR("out of memory allocating new endpoint\n");
currentInterface->endpoint_count--;
return;
}
currentInterface->endpoint = newEndpoints;
/* setup this endpoint */
usb_endpoint_info *endpointInfo =
&currentInterface->endpoint[currentInterface->endpoint_count - 1];
// Setup this endpoint
usb_endpoint_info* endpointInfo = &currentInterface
->endpoint[currentInterface->endpoint_count - 1];
endpointInfo->descr = endpointDescriptor;
endpointInfo->handle = 0;
break;
@@ -233,13 +258,15 @@ Device::Device(Object *parent, int8 hubAddress, uint8 hubPort,
TRACE("got generic descriptor\n");
usb_generic_descriptor* genericDescriptor
= (usb_generic_descriptor*)&configData[descriptorStart];
TRACE("\tlength:.............%d\n", genericDescriptor->length);
TRACE("\tdescriptor_type:....0x%02x\n", genericDescriptor->descriptor_type);
TRACE("\tlength:.............%d\n",
genericDescriptor->length);
TRACE("\tdescriptor_type:....0x%02x\n",
genericDescriptor->descriptor_type);
if (!currentInterface)
if (currentInterface == NULL)
break;
/* allocate this descriptor */
// Allocate this descriptor
currentInterface->generic_count++;
usb_descriptor** newGenerics = (usb_descriptor**)realloc(
currentInterface->generic,
@@ -254,9 +281,10 @@ Device::Device(Object *parent, int8 hubAddress, uint8 hubPort,
currentInterface->generic = newGenerics;
/* add this descriptor */
currentInterface->generic[currentInterface->generic_count - 1] =
(usb_descriptor *)genericDescriptor;
// Add this descriptor
currentInterface->generic[
currentInterface->generic_count - 1]
= (usb_descriptor*)genericDescriptor;
break;
}
@@ -266,7 +294,7 @@ Device::Device(Object *parent, int8 hubAddress, uint8 hubPort,
// Set default configuration
TRACE("setting default configuration\n");
if (SetConfigurationAt(0) < B_OK) {
if (SetConfigurationAt(0) != B_OK) {
TRACE_ERROR("failed to set default configuration\n");
return;
}
@@ -336,7 +364,7 @@ Device::Changed(change_item **changeList, bool added)
{
fAvailable = added;
change_item* changeItem = new(std::nothrow) change_item;
if (!changeItem)
if (changeItem == NULL)
return B_NO_MEMORY;
changeItem->added = added;
@@ -355,14 +383,9 @@ Device::GetDescriptor(uint8 descriptorType, uint8 index, uint16 languageID,
return B_ERROR;
return fDefaultPipe->SendRequest(
USB_REQTYPE_DEVICE_IN | USB_REQTYPE_STANDARD, // type
USB_REQUEST_GET_DESCRIPTOR, // request
(descriptorType << 8) | index, // value
languageID, // index
dataLength, // length
data, // buffer
dataLength, // buffer length
actualLength); // actual length
USB_REQTYPE_DEVICE_IN | USB_REQTYPE_STANDARD,
USB_REQUEST_GET_DESCRIPTOR, (descriptorType << 8) | index,
languageID, dataLength, data, dataLength, actualLength);
}
@@ -414,15 +437,9 @@ Device::SetConfigurationAt(uint8 index)
// Tell the device to set the configuration
status_t result = fDefaultPipe->SendRequest(
USB_REQTYPE_DEVICE_OUT | USB_REQTYPE_STANDARD, // type
USB_REQUEST_SET_CONFIGURATION, // request
fConfigurations[index].descr->configuration_value, // value
0, // index
0, // length
NULL, // buffer
0, // buffer length
NULL); // actual length
USB_REQTYPE_DEVICE_OUT | USB_REQTYPE_STANDARD,
USB_REQUEST_SET_CONFIGURATION,
fConfigurations[index].descr->configuration_value, 0, 0, NULL, 0, NULL);
if (result < B_OK)
return result;
@@ -446,30 +463,31 @@ Device::InitEndpoints(int32 interfaceIndex)
if (interfaceIndex >= 0 && j != (size_t)interfaceIndex)
continue;
usb_interface_info *interfaceInfo = fCurrentConfiguration->interface[j].active;
usb_interface_info* interfaceInfo
= fCurrentConfiguration->interface[j].active;
for (size_t i = 0; i < interfaceInfo->endpoint_count; i++) {
usb_endpoint_info* endpoint = &interfaceInfo->endpoint[i];
Pipe* pipe = NULL;
Pipe::pipeDirection direction = Pipe::Out;
if (endpoint->descr->endpoint_address & 0x80)
if ((endpoint->descr->endpoint_address & 0x80) != 0)
direction = Pipe::In;
switch (endpoint->descr->attributes & 0x03) {
case USB_ENDPOINT_ATTR_CONTROL: /* Control Endpoint */
case USB_ENDPOINT_ATTR_CONTROL: // Control Endpoint
pipe = new(std::nothrow) ControlPipe(this);
direction = Pipe::Default;
break;
case USB_ENDPOINT_ATTR_ISOCHRONOUS: /* Isochronous Endpoint */
case USB_ENDPOINT_ATTR_ISOCHRONOUS: // Isochronous Endpoint
pipe = new(std::nothrow) IsochronousPipe(this);
break;
case USB_ENDPOINT_ATTR_BULK: /* Bulk Endpoint */
case USB_ENDPOINT_ATTR_BULK: // Bulk Endpoint
pipe = new(std::nothrow) BulkPipe(this);
break;
case USB_ENDPOINT_ATTR_INTERRUPT: /* Interrupt Endpoint */
case USB_ENDPOINT_ATTR_INTERRUPT: // Interrupt Endpoint
pipe = new(std::nothrow) InterruptPipe(this);
break;
}
@@ -493,21 +511,14 @@ Device::InitEndpoints(int32 interfaceIndex)
status_t
Device::Unconfigure(bool atDeviceLevel)
{
// if we only want to destroy our open pipes before setting
// If we only want to destroy our open pipes before setting
// another configuration unconfigure will be called with
// atDevice = false. otherwise we explicitly want to unconfigure
// the device and have to send it the corresponding request.
if (atDeviceLevel && fAvailable) {
status_t result = fDefaultPipe->SendRequest(
USB_REQTYPE_DEVICE_OUT | USB_REQTYPE_STANDARD, // type
USB_REQUEST_SET_CONFIGURATION, // request
0, // value
0, // index
0, // length
NULL, // buffer
0, // buffer length
NULL); // actual length
USB_REQTYPE_DEVICE_OUT | USB_REQTYPE_STANDARD,
USB_REQUEST_SET_CONFIGURATION, 0, 0, 0, NULL, 0, NULL);
if (result < B_OK)
return result;
@@ -526,14 +537,16 @@ Device::Unconfigure(bool atDeviceLevel)
void
Device::ClearEndpoints(int32 interfaceIndex)
{
if (fCurrentConfiguration == NULL || fCurrentConfiguration->interface == NULL)
if (fCurrentConfiguration == NULL
|| fCurrentConfiguration->interface == NULL)
return;
for (size_t j = 0; j < fCurrentConfiguration->interface_count; j++) {
if (interfaceIndex >= 0 && j != (size_t)interfaceIndex)
continue;
usb_interface_info *interfaceInfo = fCurrentConfiguration->interface[j].active;
usb_interface_info* interfaceInfo
= fCurrentConfiguration->interface[j].active;
if (interfaceInfo == NULL || interfaceInfo->endpoint == NULL)
continue;
@@ -552,15 +565,9 @@ Device::SetAltInterface(const usb_interface_info *interface)
uint8 interfaceNumber = interface->descr->interface_number;
// Tell the device to set the alternate settings
status_t result = fDefaultPipe->SendRequest(
USB_REQTYPE_INTERFACE_OUT | USB_REQTYPE_STANDARD, // type
USB_REQUEST_SET_INTERFACE, // request
interface->descr->alternate_setting, // value
interfaceNumber, // index
0, // length
NULL, // buffer
0, // buffer length
NULL);
USB_REQTYPE_INTERFACE_OUT | USB_REQTYPE_STANDARD,
USB_REQUEST_SET_INTERFACE,
interface->descr->alternate_setting, interfaceNumber, 0, NULL, 0, NULL);
if (result < B_OK)
return result;
@@ -578,6 +585,7 @@ Device::SetAltInterface(const usb_interface_info *interface)
return result;
}
const usb_device_descriptor*
Device::DeviceDescriptor() const
{
@@ -599,29 +607,40 @@ Device::ReportDevice(usb_support_descriptor *supportDescriptors,
if ((supportDescriptors[i].vendor != 0
&& fDeviceDescriptor.vendor_id != supportDescriptors[i].vendor)
|| (supportDescriptors[i].product != 0
&& fDeviceDescriptor.product_id != supportDescriptors[i].product))
&& fDeviceDescriptor.product_id
!= supportDescriptors[i].product))
continue;
if ((supportDescriptors[i].dev_class == 0
|| fDeviceDescriptor.device_class == supportDescriptors[i].dev_class)
|| fDeviceDescriptor.device_class
== supportDescriptors[i].dev_class)
&& (supportDescriptors[i].dev_subclass == 0
|| fDeviceDescriptor.device_subclass == supportDescriptors[i].dev_subclass)
|| fDeviceDescriptor.device_subclass
== supportDescriptors[i].dev_subclass)
&& (supportDescriptors[i].dev_protocol == 0
|| fDeviceDescriptor.device_protocol == supportDescriptors[i].dev_protocol)) {
|| fDeviceDescriptor.device_protocol
== supportDescriptors[i].dev_protocol)) {
supported = true;
}
// we have to check all interfaces for matching class/subclass/protocol
for (uint32 j = 0; !supported && j < fDeviceDescriptor.num_configurations; j++) {
for (uint32 k = 0; !supported && k < fConfigurations[j].interface_count; k++) {
for (uint32 l = 0; !supported && l < fConfigurations[j].interface[k].alt_count; l++) {
usb_interface_descriptor *descriptor = fConfigurations[j].interface[k].alt[l].descr;
for (uint32 j = 0;
!supported && j < fDeviceDescriptor.num_configurations; j++) {
for (uint32 k = 0;
!supported && k < fConfigurations[j].interface_count; k++) {
for (uint32 l = 0; !supported
&& l < fConfigurations[j].interface[k].alt_count; l++) {
usb_interface_descriptor* descriptor
= fConfigurations[j].interface[k].alt[l].descr;
if ((supportDescriptors[i].dev_class == 0
|| descriptor->interface_class == supportDescriptors[i].dev_class)
|| descriptor->interface_class
== supportDescriptors[i].dev_class)
&& (supportDescriptors[i].dev_subclass == 0
|| descriptor->interface_subclass == supportDescriptors[i].dev_subclass)
|| descriptor->interface_subclass
== supportDescriptors[i].dev_subclass)
&& (supportDescriptors[i].dev_protocol == 0
|| descriptor->interface_protocol == supportDescriptors[i].dev_protocol)) {
|| descriptor->interface_protocol
== supportDescriptors[i].dev_protocol)) {
supported = true;
}
}
@@ -651,14 +670,14 @@ Device::ReportDevice(usb_support_descriptor *supportDescriptors,
} else {
usb_driver_cookie** pointer = cookies;
usb_driver_cookie* cookie = *cookies;
while (cookie) {
while (cookie != NULL) {
if (cookie->device == id)
break;
pointer = &cookie->link;
cookie = cookie->link;
}
if (!cookie) {
if (cookie == NULL) {
// the device is supported, but there is no cookie. this most
// probably means that the device_added hook above failed.
return B_OK;
@@ -694,13 +713,7 @@ Device::SetFeature(uint16 selector)
TRACE("set feature %u\n", selector);
return fDefaultPipe->SendRequest(
USB_REQTYPE_STANDARD | USB_REQTYPE_DEVICE_OUT,
USB_REQUEST_SET_FEATURE,
selector,
0,
0,
NULL,
0,
NULL);
USB_REQUEST_SET_FEATURE, selector, 0, 0, NULL, 0, NULL);
}
@@ -713,13 +726,7 @@ Device::ClearFeature(uint16 selector)
TRACE("clear feature %u\n", selector);
return fDefaultPipe->SendRequest(
USB_REQTYPE_STANDARD | USB_REQTYPE_DEVICE_OUT,
USB_REQUEST_CLEAR_FEATURE,
selector,
0,
0,
NULL,
0,
NULL);
USB_REQUEST_CLEAR_FEATURE, selector, 0, 0, NULL, 0, NULL);
}
@@ -732,11 +739,5 @@ Device::GetStatus(uint16 *status)
TRACE("get status\n");
return fDefaultPipe->SendRequest(
USB_REQTYPE_STANDARD | USB_REQTYPE_DEVICE_IN,
USB_REQUEST_GET_STATUS,
0,
0,
2,
(void *)status,
2,
NULL);
USB_REQUEST_GET_STATUS, 0, 0, 2, (void*)status, 2, NULL);
}