Skip to content

Port PluggableUSB to samd core #3

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

Closed
facchinm wants to merge 2 commits into from
Closed

Port PluggableUSB to samd core #3

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
e435474
fix warning becoming error (-Wall)
facchinm Jul 17, 2015
6031b66
adapt USB core to PluggableUSB
facchinm Jul 17, 2015
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
18 changes: 11 additions & 7 deletions cores/arduino/USB/CDC.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,8 @@ static volatile LineInfo _usbLineInfo = {
0x00 // lineState
};

static const CDCDescriptor _cdcInterface = {
#if (defined CDC_ENABLED) && defined(HID_ENABLED)
static CDCDescriptor _cdcInterface = {
D_IAD(0, 2, CDC_COMMUNICATION_INTERFACE_CLASS, CDC_ABSTRACT_CONTROL_MODEL, 0),
#endif

// CDC communication interface
D_INTERFACE(CDC_ACM_INTERFACE, 1, CDC_COMMUNICATION_INTERFACE_CLASS, CDC_ABSTRACT_CONTROL_MODEL, 0),
Expand All @@ -79,17 +77,23 @@ static const CDCDescriptor _cdcInterface = {
};
_Pragma("pack()")

const void* CDC_GetInterface(void)
const void* _CDC_GetInterface(void)
{
return &_cdcInterface;
}

uint32_t CDC_GetInterfaceLength(void)
uint32_t _CDC_GetInterfaceLength(void)
{
return sizeof(_cdcInterface);
}

bool CDC_Setup(Setup& setup)
int CDC_GetInterface(uint8_t* interfaceNum)
{
interfaceNum[0] += 2; // uses 2
return USBDevice.sendControl(&_cdcInterface,sizeof(_cdcInterface));
}

bool CDC_Setup(USBSetup& setup)
{
uint8_t requestType = setup.bmRequestType;
uint8_t r = setup.bRequest;
Expand Down Expand Up @@ -181,7 +185,7 @@ int Serial_::available(void)
return CDC_SERIAL_BUFFER_SIZE;
}
if (buffer->head == buffer->tail) {
USB->DEVICE.DeviceEndpoint[2].EPINTENSET.reg = USB_DEVICE_EPINTENCLR_TRCPT(1);
USB->DEVICE.DeviceEndpoint[CDC_ENDPOINT_OUT].EPINTENSET.reg = USB_DEVICE_EPINTENCLR_TRCPT(1);
}
return (uint32_t)(CDC_SERIAL_BUFFER_SIZE + buffer->head - buffer->tail) % CDC_SERIAL_BUFFER_SIZE;
}
Expand Down
Loading