Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow explicit USB interface numbers #84

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow explicit USB interface numbers #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
818a334
Allow explicit USB interface numbers
mmoskal Jan 10, 2019
2c93d03
Working on endpoint allocation
mmoskal Jan 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion inc/driver-models/CodalUSB.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ class CodalUSBInterface
{
in = 0;
out = 0;
interfaceIdx = 0;
interfaceIdx = 0xff;
next = NULL;
}

Expand All @@ -260,6 +260,8 @@ class CodalUSB
{
uint8_t endpointsUsed;
uint8_t startDelayCount;
// This is really for WinUSB; in fact we should have one WinUSB descriptor
// per WebUSB interface, but we only send it out for the first one.
uint8_t firstWebUSBInterfaceIdx;

int sendConfig();
Expand Down
68 changes: 42 additions & 26 deletions source/driver-models/CodalUSB.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ int CodalUSB::sendConfig()
{
// OK
}

if (info->iface.numEndpoints >= 1)
{
EndpointDescriptor epdescIn = {
Expand All @@ -237,7 +237,7 @@ int CodalUSB::sendConfig()
};
ADD_DESC(epdescIn);
}

if (info->iface.numEndpoints >= 2)
{
EndpointDescriptor epdescOut = {
Expand Down Expand Up @@ -337,33 +337,40 @@ int CodalUSB::add(CodalUSBInterface &interface)
usb_assert(!usb_configured);

uint8_t epsConsumed = interface.getInterfaceInfo()->allocateEndpoints;
if (epsConsumed > 1) epsConsumed = 1;

if (endpointsUsed + epsConsumed > DEVICE_USB_ENDPOINTS)
return DEVICE_NO_RESOURCES;

interface.interfaceIdx = 0xff;

CodalUSBInterface *iface;
interface.next = NULL;

for (iface = interfaces; iface; iface = iface->next)
if (interfaces == NULL)
{
if (!iface->next)
break;
#if CONFIG_ENABLED(DEVICE_WEBUSB)
// adding a non-web interface - it comes before all web interfaces
if (!interface.enableWebUSB() && iface->next->enableWebUSB())
interface.next = NULL;
interfaces = &interface;
}
else
{
// interfaceIdx is 0xff by default, or otherwise the requested
// interface number; we keep the list sorted - Windows requires that
if (interface.interfaceIdx < interfaces->interfaceIdx)
{
interface.next = iface->next;
break;
interface.next = interfaces;
interfaces = &interface;
}
#endif
}
else
for (iface = interfaces; iface; iface = iface->next)
{
if (!iface->next || interface.interfaceIdx < iface->next->interfaceIdx)
{
interface.next = iface->next;
iface->next = &interface;
break;
}
}

if (iface)
iface->next = &interface;
else
interfaces = &interface;
usb_assert(iface != NULL);
}

endpointsUsed += epsConsumed;

Expand Down Expand Up @@ -409,7 +416,7 @@ int CodalUSB::interfaceRequest(USBSetup &setup, bool isClass)
void CodalUSB::setupRequest(USBSetup &setup)
{
LOG("SETUP Req=%x type=%x val=%x:%x idx=%x len=%d", setup.bRequest, setup.bmRequestType,
setup.wValueH, setup.wValueL, setup.wIndex, setup.wLength);
setup.wValueH, setup.wValueL, setup.wIndex, setup.wLength);

int status = DEVICE_OK;

Expand Down Expand Up @@ -530,7 +537,7 @@ void CodalUSB::interruptHandler()
void CodalUSB::initEndpoints()
{
uint8_t endpointCount = 1;
uint8_t ifaceCount = 0;
uint8_t ifaceNum = 0;

if (ctrlIn)
{
Expand All @@ -547,7 +554,10 @@ void CodalUSB::initEndpoints()

for (CodalUSBInterface *iface = interfaces; iface; iface = iface->next)
{
iface->interfaceIdx = ifaceCount++;
if (iface->interfaceIdx == 0xff)
iface->interfaceIdx = ++ifaceNum;
else
ifaceNum = iface->interfaceIdx;

#if CONFIG_ENABLED(DEVICE_WEBUSB)
if (firstWebUSBInterfaceIdx == 0xff && iface->enableWebUSB())
Expand All @@ -556,8 +566,14 @@ void CodalUSB::initEndpoints()

const InterfaceInfo *info = iface->getInterfaceInfo();

usb_assert(0 <= info->allocateEndpoints && info->allocateEndpoints <= 2);
usb_assert(info->allocateEndpoints <= info->iface.numEndpoints &&
int alloc = info->allocateEndpoints;

#ifdef STM32F4
if (alloc == 2) alloc = 1;
#endif

usb_assert(0 <= alloc && alloc <= 2);
usb_assert(alloc <= info->iface.numEndpoints &&
info->iface.numEndpoints <= 2);

if (iface->in)
Expand All @@ -577,12 +593,12 @@ void CodalUSB::initEndpoints()
iface->in = new UsbEndpointIn(endpointCount, info->epIn.attr);
if (info->iface.numEndpoints > 1)
{
iface->out = new UsbEndpointOut(endpointCount + (info->allocateEndpoints - 1),
iface->out = new UsbEndpointOut(endpointCount + (alloc - 1),
info->epIn.attr);
}
}

endpointCount += info->allocateEndpoints;
endpointCount += alloc;
}

usb_assert(endpointsUsed == endpointCount);
Expand Down