jim/lufa-ftdi
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into stack-debug

Browse Source
This commit is contained in:
Jim Paris 2012-10-08 16:21:52 -04:00
commit a81c04e485
1 changed files with 13 additions and 5 deletions

18
ftdi.c
View File

@ -265,7 +265,7 @@ static const USB_Descriptor_Config_t PROGMEM ConfigurationDescriptor =
.Class = 0xff,
.SubClass = 0xff,
.Protocol = 0xff,
.InterfaceStrIndex = 0,
.InterfaceStrIndex = 0x02, /* Reuse product string */
},
.FTDI_DataInEndpoint = {
@ -351,6 +351,16 @@ void EVENT_USB_Device_Reset(void)
USB_INT_Enable(USB_INT_RXSTPI);
}
/* Configure endpoint with the best available number of banks. */
static inline bool ftdi_config_ep(uint8_t address, uint8_t type, uint16_t size)
{
/* Try configuring the bulk endpoint with 2 banks. */
if (Endpoint_ConfigureEndpoint(address, type, size, 2))
return true;
/* On smaller parts, this will fail, so use 1 bank instead. */
return Endpoint_ConfigureEndpoint(address, type, size, 1);
}
void EVENT_USB_Device_ConfigurationChanged(void)
{
uint8_t PrevSelectedEndpoint = Endpoint_GetCurrentEndpoint();
@ -358,14 +368,12 @@ void EVENT_USB_Device_ConfigurationChanged(void)
/* Configure endpoints */
/* IN */
Endpoint_ConfigureEndpoint(FTDI_TX_EPADDR,
EP_TYPE_BULK, FTDI_TXRX_EPSIZE, 2);
ftdi_config_ep(FTDI_TX_EPADDR, EP_TYPE_BULK, FTDI_TXRX_EPSIZE);
Endpoint_SelectEndpoint(FTDI_TX_EPADDR);
UEIENX = (1 << TXINE);
/* OUT */
Endpoint_ConfigureEndpoint(FTDI_RX_EPADDR,
EP_TYPE_BULK, FTDI_TXRX_EPSIZE, 2);
ftdi_config_ep(FTDI_RX_EPADDR, EP_TYPE_BULK, FTDI_TXRX_EPSIZE);
Endpoint_SelectEndpoint(FTDI_RX_EPADDR);
UEIENX = (1 << RXOUTE);