michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: usb: nordic: Fix class/vendor request handling

Browse source 
SetAddress request (0x05) is ignored and not propagated, because it
is handled by nRF hardware. Curently, request type is not checked
causing class or vendor request 0x05 to be inappropiately ignored.
Only standard requests (type = 0) shoud be ignored. This commit
fixes the issue.

Signed-off-by: Paweł Zadrożniak <pawel.zadrozniak@nordicsemi.no>
This commit is contained in:
Paweł Zadrożniak 2018-12-04 10:50:15 +01:00 • committed by Carles Cufí
commit 6e460ca64f
1 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,11 +29,16 @@
#include <logging/log.h> #include <logging/log.h>
LOG_MODULE_REGISTER(usb_nrfx); LOG_MODULE_REGISTER(usb_nrfx);
#define USB_BMREQUEST_SETADDRESS 0x05 #define USB_BREQUEST_SETADDRESS 0x05
#define USB_BMREQUESTTYPE_POS 7uL #define USB_BMREQUESTTYPE_DIR_POS 7uL
#define USB_BMREQUESTTYPE_MASK (1uL << USB_BMREQUESTTYPE_POS) #define USB_BMREQUESTTYPE_DIR_MASK (1uL << USB_BMREQUESTTYPE_DIR_POS)
#define USB_BMREQUESTTYPE_HOSTTODEVICE_MASK 0uL #define USB_BMREQUESTTYPE_DIR_HOSTTODEVICE_MASK 0uL
#define USB_BMREQUESTTYPE_DEVICETOHOST_MASK (1uL << USB_BMREQUESTTYPE_POS) #define USB_BMREQUESTTYPE_DIR_DEVICETOHOST_MASK (1uL << USB_BMREQUESTTYPE_DIR_POS)
#define USB_BMREQUESTTYPE_TYPE_POS 5uL
#define USB_BMREQUESTTYPE_TYPE_MASK (3uL << USB_BMREQUESTTYPE_TYPE_POS)
#define USB_BMREQUESTTYPE_TYPE_STANDARD_MASK 0uL
#define USB_BMREQUESTTYPE_TYPE_CLASS_MASK (1uL << USB_BMREQUESTTYPE_TYPE_POS)
#define USB_BMREQUESTTYPE_TYPE_CLASS_VENDOR (2uL << USB_BMREQUESTTYPE_TYPE_POS)
#define MAX_EP_BUF_SZ 64UL #define MAX_EP_BUF_SZ 64UL
#define MAX_ISO_EP_BUF_SZ 1024UL #define MAX_ISO_EP_BUF_SZ 1024UL
@ -732,8 +737,8 @@ static inline void usbd_work_process_setup(struct nrf_usbd_ep_ctx *ep_ctx)
struct nrf_usbd_ctx *ctx = get_usbd_ctx(); struct nrf_usbd_ctx *ctx = get_usbd_ctx();
if (((usbd_setup->bmRequestType & USB_BMREQUESTTYPE_MASK) if (((usbd_setup->bmRequestType & USB_BMREQUESTTYPE_DIR_MASK)
== USB_BMREQUESTTYPE_HOSTTODEVICE_MASK) == USB_BMREQUESTTYPE_DIR_HOSTTODEVICE_MASK)
&& (usbd_setup->wLength)) { && (usbd_setup->wLength)) {
struct nrf_usbd_ctx *ctx = get_usbd_ctx(); struct nrf_usbd_ctx *ctx = get_usbd_ctx();
@ -1043,7 +1048,9 @@ static void usbd_event_handler(nrfx_usbd_evt_t const *const p_event)
nrfx_usbd_setup_t drv_setup; nrfx_usbd_setup_t drv_setup;
nrfx_usbd_setup_get(&drv_setup); nrfx_usbd_setup_get(&drv_setup);
if (drv_setup.bRequest != USB_BMREQUEST_SETADDRESS) { if ((drv_setup.bRequest != USB_BREQUEST_SETADDRESS)
|| ((drv_setup.bmRequestType & USB_BMREQUESTTYPE_TYPE_MASK)
!= USB_BMREQUESTTYPE_TYPE_STANDARD_MASK)) {
/* SetAddress is habdled by USBD hardware. /* SetAddress is habdled by USBD hardware.
* No software action required. * No software action required.
*/ */