mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

stm32/mboot: Guard use of tx_pending with USE_USB_POLLING option. 

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George 2023-09-20 19:12:51 +10:00
parent 7cf1118831
commit 859f219690
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ports/stm32/mboot/main.c
View File

@ -966,7 +966,9 @@ static int dfu_handle_tx(int cmd, int arg, int len, uint8_t *buf, int max_len) {
typedef struct _pyb_usbdd_obj_t { typedef struct _pyb_usbdd_obj_t {
bool started; bool started;
#if USE_USB_POLLING
bool tx_pending; bool tx_pending;
#endif
USBD_HandleTypeDef hUSBDDevice; USBD_HandleTypeDef hUSBDDevice;
uint8_t bRequest; uint8_t bRequest;
@ -1160,7 +1162,9 @@ static uint8_t pyb_usbdd_Setup(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *r
// device-to-host request // device-to-host request
int len = dfu_handle_tx(self->bRequest, self->wValue, self->wLength, self->tx_buf, USB_XFER_SIZE); int len = dfu_handle_tx(self->bRequest, self->wValue, self->wLength, self->tx_buf, USB_XFER_SIZE);
if (len >= 0) { if (len >= 0) {
#if USE_USB_POLLING
self->tx_pending = true; self->tx_pending = true;
#endif
USBD_CtlSendData(&self->hUSBDDevice, self->tx_buf, len); USBD_CtlSendData(&self->hUSBDDevice, self->tx_buf, len);
} }
} }
@ -1168,9 +1172,10 @@ static uint8_t pyb_usbdd_Setup(USBD_HandleTypeDef *pdev, USBD_SetupReqTypedef *r
} }
static uint8_t pyb_usbdd_EP0_TxSent(USBD_HandleTypeDef *pdev) { static uint8_t pyb_usbdd_EP0_TxSent(USBD_HandleTypeDef *pdev) {
#if USE_USB_POLLING
pyb_usbdd_obj_t *self = (pyb_usbdd_obj_t *)pdev->pClassData; pyb_usbdd_obj_t *self = (pyb_usbdd_obj_t *)pdev->pClassData;
self->tx_pending = false; self->tx_pending = false;
#if !USE_USB_POLLING #else
// Process now that we have sent a response // Process now that we have sent a response
dfu_process(); dfu_process();
#endif #endif
@ -1243,7 +1248,9 @@ static int pyb_usbdd_detect_port(void) {
static void pyb_usbdd_init(pyb_usbdd_obj_t *self, int phy_id) { static void pyb_usbdd_init(pyb_usbdd_obj_t *self, int phy_id) {
self->started = false; self->started = false;
#if USE_USB_POLLING
self->tx_pending = false; self->tx_pending = false;
#endif
USBD_HandleTypeDef *usbd = &self->hUSBDDevice; USBD_HandleTypeDef *usbd = &self->hUSBDDevice;
usbd->id = phy_id; usbd->id = phy_id;
usbd->dev_state = USBD_STATE_DEFAULT; usbd->dev_state = USBD_STATE_DEFAULT;