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

XHCI: Remove unused parameter to ConfigureEndpoint.

Browse Source 
No functional change intended.
This commit is contained in:
Augustin Cavalier
2019-05-15 18:11:13 -04:00
parent ec5b988026
commit 49f507c4b5
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/busses/usb/xhci.cpp
+3 -6
View File
@@ -1395,8 +1395,7 @@ XHCI::AllocateDevice(Hub *parent, int8 hubAddress, uint8 hubPort,
// configure the Control endpoint 0 // configure the Control endpoint 0
if (ConfigureEndpoint(slot, 0, USB_OBJECT_CONTROL_PIPE, false, if (ConfigureEndpoint(slot, 0, USB_OBJECT_CONTROL_PIPE, false,
device->trb_addr, 0, maxPacketSize, maxPacketSize & 0x7ff, device->trb_addr, 0, maxPacketSize, speed) != B_OK) {
speed) != B_OK) {
TRACE_ERROR("unable to configure default control endpoint\n"); TRACE_ERROR("unable to configure default control endpoint\n");
delete_area(device->input_ctx_area); delete_area(device->input_ctx_area);
delete_area(device->device_ctx_area); delete_area(device->device_ctx_area);
@@ -1646,8 +1645,7 @@ XHCI::_InsertEndpointForPipe(Pipe *pipe)
status_t status = ConfigureEndpoint(device->slot, id, pipe->Type(), status_t status = ConfigureEndpoint(device->slot, id, pipe->Type(),
pipe->Direction() == Pipe::In, device->endpoints[id].trb_addr, pipe->Direction() == Pipe::In, device->endpoints[id].trb_addr,
pipe->Interval(), pipe->MaxPacketSize(), pipe->Interval(), pipe->MaxPacketSize(), usbDevice->Speed());
pipe->MaxPacketSize() & 0x7ff, usbDevice->Speed());
if (status != B_OK) { if (status != B_OK) {
TRACE_ERROR("unable to configure endpoint\n"); TRACE_ERROR("unable to configure endpoint\n");
return status; return status;
@@ -1846,8 +1844,7 @@ XHCI::_UnlinkDescriptorForPipe(xhci_td *descriptor, xhci_endpoint *endpoint)
status_t status_t
XHCI::ConfigureEndpoint(uint8 slot, uint8 number, uint8 type, bool directionIn, XHCI::ConfigureEndpoint(uint8 slot, uint8 number, uint8 type, bool directionIn,
uint64 ringAddr, uint16 interval, uint16 maxPacketSize, uint16 maxFrameSize, uint64 ringAddr, uint16 interval, uint16 maxPacketSize, usb_speed speed)
usb_speed speed)
{ {
struct xhci_device* device = &fDevices[slot]; struct xhci_device* device = &fDevices[slot];
src/add-ons/kernel/busses/usb/xhci.h
+5 -4
View File
@@ -1,8 +1,9 @@
/* /*
* Copyright 2006-2012, Haiku Inc. All rights reserved. * Copyright 2011-2019, Haiku Inc. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
* Augustin Cavalier <waddlesplash>
* Michael Lotz <mmlr@mlotz.ch> * Michael Lotz <mmlr@mlotz.ch>
* Jian Chiang <j.jian.chiang@gmail.com> * Jian Chiang <j.jian.chiang@gmail.com>
* Jérôme Duval <jerome.duval@gmail.com> * Jérôme Duval <jerome.duval@gmail.com>
@@ -134,9 +135,9 @@ private:
// Endpoint management // Endpoint management
status_t ConfigureEndpoint(uint8 slot, uint8 number, status_t ConfigureEndpoint(uint8 slot, uint8 number,
uint8 type, bool directionIn, uint64 ringAddr, uint8 type, bool directionIn, uint64 ringAddr,
uint16 interval, uint16 maxPacketSize, uint16 interval, uint16 maxPacketSize,
uint16 maxFrameSize, usb_speed speed); usb_speed speed);
status_t _InsertEndpointForPipe(Pipe *pipe); status_t _InsertEndpointForPipe(Pipe *pipe);
status_t _RemoveEndpointForPipe(Pipe *pipe); status_t _RemoveEndpointForPipe(Pipe *pipe);