diff options
| author | Andrew Leech <andrew.leech@planetinnovation.com.au> | 2024-10-01 20:41:23 +1000 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2025-06-16 16:36:39 +1000 |
| commit | cfcc53da72d330d2eb9728d5f75c3ef5b459f1cf (patch) | |
| tree | 379cbd6b6f287bc005d18e7414383275b2c679f5 | |
| parent | 573180f7884112e2bc5bf279549b4941f7fab06b (diff) | |
| download | micropython-cfcc53da72d330d2eb9728d5f75c3ef5b459f1cf.tar.gz micropython-cfcc53da72d330d2eb9728d5f75c3ef5b459f1cf.zip | |
drivers/esp-hosted: Replace EVENT_POLL_HOOK with mp_event_wait_ms.
Signed-off-by: Andrew Leech <andrew@alelec.net>
| -rw-r--r-- | drivers/esp-hosted/esp_hosted_bthci_uart.c | 4 | ||||
| -rw-r--r-- | drivers/esp-hosted/esp_hosted_wifi.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/esp-hosted/esp_hosted_bthci_uart.c b/drivers/esp-hosted/esp_hosted_bthci_uart.c index 003054460d..069509edde 100644 --- a/drivers/esp-hosted/esp_hosted_bthci_uart.c +++ b/drivers/esp-hosted/esp_hosted_bthci_uart.c @@ -72,7 +72,7 @@ int esp_hosted_hci_cmd(int ogf, int ocf, size_t param_len, const uint8_t *param_ // Receive HCI event packet, initially reading 3 bytes (HCI Event, Event code, Plen). for (mp_uint_t start = mp_hal_ticks_ms(), size = 3, i = 0; i < size;) { while (!mp_bluetooth_hci_uart_any()) { - MICROPY_EVENT_POLL_HOOK + mp_event_wait_ms(1); // Timeout. if ((mp_hal_ticks_ms() - start) > HCI_COMMAND_TIMEOUT) { error_printf("timeout waiting for HCI packet\n"); @@ -126,7 +126,7 @@ int mp_bluetooth_hci_controller_init(void) { if (mp_bluetooth_hci_uart_any()) { mp_bluetooth_hci_uart_readchar(); } - MICROPY_EVENT_POLL_HOOK + mp_event_wait_ms(1); } #ifdef MICROPY_HW_BLE_UART_BAUDRATE_SECONDARY diff --git a/drivers/esp-hosted/esp_hosted_wifi.c b/drivers/esp-hosted/esp_hosted_wifi.c index d1b6333aa0..763b04db37 100644 --- a/drivers/esp-hosted/esp_hosted_wifi.c +++ b/drivers/esp-hosted/esp_hosted_wifi.c @@ -243,7 +243,7 @@ static int esp_hosted_request(CtrlMsgId msg_id, void *ctrl_payload) { static CtrlMsg *esp_hosted_response(CtrlMsgId msg_id, uint32_t timeout) { CtrlMsg *ctrl_msg = NULL; - for (mp_uint_t start = mp_hal_ticks_ms(); ; mp_hal_delay_ms(10)) { + for (mp_uint_t start = mp_hal_ticks_ms(); ; mp_event_wait_ms(10)) { if (!esp_hosted_stack_empty(&esp_state.stack)) { ctrl_msg = esp_hosted_stack_pop(&esp_state.stack, true); if (ctrl_msg->msg_id == msg_id) { @@ -264,8 +264,6 @@ static CtrlMsg *esp_hosted_response(CtrlMsgId msg_id, uint32_t timeout) { if ((mp_hal_ticks_ms() - start) >= timeout) { return NULL; } - - MICROPY_EVENT_POLL_HOOK } // If message type is a response, check the response struct's return value. |