GitHub/candleLight_fw
1
0
Fork 0
mirror of https://github.com/candle-usb/candleLight_fw.git synced 2025-01-28 06:02:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: don't go into bootloader mode when gs_usb driver enumerates the device

Browse Source
This commit is contained in:
Hubert Denkmair 2016-04-22 23:50:28 +02:00
parent 082b673ce0
commit ab65b65e4c
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/usbd_gs_can.c
View File

@ -400,9 +400,11 @@ static uint8_t USBD_GS_CAN_DFU_Request(USBD_HandleTypeDef *pdev, USBD_SetupReqTy
{ {
USBD_GS_CAN_HandleTypeDef *hcan = (USBD_GS_CAN_HandleTypeDef*) pdev->pClassData; USBD_GS_CAN_HandleTypeDef *hcan = (USBD_GS_CAN_HandleTypeDef*) pdev->pClassData;
switch (req->bRequest) { switch (req->bRequest) {
case 0: // DETACH request case 0: // DETACH request
hcan->dfu_detach_requested = true; hcan->dfu_detach_requested = true;
break; break;
case 3: // GET_STATIS request case 3: // GET_STATIS request
hcan->ep0_buf[0] = 0x00; // bStatus: 0x00 == OK hcan->ep0_buf[0] = 0x00; // bStatus: 0x00 == OK
hcan->ep0_buf[1] = 0x00; // bwPollTimeout hcan->ep0_buf[1] = 0x00; // bwPollTimeout
@ -412,8 +414,10 @@ static uint8_t USBD_GS_CAN_DFU_Request(USBD_HandleTypeDef *pdev, USBD_SetupReqTy
hcan->ep0_buf[5] = 0xFF; // status string descriptor index hcan->ep0_buf[5] = 0xFF; // status string descriptor index
USBD_CtlSendData(pdev, hcan->ep0_buf, 6); USBD_CtlSendData(pdev, hcan->ep0_buf, 6);
break; break;
default: default:
USBD_CtlError(pdev, req); USBD_CtlError(pdev, req);
} }
return USBD_OK; return USBD_OK;
} }
@ -450,11 +454,17 @@ static uint8_t USBD_GS_CAN_Config_Request(USBD_HandleTypeDef *pdev, USBD_SetupRe
static uint8_t USBD_GS_CAN_Vendor_Request(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req) static uint8_t USBD_GS_CAN_Vendor_Request(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *req)
{ {
switch (LOBYTE(req->wIndex)) { uint8_t req_rcpt = req->bmRequest & 0x1F;
case DFU_INTERFACE_NUM: uint8_t req_type = (req->bmRequest >> 5) & 0x03;
return USBD_GS_CAN_DFU_Request(pdev, req);
default: if (
return USBD_GS_CAN_Config_Request(pdev, req); (req_type == 0x01) // class request
&& (req_rcpt == 0x01) // recipient: interface
&& (req->wIndex == DFU_INTERFACE_NUM)
) {
return USBD_GS_CAN_DFU_Request(pdev, req);
} else {
return USBD_GS_CAN_Config_Request(pdev, req);
} }
} }