diff options
| author | Jim Mussared | 2020-03-02 22:35:22 +1100 |
|---|---|---|
| committer | Damien George | 2020-04-05 15:02:06 +1000 |
| commit | def76fe4d9bbc2c342594dc05861b24d7165d274 (patch) | |
| tree | d04ad778e2421de0a85835227ba5bcb08562ec24 /ports/esp32/machine_hw_spi.c | |
| parent | 85858e72dfdc3e941c2e620e94de05ad663138b1 (diff) | |
all: Use MP_ERROR_TEXT for all error messages.
Diffstat (limited to 'ports/esp32/machine_hw_spi.c')
| -rw-r--r-- | ports/esp32/machine_hw_spi.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/ports/esp32/machine_hw_spi.c b/ports/esp32/machine_hw_spi.c index e7554e380..f63b24598 100644 --- a/ports/esp32/machine_hw_spi.c +++ b/ports/esp32/machine_hw_spi.c @@ -64,21 +64,21 @@ STATIC machine_hw_spi_obj_t machine_hw_spi_obj[2]; STATIC void machine_hw_spi_deinit_internal(machine_hw_spi_obj_t *self) { switch (spi_bus_remove_device(self->spi)) { case ESP_ERR_INVALID_ARG: - mp_raise_msg(&mp_type_OSError, "invalid configuration"); + mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("invalid configuration")); return; case ESP_ERR_INVALID_STATE: - mp_raise_msg(&mp_type_OSError, "SPI device already freed"); + mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("SPI device already freed")); return; } switch (spi_bus_free(self->host)) { case ESP_ERR_INVALID_ARG: - mp_raise_msg(&mp_type_OSError, "invalid configuration"); + mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("invalid configuration")); return; case ESP_ERR_INVALID_STATE: - mp_raise_msg(&mp_type_OSError, "SPI bus already freed"); + mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("SPI bus already freed")); return; } @@ -159,7 +159,7 @@ STATIC void machine_hw_spi_init_internal( } if (self->host != HSPI_HOST && self->host != VSPI_HOST) { - mp_raise_ValueError("SPI ID must be either HSPI(1) or VSPI(2)"); + mp_raise_ValueError(MP_ERROR_TEXT("SPI ID must be either HSPI(1) or VSPI(2)")); } if (changed) { @@ -201,28 +201,28 @@ STATIC void machine_hw_spi_init_internal( ret = spi_bus_initialize(self->host, &buscfg, dma_chan); switch (ret) { case ESP_ERR_INVALID_ARG: - mp_raise_msg(&mp_type_OSError, "invalid configuration"); + mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("invalid configuration")); return; case ESP_ERR_INVALID_STATE: - mp_raise_msg(&mp_type_OSError, "SPI host already in use"); + mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("SPI host already in use")); return; } ret = spi_bus_add_device(self->host, &devcfg, &self->spi); switch (ret) { case ESP_ERR_INVALID_ARG: - mp_raise_msg(&mp_type_OSError, "invalid configuration"); + mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("invalid configuration")); spi_bus_free(self->host); return; case ESP_ERR_NO_MEM: - mp_raise_msg(&mp_type_OSError, "out of memory"); + mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("out of memory")); spi_bus_free(self->host); return; case ESP_ERR_NOT_FOUND: - mp_raise_msg(&mp_type_OSError, "no free slots"); + mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("no free slots")); spi_bus_free(self->host); return; } @@ -241,7 +241,7 @@ STATIC void machine_hw_spi_transfer(mp_obj_base_t *self_in, size_t len, const ui machine_hw_spi_obj_t *self = MP_OBJ_TO_PTR(self_in); if (self->state == MACHINE_HW_SPI_STATE_DEINIT) { - mp_raise_msg(&mp_type_OSError, "transfer on deinitialized SPI"); + mp_raise_msg(&mp_type_OSError, MP_ERROR_TEXT("transfer on deinitialized SPI")); return; } |
