Merge branch 'bugfix/assert' into 'master'
assert: Fix. Move useful functions from wrapped assert functions See merge request idf/esp-idf!2599
This commit is contained in:
commit
1cd9949f2d
3 changed files with 14 additions and 6 deletions
|
@ -28,7 +28,10 @@ bootloader_sha256_handle_t bootloader_sha256_start()
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
mbedtls_sha256_init(ctx);
|
mbedtls_sha256_init(ctx);
|
||||||
assert(mbedtls_sha256_starts_ret(ctx, false) == 0);
|
int ret = mbedtls_sha256_starts_ret(ctx, false);
|
||||||
|
if (ret != 0) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
return ctx;
|
return ctx;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -36,7 +39,8 @@ void bootloader_sha256_data(bootloader_sha256_handle_t handle, const void *data,
|
||||||
{
|
{
|
||||||
assert(handle != NULL);
|
assert(handle != NULL);
|
||||||
mbedtls_sha256_context *ctx = (mbedtls_sha256_context *)handle;
|
mbedtls_sha256_context *ctx = (mbedtls_sha256_context *)handle;
|
||||||
assert(mbedtls_sha256_update_ret(ctx, data, data_len) == 0);
|
int ret = mbedtls_sha256_update_ret(ctx, data, data_len);
|
||||||
|
assert(ret == 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void bootloader_sha256_finish(bootloader_sha256_handle_t handle, uint8_t *digest)
|
void bootloader_sha256_finish(bootloader_sha256_handle_t handle, uint8_t *digest)
|
||||||
|
@ -44,7 +48,8 @@ void bootloader_sha256_finish(bootloader_sha256_handle_t handle, uint8_t *digest
|
||||||
assert(handle != NULL);
|
assert(handle != NULL);
|
||||||
mbedtls_sha256_context *ctx = (mbedtls_sha256_context *)handle;
|
mbedtls_sha256_context *ctx = (mbedtls_sha256_context *)handle;
|
||||||
if (digest != NULL) {
|
if (digest != NULL) {
|
||||||
assert(mbedtls_sha256_finish_ret(ctx, digest) == 0);
|
int ret = mbedtls_sha256_finish_ret(ctx, digest);
|
||||||
|
assert(ret == 0);
|
||||||
}
|
}
|
||||||
mbedtls_sha256_free(ctx);
|
mbedtls_sha256_free(ctx);
|
||||||
free(handle);
|
free(handle);
|
||||||
|
|
|
@ -185,7 +185,8 @@ void *multi_heap_malloc(multi_heap_handle_t heap, size_t size)
|
||||||
data = poison_allocated_region(head, size);
|
data = poison_allocated_region(head, size);
|
||||||
#ifdef SLOW
|
#ifdef SLOW
|
||||||
/* check everything we got back is FREE_FILL_PATTERN & swap for MALLOC_FILL_PATTERN */
|
/* check everything we got back is FREE_FILL_PATTERN & swap for MALLOC_FILL_PATTERN */
|
||||||
assert( verify_fill_pattern(data, size, true, true, true) );
|
bool ret = verify_fill_pattern(data, size, true, true, true);
|
||||||
|
assert( ret );
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -28,8 +28,10 @@ void app_main(void)
|
||||||
|
|
||||||
gpio_num_t adc_gpio_num, dac_gpio_num;
|
gpio_num_t adc_gpio_num, dac_gpio_num;
|
||||||
|
|
||||||
assert( adc2_pad_get_io_num( ADC2_EXAMPLE_CHANNEL, &adc_gpio_num ) == ESP_OK );
|
r = adc2_pad_get_io_num( ADC2_EXAMPLE_CHANNEL, &adc_gpio_num );
|
||||||
assert( dac_pad_get_io_num( DAC_EXAMPLE_CHANNEL, &dac_gpio_num ) == ESP_OK );
|
assert( r == ESP_OK );
|
||||||
|
r = dac_pad_get_io_num( DAC_EXAMPLE_CHANNEL, &dac_gpio_num );
|
||||||
|
assert( r == ESP_OK );
|
||||||
|
|
||||||
printf("ADC channel %d @ GPIO %d, DAC channel %d @ GPIO %d.\n", ADC2_EXAMPLE_CHANNEL, adc_gpio_num,
|
printf("ADC channel %d @ GPIO %d, DAC channel %d @ GPIO %d.\n", ADC2_EXAMPLE_CHANNEL, adc_gpio_num,
|
||||||
DAC_EXAMPLE_CHANNEL, dac_gpio_num );
|
DAC_EXAMPLE_CHANNEL, dac_gpio_num );
|
||||||
|
|
Loading…
Reference in a new issue