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

XHCI: Make some errors more descriptive.

Browse Source 
Also contains some minor coding style cleanup.
This commit is contained in:
Augustin Cavalier
2019-02-22 00:39:36 -05:00
parent aa5cb68bc6
commit c7f186b23f
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/busses/usb/xhci.cpp
+8 -7
View File
@@ -4,7 +4,7 @@
* *
* Authors: * Authors:
* Augustin Cavalier <waddlesplash> * Augustin Cavalier <waddlesplash>
* Jian Chiang <[email protected]> * Jian Chiang <[email protected]>
* Jérôme Duval <[email protected]> * Jérôme Duval <[email protected]>
* Akshay Jaggi <[email protected]> * Akshay Jaggi <[email protected]>
* Michael Lotz <[email protected]> * Michael Lotz <[email protected]>
@@ -1312,7 +1312,7 @@ XHCI::AllocateDevice(Hub *parent, int8 hubAddress, uint8 hubPort,
usb_device_descriptor deviceDescriptor; usb_device_descriptor deviceDescriptor;
TRACE("getting the device descriptor\n"); TRACE("getting the device descriptor\n");
pipe.SendRequest( status_t status = pipe.SendRequest(
USB_REQTYPE_DEVICE_IN | USB_REQTYPE_STANDARD, // type USB_REQTYPE_DEVICE_IN | USB_REQTYPE_STANDARD, // type
USB_REQUEST_GET_DESCRIPTOR, // request USB_REQUEST_GET_DESCRIPTOR, // request
USB_DESCRIPTOR_DEVICE << 8, // value USB_DESCRIPTOR_DEVICE << 8, // value
@@ -1323,7 +1323,8 @@ XHCI::AllocateDevice(Hub *parent, int8 hubAddress, uint8 hubPort,
&actualLength); // actual length &actualLength); // actual length
if (actualLength != 8) { if (actualLength != 8) {
TRACE_ERROR("error while getting the device descriptor\n"); TRACE_ERROR("error while getting the device descriptor: %s\n",
strerror(status));
device->state = XHCI_STATE_DISABLED; device->state = XHCI_STATE_DISABLED;
delete_area(device->input_ctx_area); delete_area(device->input_ctx_area);
delete_area(device->device_ctx_area); delete_area(device->device_ctx_area);
@@ -1355,7 +1356,7 @@ XHCI::AllocateDevice(Hub *parent, int8 hubAddress, uint8 hubPort,
TRACE("getting the hub descriptor\n"); TRACE("getting the hub descriptor\n");
size_t actualLength = 0; size_t actualLength = 0;
usb_hub_descriptor hubDescriptor; usb_hub_descriptor hubDescriptor;
pipe.SendRequest( status = pipe.SendRequest(
USB_REQTYPE_DEVICE_IN | USB_REQTYPE_CLASS, // type USB_REQTYPE_DEVICE_IN | USB_REQTYPE_CLASS, // type
USB_REQUEST_GET_DESCRIPTOR, // request USB_REQUEST_GET_DESCRIPTOR, // request
USB_DESCRIPTOR_HUB << 8, // value USB_DESCRIPTOR_HUB << 8, // value
@@ -1366,7 +1367,8 @@ XHCI::AllocateDevice(Hub *parent, int8 hubAddress, uint8 hubPort,
&actualLength); &actualLength);
if (actualLength != sizeof(usb_hub_descriptor)) { if (actualLength != sizeof(usb_hub_descriptor)) {
TRACE_ERROR("error while getting the hub descriptor\n"); TRACE_ERROR("error while getting the hub descriptor: %s\n",
strerror(status));
device->state = XHCI_STATE_DISABLED; device->state = XHCI_STATE_DISABLED;
delete_area(device->input_ctx_area); delete_area(device->input_ctx_area);
delete_area(device->device_ctx_area); delete_area(device->device_ctx_area);
@@ -2092,7 +2094,6 @@ XHCI::HandleTransferComplete(xhci_trb* trb)
} }
} }
} }
} }
@@ -2438,7 +2439,7 @@ XHCI::FinishTransfers()
size_t actualLength = 0; size_t actualLength = 0;
if (callbackStatus == B_OK) { if (callbackStatus == B_OK) {
actualLength = requestData ? requestData->Length actualLength = requestData != NULL ? requestData->Length
: transfer->DataLength(); : transfer->DataLength();
if (td->trb_completion_code == COMP_SHORT_PACKET) if (td->trb_completion_code == COMP_SHORT_PACKET)