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

USB: Rename USB_SPEED_SUPER to USB_SPEED_SUPERSPEED.

Browse Source 
For consistency's sake with the others.
This commit is contained in:
Augustin Cavalier 2019-07-12 23:21:13 -04:00
parent b1ea5557ec
commit 6e2bbbb162
7 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/add-ons/kernel/bus_managers/usb/Device.cpp
View File

@ -492,7 +492,7 @@ Device::InitEndpoints(int32 interfaceIndex)
Pipe* pipe = NULL;
usb_endpoint_companion_descriptor* comp_descr = NULL;
if (fSpeed == USB_SPEED_SUPER) {
if (fSpeed == USB_SPEED_SUPERSPEED) {
// We should have a companion descriptor for this device.
// Let's find it: it'll be the "i"th one.
size_t k = 0;

2
src/add-ons/kernel/bus_managers/usb/Hub.cpp
View File

@ -262,7 +262,7 @@ Hub::Explore(change_item **changeList)
// This is for XHCI, which anyway rechecks the port speed
// This will in no way work for non-root USB3.0 Hubs
if (fDeviceDescriptor.usb_version == 0x300)
speed = USB_SPEED_SUPER;
speed = USB_SPEED_SUPERSPEED;
else if (fPortStatus[i].status & PORT_STATUS_LOW_SPEED)
speed = USB_SPEED_LOWSPEED;
else if (fPortStatus[i].status & PORT_STATUS_HIGH_SPEED)

2
src/add-ons/kernel/bus_managers/usb/Pipe.cpp
View File

@ -367,7 +367,7 @@ ControlPipe::InitCommon(int8 deviceAddress, uint8 endpointAddress,
case USB_SPEED_HIGHSPEED:
maxPacketSize = 64;
break;
case USB_SPEED_SUPER:
case USB_SPEED_SUPERSPEED:
maxPacketSize = 512;
break;

2
src/add-ons/kernel/bus_managers/usb/Transfer.cpp
View File

@ -274,7 +274,7 @@ Transfer::_CalculateBandwidth()
break;
}
case USB_SPEED_SUPER:
case USB_SPEED_SUPERSPEED:
{
// TODO it should only be useful for isochronous type
bandwidthNS = 0;

4
src/add-ons/kernel/bus_managers/usb/usb_private.h
View File

@ -89,8 +89,8 @@ typedef enum {
USB_SPEED_LOWSPEED = 0,
USB_SPEED_FULLSPEED,
USB_SPEED_HIGHSPEED,
USB_SPEED_SUPER,
USB_SPEED_MAX = USB_SPEED_SUPER
USB_SPEED_SUPERSPEED,
USB_SPEED_MAX = USB_SPEED_SUPERSPEED
} usb_speed;

21
src/add-ons/kernel/busses/usb/xhci.cpp
View File

@ -517,11 +517,12 @@ XHCI::Start()
offset--;
for (uint32 i = offset; i < offset + count; i++) {
if (XHCI_SUPPORTED_PROTOCOLS_0_MAJOR(eec) == 0x3)
fPortSpeeds[i] = USB_SPEED_SUPER;
fPortSpeeds[i] = USB_SPEED_SUPERSPEED;
else
fPortSpeeds[i] = USB_SPEED_HIGHSPEED;
TRACE("speed for port %" B_PRId32 " is %s\n", i,
fPortSpeeds[i] == USB_SPEED_SUPER ? "super" : "high");
fPortSpeeds[i] == USB_SPEED_SUPERSPEED ? "super" : "high");
}
portFound += count;
}
@ -1317,7 +1318,7 @@ XHCI::AllocateDevice(Hub *parent, int8 hubAddress, uint8 hubPort,
case USB_SPEED_FULLSPEED:
dwslot0 |= SLOT_0_SPEED(1);
break;
case USB_SPEED_SUPER:
case USB_SPEED_SUPERSPEED:
dwslot0 |= SLOT_0_SPEED(4);
break;
default:
@ -1931,7 +1932,7 @@ XHCI::ConfigureEndpoint(uint8 slot, uint8 number, uint8 type, bool directionIn,
}
case USB_SPEED_HIGHSPEED:
case USB_SPEED_SUPER:
case USB_SPEED_SUPERSPEED:
default:
// Convert 1-16 into 0-15.
calcInterval = min_c(max_c(interval, 1), 16) - 1;
@ -1950,7 +1951,7 @@ XHCI::ConfigureEndpoint(uint8 slot, uint8 number, uint8 type, bool directionIn,
if (speed == USB_SPEED_HIGHSPEED && (type & (USB_OBJECT_INTERRUPT_PIPE
| USB_OBJECT_ISO_PIPE)) != 0) {
maxBurst = (maxPacketSize & 0x1800) >> 11;
} else if (speed != USB_SPEED_SUPER) {
} else if (speed != USB_SPEED_SUPERSPEED) {
maxBurst = 0;
}
dwendpoint1 |= ENDPOINT_1_MAXBURST(maxBurst);
@ -1975,7 +1976,7 @@ XHCI::ConfigureEndpoint(uint8 slot, uint8 number, uint8 type, bool directionIn,
// for isochronous endpoints that specifies the maximum ESIT payload.
// We don't fetch this yet, so just fall back to the USB2 computation
// method if bytesPerInterval is 0.
if (speed == USB_SPEED_SUPER && bytesPerInterval != 0)
if (speed == USB_SPEED_SUPERSPEED && bytesPerInterval != 0)
dwendpoint4 |= ENDPOINT_4_MAXESITPAYLOAD(bytesPerInterval);
else if (speed >= USB_SPEED_HIGHSPEED)
dwendpoint4 |= ENDPOINT_4_MAXESITPAYLOAD((maxBurst + 1) * maxPacketSize);
@ -2017,12 +2018,12 @@ XHCI::GetPortSpeed(uint8 index, usb_speed* speed)
*speed = USB_SPEED_FULLSPEED;
break;
case 4:
*speed = USB_SPEED_SUPER;
*speed = USB_SPEED_SUPERSPEED;
break;
default:
TRACE("Non Standard Port Speed\n");
TRACE("Assuming Superspeed\n");
*speed = USB_SPEED_SUPER;
*speed = USB_SPEED_SUPERSPEED;
break;
}
@ -2061,7 +2062,7 @@ XHCI::GetPortStatus(uint8 index, usb_port_status* status)
if (portStatus & PS_PR)
status->status |= PORT_STATUS_RESET;
if (portStatus & PS_PP) {
if (fPortSpeeds[index] == USB_SPEED_SUPER)
if (fPortSpeeds[index] == USB_SPEED_SUPERSPEED)
status->status |= PORT_STATUS_SS_POWER;
else
status->status |= PORT_STATUS_POWER;
@ -2077,7 +2078,7 @@ XHCI::GetPortStatus(uint8 index, usb_port_status* status)
if (portStatus & PS_PRC)
status->change |= PORT_STATUS_RESET;
if (fPortSpeeds[index] == USB_SPEED_SUPER) {
if (fPortSpeeds[index] == USB_SPEED_SUPERSPEED) {
if (portStatus & PS_PLC)
status->change |= PORT_CHANGE_LINK_STATE;
if (portStatus & PS_WRC)

2
src/add-ons/kernel/busses/usb/xhci_rh.cpp
View File

@ -136,7 +136,7 @@ static xhci_root_hub_string_s sXHCIRootHubStrings[3] = {
XHCIRootHub::XHCIRootHub(Object *rootObject, int8 deviceAddress)
: Hub(rootObject, 0, rootObject->GetStack()->IndexOfBusManager(rootObject->GetBusManager()),
sXHCIRootHubDevice, deviceAddress, USB_SPEED_SUPER, true)
sXHCIRootHubDevice, deviceAddress, USB_SPEED_SUPERSPEED, true)
{
}