Add dcd_edpt_iso_alloc() / dcd_edpt_iso_activate() for ISO EP buffer management.
This commit is contained in:
parent
cece59df22
commit
fe8c170c98
|
@ -167,6 +167,12 @@ void dcd_edpt_stall (uint8_t rhport, uint8_t ep_addr);
|
||||||
// This API never calls with control endpoints, since it is auto cleared when receiving setup packet
|
// This API never calls with control endpoints, since it is auto cleared when receiving setup packet
|
||||||
void dcd_edpt_clear_stall (uint8_t rhport, uint8_t ep_addr);
|
void dcd_edpt_clear_stall (uint8_t rhport, uint8_t ep_addr);
|
||||||
|
|
||||||
|
// Allocate packet buffer used by ISO endpoints
|
||||||
|
// Some MCU need manual packet buffer allocation, we allocation largest size to avoid clustering
|
||||||
|
bool dcd_edpt_iso_alloc(uint8_t rhport, uint8_t ep_addr, uint16_t largest_packet_size);
|
||||||
|
|
||||||
|
// Configure and enable an ISO endpoint according to descriptor
|
||||||
|
bool dcd_edpt_iso_activate(uint8_t rhport, tusb_desc_endpoint_t const * p_endpoint_desc);
|
||||||
//--------------------------------------------------------------------+
|
//--------------------------------------------------------------------+
|
||||||
// Event API (implemented by stack)
|
// Event API (implemented by stack)
|
||||||
//--------------------------------------------------------------------+
|
//--------------------------------------------------------------------+
|
||||||
|
|
|
@ -1380,4 +1380,23 @@ void usbd_sof_enable(uint8_t rhport, bool en)
|
||||||
dcd_sof_enable(rhport, en);
|
dcd_sof_enable(rhport, en);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool usbd_edpt_iso_alloc(uint8_t rhport, uint8_t ep_addr, uint16_t largest_packet_size)
|
||||||
|
{
|
||||||
|
rhport = _usbd_rhport;
|
||||||
|
|
||||||
|
TU_ASSERT(tu_edpt_number(ep_addr) < CFG_TUD_ENDPPOINT_MAX);
|
||||||
|
|
||||||
|
return dcd_edpt_iso_alloc(rhport, ep_addr, largest_packet_size);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool usbd_edpt_iso_activate(uint8_t rhport, tusb_desc_endpoint_t const * desc_ep)
|
||||||
|
{
|
||||||
|
rhport = _usbd_rhport;
|
||||||
|
|
||||||
|
TU_ASSERT(tu_edpt_number(desc_ep->bEndpointAddress) < CFG_TUD_ENDPPOINT_MAX);
|
||||||
|
TU_ASSERT(tu_edpt_validate(desc_ep, (tusb_speed_t) _usbd_dev.speed));
|
||||||
|
|
||||||
|
return dcd_edpt_iso_activate(rhport, desc_ep);
|
||||||
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -96,6 +96,12 @@ void usbd_edpt_clear_stall(uint8_t rhport, uint8_t ep_addr);
|
||||||
// Check if endpoint is stalled
|
// Check if endpoint is stalled
|
||||||
bool usbd_edpt_stalled(uint8_t rhport, uint8_t ep_addr);
|
bool usbd_edpt_stalled(uint8_t rhport, uint8_t ep_addr);
|
||||||
|
|
||||||
|
// Allocate packet buffer used by ISO endpoints
|
||||||
|
bool usbd_edpt_iso_alloc(uint8_t rhport, uint8_t ep_addr, uint16_t largest_packet_size);
|
||||||
|
|
||||||
|
// Configure and enable an ISO endpoint according to descriptor
|
||||||
|
bool usbd_edpt_iso_activate(uint8_t rhport, tusb_desc_endpoint_t const * p_endpoint_desc);
|
||||||
|
|
||||||
// Check if endpoint is ready (not busy and not stalled)
|
// Check if endpoint is ready (not busy and not stalled)
|
||||||
TU_ATTR_ALWAYS_INLINE static inline
|
TU_ATTR_ALWAYS_INLINE static inline
|
||||||
bool usbd_edpt_ready(uint8_t rhport, uint8_t ep_addr)
|
bool usbd_edpt_ready(uint8_t rhport, uint8_t ep_addr)
|
||||||
|
|
|
@ -209,7 +209,7 @@ static void dcd_pma_alloc_reset(void);
|
||||||
static uint16_t dcd_pma_alloc(uint8_t ep_addr, size_t length);
|
static uint16_t dcd_pma_alloc(uint8_t ep_addr, size_t length);
|
||||||
static void dcd_pma_free(uint8_t ep_addr);
|
static void dcd_pma_free(uint8_t ep_addr);
|
||||||
static void dcd_ep_free(uint8_t ep_addr);
|
static void dcd_ep_free(uint8_t ep_addr);
|
||||||
static uint8_t dcd_ep_alloc(tusb_desc_endpoint_t const * p_endpoint_desc);
|
static uint8_t dcd_ep_alloc(uint8_t ep_addr, uint8_t ep_type);
|
||||||
static bool dcd_write_packet_memory(uint16_t dst, const void *__restrict src, size_t wNBytes);
|
static bool dcd_write_packet_memory(uint16_t dst, const void *__restrict src, size_t wNBytes);
|
||||||
static bool dcd_read_packet_memory(void *__restrict dst, uint16_t src, size_t wNBytes);
|
static bool dcd_read_packet_memory(void *__restrict dst, uint16_t src, size_t wNBytes);
|
||||||
|
|
||||||
|
@ -759,6 +759,8 @@ static uint16_t dcd_pma_alloc(uint8_t ep_addr, size_t length)
|
||||||
return epXferCtl->pma_ptr;
|
return epXferCtl->pma_ptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
open_ep_count++;
|
||||||
|
|
||||||
uint16_t addr = ep_buf_ptr;
|
uint16_t addr = ep_buf_ptr;
|
||||||
ep_buf_ptr = (uint16_t)(ep_buf_ptr + length); // increment buffer pointer
|
ep_buf_ptr = (uint16_t)(ep_buf_ptr + length); // increment buffer pointer
|
||||||
|
|
||||||
|
@ -802,18 +804,17 @@ static void dcd_pma_free(uint8_t ep_addr)
|
||||||
/***
|
/***
|
||||||
* Allocate hardware endpoint
|
* Allocate hardware endpoint
|
||||||
*/
|
*/
|
||||||
static uint8_t dcd_ep_alloc(tusb_desc_endpoint_t const * p_endpoint_desc)
|
static uint8_t dcd_ep_alloc(uint8_t ep_addr, uint8_t ep_type)
|
||||||
{
|
{
|
||||||
uint8_t const epnum = tu_edpt_number(p_endpoint_desc->bEndpointAddress);
|
uint8_t const epnum = tu_edpt_number(ep_addr);
|
||||||
uint8_t const dir = tu_edpt_dir(p_endpoint_desc->bEndpointAddress);
|
uint8_t const dir = tu_edpt_dir(ep_addr);
|
||||||
uint8_t const eptype = p_endpoint_desc->bmAttributes.xfer;
|
|
||||||
|
|
||||||
for(uint8_t i = 0; i < STFSDEV_EP_COUNT; i++)
|
for(uint8_t i = 0; i < STFSDEV_EP_COUNT; i++)
|
||||||
{
|
{
|
||||||
// If EP of current direction is not allocated
|
// If EP of current direction is not allocated
|
||||||
// Except for ISO endpoint, both direction should be free
|
// Except for ISO endpoint, both direction should be free
|
||||||
if(!ep_alloc_status[i].allocated[dir] &&
|
if(!ep_alloc_status[i].allocated[dir] &&
|
||||||
(eptype != TUSB_XFER_ISOCHRONOUS || !ep_alloc_status[i].allocated[dir ^ 1]))
|
(ep_type != TUSB_XFER_ISOCHRONOUS || !ep_alloc_status[i].allocated[dir ^ 1]))
|
||||||
{
|
{
|
||||||
// Check if EP number is the same
|
// Check if EP number is the same
|
||||||
if(ep_alloc_status[i].ep_num == 0xFF ||
|
if(ep_alloc_status[i].ep_num == 0xFF ||
|
||||||
|
@ -821,10 +822,10 @@ static uint8_t dcd_ep_alloc(tusb_desc_endpoint_t const * p_endpoint_desc)
|
||||||
{
|
{
|
||||||
// One EP pair has to be the same type
|
// One EP pair has to be the same type
|
||||||
if(ep_alloc_status[i].ep_type == 0xFF ||
|
if(ep_alloc_status[i].ep_type == 0xFF ||
|
||||||
ep_alloc_status[i].ep_type == eptype)
|
ep_alloc_status[i].ep_type == ep_type)
|
||||||
{
|
{
|
||||||
ep_alloc_status[i].ep_num = epnum;
|
ep_alloc_status[i].ep_num = epnum;
|
||||||
ep_alloc_status[i].ep_type = eptype;
|
ep_alloc_status[i].ep_type = ep_type;
|
||||||
ep_alloc_status[i].allocated[dir] = true;
|
ep_alloc_status[i].allocated[dir] = true;
|
||||||
|
|
||||||
return i;
|
return i;
|
||||||
|
@ -871,7 +872,7 @@ static void dcd_ep_free(uint8_t ep_addr)
|
||||||
bool dcd_edpt_open (uint8_t rhport, tusb_desc_endpoint_t const * p_endpoint_desc)
|
bool dcd_edpt_open (uint8_t rhport, tusb_desc_endpoint_t const * p_endpoint_desc)
|
||||||
{
|
{
|
||||||
(void)rhport;
|
(void)rhport;
|
||||||
uint8_t const epnum = dcd_ep_alloc(p_endpoint_desc);
|
uint8_t const epnum = dcd_ep_alloc(p_endpoint_desc->bEndpointAddress, p_endpoint_desc->bmAttributes.xfer);
|
||||||
uint8_t const dir = tu_edpt_dir(p_endpoint_desc->bEndpointAddress);
|
uint8_t const dir = tu_edpt_dir(p_endpoint_desc->bEndpointAddress);
|
||||||
const uint16_t buffer_size = pcd_aligned_buffer_size(tu_edpt_packet_size(p_endpoint_desc));
|
const uint16_t buffer_size = pcd_aligned_buffer_size(tu_edpt_packet_size(p_endpoint_desc));
|
||||||
uint16_t pma_addr;
|
uint16_t pma_addr;
|
||||||
|
@ -900,8 +901,6 @@ bool dcd_edpt_open (uint8_t rhport, tusb_desc_endpoint_t const * p_endpoint_desc
|
||||||
TU_ASSERT(false);
|
TU_ASSERT(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
open_ep_count++;
|
|
||||||
|
|
||||||
pcd_set_eptype(USB, epnum, wType);
|
pcd_set_eptype(USB, epnum, wType);
|
||||||
pcd_set_ep_address(USB, epnum, tu_edpt_number(p_endpoint_desc->bEndpointAddress));
|
pcd_set_ep_address(USB, epnum, tu_edpt_number(p_endpoint_desc->bEndpointAddress));
|
||||||
// Be normal, for now, instead of only accepting zero-byte packets (on control endpoint)
|
// Be normal, for now, instead of only accepting zero-byte packets (on control endpoint)
|
||||||
|
@ -983,6 +982,56 @@ void dcd_edpt_close (uint8_t rhport, uint8_t ep_addr)
|
||||||
dcd_pma_free(ep_addr);
|
dcd_pma_free(ep_addr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool dcd_edpt_iso_alloc(uint8_t rhport, uint8_t ep_addr, uint16_t largest_packet_size)
|
||||||
|
{
|
||||||
|
(void)rhport;
|
||||||
|
|
||||||
|
TU_ASSERT(largest_packet_size <= 1024);
|
||||||
|
|
||||||
|
uint8_t const epnum = dcd_ep_alloc(ep_addr, TUSB_XFER_ISOCHRONOUS);
|
||||||
|
const uint16_t buffer_size = pcd_aligned_buffer_size(largest_packet_size);
|
||||||
|
|
||||||
|
/* Create a packet memory buffer area. For isochronous endpoints,
|
||||||
|
* use the same buffer as the double buffer, essentially disabling double buffering */
|
||||||
|
dcd_pma_alloc(ep_addr, buffer_size);
|
||||||
|
|
||||||
|
xfer_ctl_ptr(ep_addr)->epnum = epnum;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool dcd_edpt_iso_activate(uint8_t rhport, tusb_desc_endpoint_t const * p_endpoint_desc)
|
||||||
|
{
|
||||||
|
(void)rhport;
|
||||||
|
uint8_t const epnum = xfer_ctl_ptr(p_endpoint_desc->bEndpointAddress)->epnum;
|
||||||
|
uint8_t const dir = tu_edpt_dir(p_endpoint_desc->bEndpointAddress);
|
||||||
|
const uint16_t packet_size = tu_edpt_packet_size(p_endpoint_desc);
|
||||||
|
uint16_t pma_addr;
|
||||||
|
|
||||||
|
/* Disable endpoint */
|
||||||
|
pcd_set_ep_tx_status(USB, epnum, USB_EP_TX_DIS);
|
||||||
|
pcd_set_ep_rx_status(USB, epnum, USB_EP_RX_DIS);
|
||||||
|
|
||||||
|
pcd_set_eptype(USB, epnum, USB_EP_ISOCHRONOUS);
|
||||||
|
pcd_set_ep_address(USB, epnum, tu_edpt_number(p_endpoint_desc->bEndpointAddress));
|
||||||
|
// Be normal, for now, instead of only accepting zero-byte packets (on control endpoint)
|
||||||
|
// or being double-buffered (bulk endpoints)
|
||||||
|
pcd_clear_ep_kind(USB,0);
|
||||||
|
|
||||||
|
pma_addr = xfer_ctl_ptr(p_endpoint_desc->bEndpointAddress)->pma_ptr;
|
||||||
|
|
||||||
|
*pcd_ep_tx_address_ptr(USB, epnum) = pma_addr;
|
||||||
|
pcd_clear_tx_dtog(USB, epnum);
|
||||||
|
|
||||||
|
*pcd_ep_rx_address_ptr(USB, epnum) = pma_addr;
|
||||||
|
pcd_set_ep_rx_bufsize(USB, epnum, packet_size);
|
||||||
|
pcd_clear_rx_dtog(USB, epnum);
|
||||||
|
|
||||||
|
xfer_ctl_ptr(p_endpoint_desc->bEndpointAddress)->max_packet_size = packet_size;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
// Currently, single-buffered, and only 64 bytes at a time (max)
|
// Currently, single-buffered, and only 64 bytes at a time (max)
|
||||||
|
|
||||||
static void dcd_transmit_packet(xfer_ctl_t * xfer, uint16_t ep_ix)
|
static void dcd_transmit_packet(xfer_ctl_t * xfer, uint16_t ep_ix)
|
||||||
|
|
Loading…
Reference in New Issue