arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-25 07:48:10 +00:00
Code Issues Releases Wiki Activity

trezorhal: fix usb class behaviour

Browse Source
This commit is contained in:
Pavol Rusnak 2018-02-02 20:06:25 +01:00
parent 7ef79a73fa
commit 40e20e2e9d
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -81,7 +81,7 @@ style: ## run code style check on application sources and tests
## build commands: ## build commands:
build: build_boardloader build_bootloader build_prodtest build_firmware build_unix build_cross ## build all build: build_boardloader build_bootloader build_firmware build_prodtest build_unix ## build all
build_boardloader: ## build boardloader build_boardloader: ## build boardloader
$(SCONS) CFLAGS="$(CFLAGS)" PRODUCTION="$(PRODUCTION)" $(BOARDLOADER_BUILD_DIR)/boardloader.bin $(SCONS) CFLAGS="$(CFLAGS)" PRODUCTION="$(PRODUCTION)" $(BOARDLOADER_BUILD_DIR)/boardloader.bin

10
embed/trezorhal/usbd_core.c
View File

@ -271,6 +271,7 @@ USBD_StatusTypeDef USBD_LL_SetupStage(USBD_HandleTypeDef *pdev, uint8_t *psetup)
switch (pdev->request.bmRequest & USB_REQ_TYPE_MASK) switch (pdev->request.bmRequest & USB_REQ_TYPE_MASK)
{ {
case USB_REQ_TYPE_STANDARD: case USB_REQ_TYPE_STANDARD:
case USB_REQ_TYPE_CLASS:
switch (pdev->request.bmRequest & USB_REQ_RECIPIENT_MASK) switch (pdev->request.bmRequest & USB_REQ_RECIPIENT_MASK)
{ {
case USB_REQ_RECIPIENT_DEVICE: case USB_REQ_RECIPIENT_DEVICE:
@ -288,15 +289,6 @@ USBD_StatusTypeDef USBD_LL_SetupStage(USBD_HandleTypeDef *pdev, uint8_t *psetup)
} }
break; break;
case USB_REQ_TYPE_CLASS:
if (pdev->dev_state == USBD_STATE_CONFIGURED) {
if (pdev->pClass->Setup != NULL)
pdev->pClass->Setup(pdev, &pdev->request);
} else {
USBD_CtlError(pdev, &pdev->request);
}
break;
case USB_REQ_TYPE_VENDOR: case USB_REQ_TYPE_VENDOR:
if (pdev->dev_state == USBD_STATE_CONFIGURED || pdev->dev_state == USBD_STATE_ADDRESSED) { if (pdev->dev_state == USBD_STATE_CONFIGURED || pdev->dev_state == USBD_STATE_ADDRESSED) {
if (pdev->pClass->Setup != NULL) if (pdev->pClass->Setup != NULL)