michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: usb_dc_nrfx: cleanup logging and fix style

Browse source 
Cleanup logging and fix style. Use hex format specifier
for endpoint address. Remove periods from log messages.

Signed-off-by: Johann Fischer <j.fischer@phytec.de>
This commit is contained in:
Johann Fischer 2019-05-29 14:07:47 +02:00 • committed by Anas Nashif
commit 105fccfb2d
1 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

72
drivers/usb/device/usb_dc_nrfx.c
View file

@ -465,7 +465,7 @@ static inline struct usbd_event *usbd_evt_alloc(void)
K_NO_WAIT); K_NO_WAIT);
if (ret < 0) { if (ret < 0) {
/* This should never fail in a properly operating system. */ /* This should never fail in a properly operating system. */
LOG_ERR("USBD event memory corrupted."); LOG_ERR("USBD event memory corrupted");
__ASSERT_NO_MSG(0); __ASSERT_NO_MSG(0);
return NULL; return NULL;
} }
@ -665,7 +665,7 @@ static int eps_ctx_init(void)
err = k_mem_pool_alloc(&ep_buf_pool, &ep_ctx->buf.block, err = k_mem_pool_alloc(&ep_buf_pool, &ep_ctx->buf.block,
MAX_EP_BUF_SZ, K_NO_WAIT); MAX_EP_BUF_SZ, K_NO_WAIT);
if (err < 0) { if (err < 0) {
LOG_ERR("EP buffer alloc failed for EPIN%d", i); LOG_ERR("Buffer alloc failed for EP 0x%02x", i);
return -ENOMEM; return -ENOMEM;
} }
} }
@ -681,7 +681,7 @@ static int eps_ctx_init(void)
err = k_mem_pool_alloc(&ep_buf_pool, &ep_ctx->buf.block, err = k_mem_pool_alloc(&ep_buf_pool, &ep_ctx->buf.block,
MAX_EP_BUF_SZ, K_NO_WAIT); MAX_EP_BUF_SZ, K_NO_WAIT);
if (err < 0) { if (err < 0) {
LOG_ERR("EP buffer alloc failed for EPOUT%d", i); LOG_ERR("Buffer alloc failed for EP 0x%02x", i);
return -ENOMEM; return -ENOMEM;
} }
} }
@ -885,7 +885,7 @@ static inline void usbd_work_process_recvreq(struct nrf_usbd_ctx *ctx,
nrfx_err_t err = nrfx_usbd_ep_transfer( nrfx_err_t err = nrfx_usbd_ep_transfer(
ep_addr_to_nrfx(ep_ctx->cfg.addr), &transfer); ep_addr_to_nrfx(ep_ctx->cfg.addr), &transfer);
if (err != NRFX_SUCCESS) { if (err != NRFX_SUCCESS) {
LOG_ERR("nRF USBD transfer error (OUT): %d.", err); LOG_ERR("nRF USBD transfer error (OUT): 0x%02x", err);
} }
k_mutex_unlock(&ctx->drv_lock); k_mutex_unlock(&ctx->drv_lock);
} }
@ -958,8 +958,7 @@ static void usbd_event_transfer_ctrl(nrfx_usbd_evt_t const *const p_event)
break; break;
default: { default: {
LOG_ERR( LOG_ERR("Unexpected event (nrfx_usbd): %d, ep 0x%02x",
"Unexpected event (nrfx_usbd): %d, ep %d",
p_event->data.eptransfer.status, p_event->data.eptransfer.status,
p_event->data.eptransfer.ep); p_event->data.eptransfer.ep);
} }
@ -1003,7 +1002,7 @@ static void usbd_event_transfer_ctrl(nrfx_usbd_evt_t const *const p_event)
p_event->data.eptransfer.ep, &ep_ctx->buf.len); p_event->data.eptransfer.ep, &ep_ctx->buf.len);
if (err_code != NRFX_USBD_EP_OK) { if (err_code != NRFX_USBD_EP_OK) {
LOG_ERR("_ep_status_get failed! Code: %d.", LOG_ERR("_ep_status_get failed! Code: %d",
err_code); err_code);
__ASSERT_NO_MSG(0); __ASSERT_NO_MSG(0);
} }
@ -1022,7 +1021,7 @@ static void usbd_event_transfer_ctrl(nrfx_usbd_evt_t const *const p_event)
break; break;
default: { default: {
LOG_ERR("Unexpected event from nrfx_usbd: %d, ep %d", LOG_ERR("Unexpected event (nrfx_usbd): %d, ep 0x%02x",
p_event->data.eptransfer.status, p_event->data.eptransfer.status,
p_event->data.eptransfer.ep); p_event->data.eptransfer.ep);
} }
@ -1045,7 +1044,7 @@ static void usbd_event_transfer_data(nrfx_usbd_evt_t const *const p_event)
return; return;
} }
LOG_DBG("write complete, ep %d", LOG_DBG("write complete, ep 0x%02x",
(u32_t)p_event->data.eptransfer.ep); (u32_t)p_event->data.eptransfer.ep);
ep_ctx->write_in_progress = false; ep_ctx->write_in_progress = false;
@ -1058,7 +1057,7 @@ static void usbd_event_transfer_data(nrfx_usbd_evt_t const *const p_event)
break; break;
default: { default: {
LOG_ERR("Unexpected event from nrfx_usbd: %d, ep %d", LOG_ERR("Unexpected event (nrfx_usbd): %d, ep 0x%02x",
p_event->data.eptransfer.status, p_event->data.eptransfer.status,
p_event->data.eptransfer.ep); p_event->data.eptransfer.ep);
} }
@ -1074,7 +1073,7 @@ static void usbd_event_transfer_data(nrfx_usbd_evt_t const *const p_event)
return; return;
} }
LOG_DBG("read request, ep %d", LOG_DBG("read request, ep 0x%02x",
(u32_t)p_event->data.eptransfer.ep); (u32_t)p_event->data.eptransfer.ep);
ep_ctx->read_pending = true; ep_ctx->read_pending = true;
@ -1097,7 +1096,7 @@ static void usbd_event_transfer_data(nrfx_usbd_evt_t const *const p_event)
ep_ctx->buf.len = nrf_usbd_ep_amount_get( ep_ctx->buf.len = nrf_usbd_ep_amount_get(
p_event->data.eptransfer.ep); p_event->data.eptransfer.ep);
LOG_DBG("read complete, ep %d, len %d", LOG_DBG("read complete, ep 0x%02x, len %d",
(u32_t)p_event->data.eptransfer.ep, (u32_t)p_event->data.eptransfer.ep,
ep_ctx->buf.len); ep_ctx->buf.len);
@ -1111,7 +1110,7 @@ static void usbd_event_transfer_data(nrfx_usbd_evt_t const *const p_event)
break; break;
default: { default: {
LOG_ERR("Unexpected event from nrfx_usbd: %d, ep %d", LOG_ERR("Unexpected event (nrfx_usbd): %d, ep 0x%02x",
p_event->data.eptransfer.status, p_event->data.eptransfer.status,
p_event->data.eptransfer.ep); p_event->data.eptransfer.ep);
} }
@ -1131,19 +1130,19 @@ static void usbd_event_handler(nrfx_usbd_evt_t const *const p_event)
switch (p_event->type) { switch (p_event->type) {
case NRFX_USBD_EVT_SUSPEND: case NRFX_USBD_EVT_SUSPEND:
LOG_DBG("SUSPEND state detected."); LOG_DBG("SUSPEND state detected");
evt.evt_type = USBD_EVT_POWER; evt.evt_type = USBD_EVT_POWER;
evt.evt.pwr_evt.state = USBD_SUSPENDED; evt.evt.pwr_evt.state = USBD_SUSPENDED;
put_evt = true; put_evt = true;
break; break;
case NRFX_USBD_EVT_RESUME: case NRFX_USBD_EVT_RESUME:
LOG_DBG("RESUMING from suspend."); LOG_DBG("RESUMING from suspend");
evt.evt_type = USBD_EVT_POWER; evt.evt_type = USBD_EVT_POWER;
evt.evt.pwr_evt.state = USBD_RESUMED; evt.evt.pwr_evt.state = USBD_RESUMED;
put_evt = true; put_evt = true;
break; break;
case NRFX_USBD_EVT_WUREQ: case NRFX_USBD_EVT_WUREQ:
LOG_DBG("RemoteWU initiated."); LOG_DBG("RemoteWU initiated");
break; break;
case NRFX_USBD_EVT_RESET: case NRFX_USBD_EVT_RESET:
evt.evt_type = USBD_EVT_RESET; evt.evt_type = USBD_EVT_RESET;
@ -1231,8 +1230,7 @@ static inline void usbd_reinit(void)
err = nrfx_usbd_init(usbd_event_handler); err = nrfx_usbd_init(usbd_event_handler);
if (err != NRFX_SUCCESS) { if (err != NRFX_SUCCESS) {
LOG_DBG("nRF USBD driver reinit failed. Code: %d.", LOG_DBG("nRF USBD driver reinit failed. Code: %d", (u32_t)err);
(u32_t)err);
__ASSERT_NO_MSG(0); __ASSERT_NO_MSG(0);
} }
} }
@ -1255,7 +1253,7 @@ static void usbd_work_handler(struct k_work *item)
switch (ev->evt_type) { switch (ev->evt_type) {
case USBD_EVT_EP: case USBD_EVT_EP:
if (!ctx->attached) { if (!ctx->attached) {
LOG_ERR("EP %d event dropped (not attached).", LOG_ERR("not attached, EP 0x%02x event dropped",
(u32_t)ev->evt.ep_evt.ep->cfg.addr); (u32_t)ev->evt.ep_evt.ep->cfg.addr);
} }
usbd_work_process_ep_events(&ev->evt.ep_evt); usbd_work_process_ep_events(&ev->evt.ep_evt);
@ -1264,7 +1262,7 @@ static void usbd_work_handler(struct k_work *item)
usbd_work_process_pwr_events(&ev->evt.pwr_evt); usbd_work_process_pwr_events(&ev->evt.pwr_evt);
break; break;
case USBD_EVT_RESET: case USBD_EVT_RESET:
LOG_DBG("USBD reset event."); LOG_DBG("USBD reset event");
k_mutex_lock(&ctx->drv_lock, K_FOREVER); k_mutex_lock(&ctx->drv_lock, K_FOREVER);
eps_ctx_init(); eps_ctx_init();
k_mutex_unlock(&ctx->drv_lock); k_mutex_unlock(&ctx->drv_lock);
@ -1279,13 +1277,16 @@ static void usbd_work_handler(struct k_work *item)
} }
break; break;
case USBD_EVT_REINIT: { case USBD_EVT_REINIT: {
/* Reinitialize the peripheral after queue overflow. */ /*
* Reinitialize the peripheral after queue
* overflow.
*/
LOG_ERR("USBD event queue full!"); LOG_ERR("USBD event queue full!");
usbd_reinit(); usbd_reinit();
break; break;
} }
default: default:
LOG_ERR("Unknown USBD event: %"PRId16".", ev->evt_type); LOG_ERR("Unknown USBD event: %"PRId16, ev->evt_type);
break; break;
} }
usbd_evt_free(ev); usbd_evt_free(ev);
@ -1312,8 +1313,7 @@ int usb_dc_attach(void)
err = nrfx_usbd_init(usbd_event_handler); err = nrfx_usbd_init(usbd_event_handler);
if (err != NRFX_SUCCESS) { if (err != NRFX_SUCCESS) {
LOG_DBG("nRF USBD driver init failed. Code: %d.", LOG_DBG("nRF USBD driver init failed. Code: %d", (u32_t)err);
(u32_t)err);
return -EIO; return -EIO;
} }
nrf5_power_usb_power_int_enable(true); nrf5_power_usb_power_int_enable(true);
@ -1369,7 +1369,7 @@ int usb_dc_reset(void)
return -ENODEV; return -ENODEV;
} }
LOG_DBG("USBD Reset."); LOG_DBG("USBD Reset");
ret = usb_dc_detach(); ret = usb_dc_detach();
if (ret) { if (ret) {
@ -1400,7 +1400,7 @@ int usb_dc_set_address(const u8_t addr)
ctx = get_usbd_ctx(); ctx = get_usbd_ctx();
LOG_DBG("Address set to: %d.", addr); LOG_DBG("Address set to: %d", addr);
return 0; return 0;
} }
@ -1410,7 +1410,7 @@ int usb_dc_ep_check_cap(const struct usb_dc_ep_cfg_data *const ep_cfg)
{ {
u8_t ep_idx = NRF_USBD_EP_NR_GET(ep_cfg->ep_addr); u8_t ep_idx = NRF_USBD_EP_NR_GET(ep_cfg->ep_addr);
LOG_DBG("ep %x, mps %d, type %d", ep_cfg->ep_addr, ep_cfg->ep_mps, LOG_DBG("ep 0x%02x, mps %d, type %d", ep_cfg->ep_addr, ep_cfg->ep_mps,
ep_cfg->ep_type); ep_cfg->ep_type);
if ((ep_cfg->ep_type == USB_DC_EP_CONTROL) && ep_idx) { if ((ep_cfg->ep_type == USB_DC_EP_CONTROL) && ep_idx) {
@ -1460,7 +1460,7 @@ int usb_dc_ep_configure(const struct usb_dc_ep_cfg_data *const ep_cfg)
ep_ctx->cfg.max_sz = ep_cfg->ep_mps; ep_ctx->cfg.max_sz = ep_cfg->ep_mps;
if ((ep_cfg->ep_mps & (ep_cfg->ep_mps - 1)) != 0U) { if ((ep_cfg->ep_mps & (ep_cfg->ep_mps - 1)) != 0U) {
LOG_ERR("EP max packet size must be a power of 2."); LOG_ERR("EP max packet size must be a power of 2");
return -EINVAL; return -EINVAL;
} }
nrfx_usbd_ep_max_packet_size_set(ep_addr_to_nrfx(ep_cfg->ep_addr), nrfx_usbd_ep_max_packet_size_set(ep_addr_to_nrfx(ep_cfg->ep_addr),
@ -1491,14 +1491,14 @@ int usb_dc_ep_set_stall(const u8_t ep)
nrfx_usbd_ep_stall(ep_addr_to_nrfx(ep)); nrfx_usbd_ep_stall(ep_addr_to_nrfx(ep));
break; break;
case USB_DC_EP_ISOCHRONOUS: case USB_DC_EP_ISOCHRONOUS:
LOG_ERR("STALL unsupported on ISO endpoint.s"); LOG_ERR("STALL unsupported on ISO endpoint");
return -EINVAL; return -EINVAL;
} }
ep_ctx->buf.len = 0U; ep_ctx->buf.len = 0U;
ep_ctx->buf.curr = ep_ctx->buf.data; ep_ctx->buf.curr = ep_ctx->buf.data;
LOG_DBG("STALL on EP %d.", ep); LOG_DBG("STALL on EP 0x%02x", ep);
return 0; return 0;
} }
@ -1518,7 +1518,7 @@ int usb_dc_ep_clear_stall(const u8_t ep)
} }
nrfx_usbd_ep_stall_clear(ep_addr_to_nrfx(ep)); nrfx_usbd_ep_stall_clear(ep_addr_to_nrfx(ep));
LOG_DBG("Unstall on EP %d", ep); LOG_DBG("Unstall on EP 0x%02x", ep);
return 0; return 0;
} }
@ -1563,7 +1563,7 @@ int usb_dc_ep_enable(const u8_t ep)
return -EALREADY; return -EALREADY;
} }
LOG_DBG("EP enable: %d.", ep); LOG_DBG("EP enable: 0x%02x", ep);
ep_ctx->cfg.en = true; ep_ctx->cfg.en = true;
@ -1592,7 +1592,7 @@ int usb_dc_ep_disable(const u8_t ep)
return -EALREADY; return -EALREADY;
} }
LOG_DBG("EP disable: %d.", ep); LOG_DBG("EP disable: 0x%02x", ep);
nrfx_usbd_ep_disable(ep_addr_to_nrfx(ep)); nrfx_usbd_ep_disable(ep_addr_to_nrfx(ep));
ep_ctx->cfg.en = false; ep_ctx->cfg.en = false;
@ -1624,7 +1624,7 @@ int usb_dc_ep_flush(const u8_t ep)
int usb_dc_ep_write(const u8_t ep, const u8_t *const data, int usb_dc_ep_write(const u8_t ep, const u8_t *const data,
const u32_t data_len, u32_t *const ret_bytes) const u32_t data_len, u32_t *const ret_bytes)
{ {
LOG_DBG("ep_write: ep %d, len %d", ep, data_len); LOG_DBG("ep_write: ep 0x%02x, len %d", ep, data_len);
struct nrf_usbd_ctx *ctx = get_usbd_ctx(); struct nrf_usbd_ctx *ctx = get_usbd_ctx();
struct nrf_usbd_ep_ctx *ep_ctx; struct nrf_usbd_ep_ctx *ep_ctx;
u32_t bytes_to_copy; u32_t bytes_to_copy;
@ -1694,7 +1694,7 @@ int usb_dc_ep_write(const u8_t ep, const u8_t *const data,
if (err != NRFX_SUCCESS) { if (err != NRFX_SUCCESS) {
ep_ctx->write_in_progress = false; ep_ctx->write_in_progress = false;
result = -EIO; result = -EIO;
LOG_ERR("nRF USBD write error: %d.", (u32_t)err); LOG_ERR("nRF USBD write error: %d", (u32_t)err);
} }
k_mutex_unlock(&ctx->drv_lock); k_mutex_unlock(&ctx->drv_lock);
@ -1794,7 +1794,7 @@ int usb_dc_ep_read_continue(u8_t ep)
int usb_dc_ep_read(const u8_t ep, u8_t *const data, int usb_dc_ep_read(const u8_t ep, u8_t *const data,
const u32_t max_data_len, u32_t *const read_bytes) const u32_t max_data_len, u32_t *const read_bytes)
{ {
LOG_DBG("ep_read: ep %d, maxlen %d", ep, max_data_len); LOG_DBG("ep_read: ep 0x%02x, maxlen %d", ep, max_data_len);
int ret; int ret;
ret = usb_dc_ep_read_wait(ep, data, max_data_len, read_bytes); ret = usb_dc_ep_read_wait(ep, data, max_data_len, read_bytes);