Skip to content

Commit

Permalink
drivers: nrfx: rename USB output endpoint buffers
Browse files Browse the repository at this point in the history 
Rename USB output endpoint buffer member of the endpoint context structure
in preparation for the addition of input endpoint buffers.

Signed-off-by: Keeley Hoek <[email protected]>
  • Loading branch information
@khoek
khoek committed Apr 10, 2024
1 parent b9f3d68 commit bfc35ac
Showing 1 changed file with 33 additions and 33 deletions.
66 changes: 33 additions & 33 deletions drivers/usb/device/usb_dc_nrfx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ struct nrf_usbd_ep_buf {
*/
struct nrf_usbd_ep_ctx {
struct nrf_usbd_ep_cfg cfg;
struct nrf_usbd_ep_buf buf;
struct nrf_usbd_ep_buf out_buf;
volatile bool read_complete;
volatile bool read_pending;
volatile bool write_in_progress;
Expand Down Expand Up @@ -202,17 +202,17 @@ K_MEM_SLAB_DEFINE(fifo_elem_slab, FIFO_ELEM_SZ,
#define EP_ISOIN_INDEX CFG_EPIN_CNT
#define EP_ISOOUT_INDEX (CFG_EPIN_CNT + CFG_EP_ISOIN_CNT + CFG_EPOUT_CNT)

#define EP_BUF_MAX_SZ 64UL
#define ISO_EP_BUF_MAX_SZ 1024UL
#define EP_OUT_BUF_MAX_SZ 64UL
#define ISO_EP_OUT_BUF_MAX_SZ 1024UL

/**
* @brief Output endpoint buffers
* Used as buffers for the endpoints' data transfer
* Used as buffers for the output endpoints' data transfer
* Max buffers size possible: 1536 Bytes (8 EP * 64B + 1 ISO * 1024B)
*/
static uint8_t ep_out_bufs[CFG_EPOUT_CNT][EP_BUF_MAX_SZ]
static uint8_t ep_out_bufs[CFG_EPOUT_CNT][EP_OUT_BUF_MAX_SZ]
__aligned(sizeof(uint32_t));
static uint8_t ep_isoout_bufs[CFG_EP_ISOOUT_CNT][ISO_EP_BUF_MAX_SZ]
static uint8_t ep_isoout_bufs[CFG_EP_ISOOUT_CNT][ISO_EP_OUT_BUF_MAX_SZ]
__aligned(sizeof(uint32_t));

/** Total endpoints configured */
Expand Down Expand Up @@ -601,9 +601,9 @@ static void usbd_enable_endpoints(struct nrf_usbd_ctx *ctx)
*/
static void ep_ctx_reset(struct nrf_usbd_ep_ctx *ep_ctx)
{
ep_ctx->buf.data = ep_ctx->buf.block.data;
ep_ctx->buf.curr = ep_ctx->buf.data;
ep_ctx->buf.len = 0U;
ep_ctx->out_buf.data = ep_ctx->out_buf.block.data;
ep_ctx->out_buf.curr = ep_ctx->out_buf.data;
ep_ctx->out_buf.len = 0U;

/* Abort ongoing write operation. */
if (ep_ctx->write_in_progress) {
Expand Down Expand Up @@ -638,8 +638,8 @@ static int eps_ctx_init(void)
ep_ctx = out_endpoint_ctx(i);
__ASSERT_NO_MSG(ep_ctx);

if (!ep_ctx->buf.block.data) {
ep_ctx->buf.block.data = ep_out_bufs[i];
if (!ep_ctx->out_buf.block.data) {
ep_ctx->out_buf.block.data = ep_out_bufs[i];
}

ep_ctx_reset(ep_ctx);
Expand All @@ -657,8 +657,8 @@ static int eps_ctx_init(void)
ep_ctx = out_endpoint_ctx(NRF_USBD_EPOUT(8));
__ASSERT_NO_MSG(ep_ctx);

if (!ep_ctx->buf.block.data) {
ep_ctx->buf.block.data = ep_isoout_bufs[0];
if (!ep_ctx->out_buf.block.data) {
ep_ctx->out_buf.block.data = ep_isoout_bufs[0];
}

ep_ctx_reset(ep_ctx);
Expand Down Expand Up @@ -745,14 +745,14 @@ static inline void usbd_work_process_setup(struct nrf_usbd_ep_ctx *ep_ctx)
* For compatibility with the USB stack,
* SETUP packet must be reassembled.
*/
usbd_setup = (struct usb_setup_packet *)ep_ctx->buf.data;
usbd_setup = (struct usb_setup_packet *)ep_ctx->out_buf.data;
memset(usbd_setup, 0, sizeof(struct usb_setup_packet));
usbd_setup->bmRequestType = nrf_usbd_setup_bmrequesttype_get(NRF_USBD);
usbd_setup->bRequest = nrf_usbd_setup_brequest_get(NRF_USBD);
usbd_setup->wValue = nrf_usbd_setup_wvalue_get(NRF_USBD);
usbd_setup->wIndex = nrf_usbd_setup_windex_get(NRF_USBD);
usbd_setup->wLength = nrf_usbd_setup_wlength_get(NRF_USBD);
ep_ctx->buf.len = sizeof(struct usb_setup_packet);
ep_ctx->out_buf.len = sizeof(struct usb_setup_packet);

/* Copy setup packet to driver internal structure */
memcpy(&usbd_ctx.setup, usbd_setup, sizeof(struct usb_setup_packet));
Expand Down Expand Up @@ -792,7 +792,7 @@ static inline void usbd_work_process_recvreq(struct nrf_usbd_ctx *ctx,
ep_ctx->read_complete = false;

k_mutex_lock(&ctx->drv_lock, K_FOREVER);
NRF_USBD_COMMON_TRANSFER_OUT(transfer, ep_ctx->buf.data,
NRF_USBD_COMMON_TRANSFER_OUT(transfer, ep_ctx->out_buf.data,
ep_ctx->cfg.max_sz);
nrfx_err_t err = nrf_usbd_common_ep_transfer(
ep_addr_to_nrfx(ep_ctx->cfg.addr), &transfer);
Expand Down Expand Up @@ -916,17 +916,17 @@ static void usbd_event_transfer_ctrl(nrf_usbd_common_evt_t const *const p_event)
ev->evt.ep_evt.ep = ep_ctx;

err_code = nrf_usbd_common_ep_status_get(
p_event->data.eptransfer.ep, &ep_ctx->buf.len);
p_event->data.eptransfer.ep, &ep_ctx->out_buf.len);

if (err_code != NRF_USBD_COMMON_EP_OK) {
LOG_ERR("_ep_status_get failed! Code: %d",
err_code);
__ASSERT_NO_MSG(0);
}
LOG_DBG("ctrl read done: %d", ep_ctx->buf.len);
LOG_DBG("ctrl read done: %d", ep_ctx->out_buf.len);

if (ctx->ctrl_read_len > ep_ctx->buf.len) {
ctx->ctrl_read_len -= ep_ctx->buf.len;
if (ctx->ctrl_read_len > ep_ctx->out_buf.len) {
ctx->ctrl_read_len -= ep_ctx->out_buf.len;
/* Allow next data chunk on EP0 OUT */
nrf_usbd_common_setup_data_clear();
} else {
Expand Down Expand Up @@ -1017,12 +1017,12 @@ static void usbd_event_transfer_data(nrf_usbd_common_evt_t const *const p_event)
return;
}

ep_ctx->buf.len = nrf_usbd_ep_amount_get(NRF_USBD,
ep_ctx->out_buf.len = nrf_usbd_ep_amount_get(NRF_USBD,
p_event->data.eptransfer.ep);

LOG_DBG("read complete, ep 0x%02x, len %d",
(uint32_t)p_event->data.eptransfer.ep,
ep_ctx->buf.len);
ep_ctx->out_buf.len);

ev->evt_type = USBD_EVT_EP;
ev->evt.ep_evt.evt_type = EP_EVT_RECV_COMPLETE;
Expand Down Expand Up @@ -1473,8 +1473,8 @@ int usb_dc_ep_set_stall(const uint8_t ep)
return -EINVAL;
}

ep_ctx->buf.len = 0U;
ep_ctx->buf.curr = ep_ctx->buf.data;
ep_ctx->out_buf.len = 0U;
ep_ctx->out_buf.curr = ep_ctx->out_buf.data;

LOG_DBG("STALL on EP 0x%02x", ep);

Expand Down Expand Up @@ -1612,8 +1612,8 @@ int usb_dc_ep_flush(const uint8_t ep)
return -EINVAL;
}

ep_ctx->buf.len = 0U;
ep_ctx->buf.curr = ep_ctx->buf.data;
ep_ctx->out_buf.len = 0U;
ep_ctx->out_buf.curr = ep_ctx->out_buf.data;

nrf_usbd_common_transfer_out_drop(ep_addr_to_nrfx(ep));

Expand Down Expand Up @@ -1741,20 +1741,20 @@ int usb_dc_ep_read_wait(uint8_t ep, uint8_t *data, uint32_t max_data_len,

k_mutex_lock(&ctx->drv_lock, K_FOREVER);

bytes_to_copy = MIN(max_data_len, ep_ctx->buf.len);
bytes_to_copy = MIN(max_data_len, ep_ctx->out_buf.len);

if (!data && !max_data_len) {
if (read_bytes) {
*read_bytes = ep_ctx->buf.len;
*read_bytes = ep_ctx->out_buf.len;
}
k_mutex_unlock(&ctx->drv_lock);
return 0;
}

memcpy(data, ep_ctx->buf.curr, bytes_to_copy);
memcpy(data, ep_ctx->out_buf.curr, bytes_to_copy);

ep_ctx->buf.curr += bytes_to_copy;
ep_ctx->buf.len -= bytes_to_copy;
ep_ctx->out_buf.curr += bytes_to_copy;
ep_ctx->out_buf.len -= bytes_to_copy;
if (read_bytes) {
*read_bytes = bytes_to_copy;
}
Expand Down Expand Up @@ -1787,8 +1787,8 @@ int usb_dc_ep_read_continue(uint8_t ep)
}

k_mutex_lock(&ctx->drv_lock, K_FOREVER);
if (!ep_ctx->buf.len) {
ep_ctx->buf.curr = ep_ctx->buf.data;
if (!ep_ctx->out_buf.len) {
ep_ctx->out_buf.curr = ep_ctx->out_buf.data;
ep_ctx->read_complete = true;

if (ep_ctx->read_pending) {
Expand Down

0 comments on commit bfc35ac

Please sign in to comment.