mirror of
https://github.com/trezor/trezor-firmware.git
synced 2024-12-23 23:08:14 +00:00
trezorhal: fix usb class behaviour
This commit is contained in:
parent
7ef79a73fa
commit
40e20e2e9d
2
Makefile
2
Makefile
@ -81,7 +81,7 @@ style: ## run code style check on application sources and tests
|
||||
|
||||
## 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
|
||||
$(SCONS) CFLAGS="$(CFLAGS)" PRODUCTION="$(PRODUCTION)" $(BOARDLOADER_BUILD_DIR)/boardloader.bin
|
||||
|
@ -271,6 +271,7 @@ USBD_StatusTypeDef USBD_LL_SetupStage(USBD_HandleTypeDef *pdev, uint8_t *psetup)
|
||||
switch (pdev->request.bmRequest & USB_REQ_TYPE_MASK)
|
||||
{
|
||||
case USB_REQ_TYPE_STANDARD:
|
||||
case USB_REQ_TYPE_CLASS:
|
||||
switch (pdev->request.bmRequest & USB_REQ_RECIPIENT_MASK)
|
||||
{
|
||||
case USB_REQ_RECIPIENT_DEVICE:
|
||||
@ -288,15 +289,6 @@ USBD_StatusTypeDef USBD_LL_SetupStage(USBD_HandleTypeDef *pdev, uint8_t *psetup)
|
||||
}
|
||||
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:
|
||||
if (pdev->dev_state == USBD_STATE_CONFIGURED || pdev->dev_state == USBD_STATE_ADDRESSED) {
|
||||
if (pdev->pClass->Setup != NULL)
|
||||
|
Loading…
Reference in New Issue
Block a user