tools: Mass fixing of empty prototypes (for -Wstrict-prototypes)

This commit is contained in:
Anton Maklakov 2019-07-16 16:33:30 +07:00
parent 50629eec27
commit afbaf74007
507 changed files with 1295 additions and 1295 deletions

View file

@ -360,7 +360,7 @@ static esp_apptrace_hw_t s_trace_hw[ESP_APPTRACE_HW_MAX] = {
} }
}; };
static inline int esp_apptrace_log_lock() static inline int esp_apptrace_log_lock(void)
{ {
#if ESP_APPTRACE_PRINT_LOCK #if ESP_APPTRACE_PRINT_LOCK
esp_apptrace_tmo_t tmo; esp_apptrace_tmo_t tmo;
@ -372,14 +372,14 @@ static inline int esp_apptrace_log_lock()
#endif #endif
} }
static inline void esp_apptrace_log_unlock() static inline void esp_apptrace_log_unlock(void)
{ {
#if ESP_APPTRACE_PRINT_LOCK #if ESP_APPTRACE_PRINT_LOCK
esp_apptrace_lock_give(&s_log_lock); esp_apptrace_lock_give(&s_log_lock);
#endif #endif
} }
static inline esp_err_t esp_apptrace_lock_initialize() static inline esp_err_t esp_apptrace_lock_initialize(void)
{ {
#if CONFIG_ESP32_APPTRACE_LOCK_ENABLE #if CONFIG_ESP32_APPTRACE_LOCK_ENABLE
esp_apptrace_lock_init(&s_trace_buf.lock); esp_apptrace_lock_init(&s_trace_buf.lock);
@ -387,7 +387,7 @@ static inline esp_err_t esp_apptrace_lock_initialize()
return ESP_OK; return ESP_OK;
} }
static inline esp_err_t esp_apptrace_lock_cleanup() static inline esp_err_t esp_apptrace_lock_cleanup(void)
{ {
return ESP_OK; return ESP_OK;
} }
@ -403,7 +403,7 @@ esp_err_t esp_apptrace_lock(esp_apptrace_tmo_t *tmo)
return ESP_OK; return ESP_OK;
} }
esp_err_t esp_apptrace_unlock() esp_err_t esp_apptrace_unlock(void)
{ {
esp_err_t ret = ESP_OK; esp_err_t ret = ESP_OK;
#if CONFIG_ESP32_APPTRACE_LOCK_ENABLE #if CONFIG_ESP32_APPTRACE_LOCK_ENABLE
@ -413,7 +413,7 @@ esp_err_t esp_apptrace_unlock()
} }
#if CONFIG_ESP32_APPTRACE_DEST_TRAX #if CONFIG_ESP32_APPTRACE_DEST_TRAX
static void esp_apptrace_trax_init() static void esp_apptrace_trax_init(void)
{ {
// Stop trace, if any (on the current CPU) // Stop trace, if any (on the current CPU)
eri_write(ERI_TRAX_TRAXCTRL, TRAXCTRL_TRSTP); eri_write(ERI_TRAX_TRAXCTRL, TRAXCTRL_TRSTP);
@ -449,7 +449,7 @@ static void esp_apptrace_trax_pend_chunk_sz_update(uint16_t size)
} }
} }
static uint16_t esp_apptrace_trax_pend_chunk_sz_get() static uint16_t esp_apptrace_trax_pend_chunk_sz_get(void)
{ {
uint16_t ch_sz; uint16_t ch_sz;
ESP_APPTRACE_LOGD("Get chunk enter %d w-r-s %d-%d-%d", s_trace_buf.trax.cur_pending_chunk_sz, ESP_APPTRACE_LOGD("Get chunk enter %d w-r-s %d-%d-%d", s_trace_buf.trax.cur_pending_chunk_sz,
@ -467,7 +467,7 @@ static uint16_t esp_apptrace_trax_pend_chunk_sz_get()
#endif #endif
// assumed to be protected by caller from multi-core/thread access // assumed to be protected by caller from multi-core/thread access
static esp_err_t esp_apptrace_trax_block_switch() static esp_err_t esp_apptrace_trax_block_switch(void)
{ {
int prev_block_num = s_trace_buf.trax.state.in_block % 2; int prev_block_num = s_trace_buf.trax.state.in_block % 2;
int new_block_num = prev_block_num ? (0) : (1); int new_block_num = prev_block_num ? (0) : (1);
@ -845,7 +845,7 @@ static esp_err_t esp_apptrace_trax_status_reg_get(uint32_t *val)
return ESP_OK; return ESP_OK;
} }
static esp_err_t esp_apptrace_trax_dest_init() static esp_err_t esp_apptrace_trax_dest_init(void)
{ {
for (int i = 0; i < ESP_APPTRACE_TRAX_BLOCKS_NUM; i++) { for (int i = 0; i < ESP_APPTRACE_TRAX_BLOCKS_NUM; i++) {
s_trace_buf.trax.blocks[i].start = (uint8_t *)s_trax_blocks[i]; s_trace_buf.trax.blocks[i].start = (uint8_t *)s_trax_blocks[i];
@ -874,7 +874,7 @@ static esp_err_t esp_apptrace_trax_dest_init()
} }
#endif #endif
esp_err_t esp_apptrace_init() esp_err_t esp_apptrace_init(void)
{ {
int res; int res;

View file

@ -114,7 +114,7 @@ static int esp_dbg_stub_gcov_entry(void)
#endif #endif
} }
void esp_gcov_dump() void esp_gcov_dump(void)
{ {
// disable IRQs on this CPU, other CPU is halted by OpenOCD // disable IRQs on this CPU, other CPU is halted by OpenOCD
unsigned irq_state = portENTER_CRITICAL_NESTED(); unsigned irq_state = portENTER_CRITICAL_NESTED();

View file

@ -32,7 +32,7 @@
static bool s_tracing; static bool s_tracing;
esp_err_t heap_trace_init_tohost() esp_err_t heap_trace_init_tohost(void)
{ {
if (s_tracing) { if (s_tracing) {
return ESP_ERR_INVALID_STATE; return ESP_ERR_INVALID_STATE;

View file

@ -33,7 +33,7 @@ typedef enum {
* *
* @return ESP_OK on success, otherwise see esp_err_t * @return ESP_OK on success, otherwise see esp_err_t
*/ */
esp_err_t esp_apptrace_init(); esp_err_t esp_apptrace_init(void);
/** /**
* @brief Configures down buffer. * @brief Configures down buffer.

View file

@ -285,12 +285,12 @@ Revision: $Rev: 5626 $
* RTT lock configuration fallback * RTT lock configuration fallback
*/ */
#ifndef SEGGER_RTT_LOCK #ifndef SEGGER_RTT_LOCK
void SEGGER_SYSVIEW_X_RTT_Lock(); void SEGGER_SYSVIEW_X_RTT_Lock(void);
#define SEGGER_RTT_LOCK() SEGGER_SYSVIEW_X_RTT_Lock() // Lock RTT (nestable) (i.e. disable interrupts) #define SEGGER_RTT_LOCK() SEGGER_SYSVIEW_X_RTT_Lock() // Lock RTT (nestable) (i.e. disable interrupts)
#endif #endif
#ifndef SEGGER_RTT_UNLOCK #ifndef SEGGER_RTT_UNLOCK
void SEGGER_SYSVIEW_X_RTT_Unlock(); void SEGGER_SYSVIEW_X_RTT_Unlock(void);
#define SEGGER_RTT_UNLOCK() SEGGER_SYSVIEW_X_RTT_Unlock() // Unlock RTT (nestable) (i.e. enable previous interrupt lock state) #define SEGGER_RTT_UNLOCK() SEGGER_SYSVIEW_X_RTT_Unlock() // Unlock RTT (nestable) (i.e. enable previous interrupt lock state)
#endif #endif

View file

@ -166,7 +166,7 @@ Revision: $Rev: 5927 $
#define SEGGER_SYSVIEW_GET_INTERRUPT_ID() SEGGER_SYSVIEW_X_GetInterruptId() // Get the currently active interrupt Id from the user-provided function. #define SEGGER_SYSVIEW_GET_INTERRUPT_ID() SEGGER_SYSVIEW_X_GetInterruptId() // Get the currently active interrupt Id from the user-provided function.
#endif #endif
unsigned SEGGER_SYSVIEW_X_SysView_Lock(); unsigned SEGGER_SYSVIEW_X_SysView_Lock(void);
void SEGGER_SYSVIEW_X_SysView_Unlock(unsigned int_state); void SEGGER_SYSVIEW_X_SysView_Unlock(unsigned int_state);
// to be recursive save IRQ status on the stack of the caller // to be recursive save IRQ status on the stack of the caller
#define SEGGER_SYSVIEW_LOCK() unsigned _SYSVIEW_int_state = SEGGER_SYSVIEW_X_SysView_Lock() #define SEGGER_SYSVIEW_LOCK() unsigned _SYSVIEW_int_state = SEGGER_SYSVIEW_X_SysView_Lock()

View file

@ -244,7 +244,7 @@ static void _cbSendSystemDesc(void) {
* *
********************************************************************** **********************************************************************
*/ */
static void SEGGER_SYSVIEW_TS_Init() static void SEGGER_SYSVIEW_TS_Init(void)
{ {
/* We only need to initialize something if we use Timer Group. /* We only need to initialize something if we use Timer Group.
* esp_timer and ccount can be used as is. * esp_timer and ccount can be used as is.
@ -316,7 +316,7 @@ void SEGGER_SYSVIEW_Conf(void) {
SEGGER_SYSVIEW_DisableEvents(disable_evts); SEGGER_SYSVIEW_DisableEvents(disable_evts);
} }
U32 SEGGER_SYSVIEW_X_GetTimestamp() U32 SEGGER_SYSVIEW_X_GetTimestamp(void)
{ {
#if TS_USE_TIMERGROUP #if TS_USE_TIMERGROUP
uint64_t ts = 0; uint64_t ts = 0;
@ -329,15 +329,15 @@ U32 SEGGER_SYSVIEW_X_GetTimestamp()
#endif #endif
} }
void SEGGER_SYSVIEW_X_RTT_Lock() void SEGGER_SYSVIEW_X_RTT_Lock(void)
{ {
} }
void SEGGER_SYSVIEW_X_RTT_Unlock() void SEGGER_SYSVIEW_X_RTT_Unlock(void)
{ {
} }
unsigned SEGGER_SYSVIEW_X_SysView_Lock() unsigned SEGGER_SYSVIEW_X_SysView_Lock(void)
{ {
esp_apptrace_tmo_t tmo; esp_apptrace_tmo_t tmo;
esp_apptrace_tmo_init(&tmo, SEGGER_LOCK_WAIT_TMO); esp_apptrace_tmo_init(&tmo, SEGGER_LOCK_WAIT_TMO);

View file

@ -125,7 +125,7 @@ typedef struct {
static SemaphoreHandle_t s_print_lock; static SemaphoreHandle_t s_print_lock;
#endif #endif
static uint64_t esp_apptrace_test_ts_get(); static uint64_t esp_apptrace_test_ts_get(void);
static void esp_apptrace_test_timer_isr(void *arg) static void esp_apptrace_test_timer_isr(void *arg)
{ {
@ -383,7 +383,7 @@ static void esp_apptrace_test_task_crash(void *p)
static int s_ts_timer_group, s_ts_timer_idx; static int s_ts_timer_group, s_ts_timer_idx;
static uint64_t esp_apptrace_test_ts_get() static uint64_t esp_apptrace_test_ts_get(void)
{ {
uint64_t ts = 0; uint64_t ts = 0;
timer_get_counter_value(s_ts_timer_group, s_ts_timer_idx, &ts); timer_get_counter_value(s_ts_timer_group, s_ts_timer_idx, &ts);
@ -413,7 +413,7 @@ static void esp_apptrace_test_ts_init(int timer_group, int timer_idx)
timer_start(timer_group, timer_idx); timer_start(timer_group, timer_idx);
} }
static void esp_apptrace_test_ts_cleanup() static void esp_apptrace_test_ts_cleanup(void)
{ {
timer_config_t config; timer_config_t config;

View file

@ -687,12 +687,12 @@ static esp_err_t esp_ota_current_ota_is_workable(bool valid)
return ESP_OK; return ESP_OK;
} }
esp_err_t esp_ota_mark_app_valid_cancel_rollback() esp_err_t esp_ota_mark_app_valid_cancel_rollback(void)
{ {
return esp_ota_current_ota_is_workable(true); return esp_ota_current_ota_is_workable(true);
} }
esp_err_t esp_ota_mark_app_invalid_rollback_and_reboot() esp_err_t esp_ota_mark_app_invalid_rollback_and_reboot(void)
{ {
return esp_ota_current_ota_is_workable(false); return esp_ota_current_ota_is_workable(false);
} }
@ -715,7 +715,7 @@ static int get_last_invalid_otadata(const esp_ota_select_entry_t *two_otadata)
return num_invalid_otadata; return num_invalid_otadata;
} }
const esp_partition_t* esp_ota_get_last_invalid_partition() const esp_partition_t* esp_ota_get_last_invalid_partition(void)
{ {
esp_ota_select_entry_t otadata[2]; esp_ota_select_entry_t otadata[2];
if (read_otadata(otadata) == NULL) { if (read_otadata(otadata) == NULL) {

View file

@ -221,7 +221,7 @@ esp_err_t esp_ota_get_partition_description(const esp_partition_t *partition, es
* @return * @return
* - ESP_OK: if successful. * - ESP_OK: if successful.
*/ */
esp_err_t esp_ota_mark_app_valid_cancel_rollback(); esp_err_t esp_ota_mark_app_valid_cancel_rollback(void);
/** /**
* @brief This function is called to roll back to the previously workable app with reboot. * @brief This function is called to roll back to the previously workable app with reboot.
@ -233,14 +233,14 @@ esp_err_t esp_ota_mark_app_valid_cancel_rollback();
* - ESP_FAIL: if not successful. * - ESP_FAIL: if not successful.
* - ESP_ERR_OTA_ROLLBACK_FAILED: The rollback is not possible due to flash does not have any apps. * - ESP_ERR_OTA_ROLLBACK_FAILED: The rollback is not possible due to flash does not have any apps.
*/ */
esp_err_t esp_ota_mark_app_invalid_rollback_and_reboot(); esp_err_t esp_ota_mark_app_invalid_rollback_and_reboot(void);
/** /**
* @brief Returns last partition with invalid state (ESP_OTA_IMG_INVALID or ESP_OTA_IMG_ABORTED). * @brief Returns last partition with invalid state (ESP_OTA_IMG_INVALID or ESP_OTA_IMG_ABORTED).
* *
* @return partition. * @return partition.
*/ */
const esp_partition_t* esp_ota_get_last_invalid_partition(); const esp_partition_t* esp_ota_get_last_invalid_partition(void);
/** /**
* @brief Returns state for given partition. * @brief Returns state for given partition.

View file

@ -118,7 +118,7 @@ static void reboot_as_deep_sleep(void)
/* @brief Copies a current app to next partition (OTA0-15), after that ESP is rebooting and run this (the next) OTAx. /* @brief Copies a current app to next partition (OTA0-15), after that ESP is rebooting and run this (the next) OTAx.
*/ */
static void copy_current_app_to_next_part_and_reboot() static void copy_current_app_to_next_part_and_reboot(void)
{ {
const esp_partition_t *cur_app = esp_ota_get_running_partition(); const esp_partition_t *cur_app = esp_ota_get_running_partition();
copy_current_app_to_next_part(cur_app, get_next_update_partition()); copy_current_app_to_next_part(cur_app, get_next_update_partition());

View file

@ -34,7 +34,7 @@ static int selected_boot_partition(const bootloader_state_t *bs);
* The hardware is mostly uninitialized, flash cache is down and the app CPU is in reset. * The hardware is mostly uninitialized, flash cache is down and the app CPU is in reset.
* We do have a stack, so we can do the initialization in C. * We do have a stack, so we can do the initialization in C.
*/ */
void __attribute__((noreturn)) call_start_cpu0() void __attribute__((noreturn)) call_start_cpu0(void)
{ {
// 1. Hardware initialization // 1. Hardware initialization
if (bootloader_init() != ESP_OK) { if (bootloader_init() != ESP_OK) {
@ -113,7 +113,7 @@ static int selected_boot_partition(const bootloader_state_t *bs)
} }
// Return global reent struct if any newlib functions are linked to bootloader // Return global reent struct if any newlib functions are linked to bootloader
struct _reent* __getreent() { struct _reent* __getreent(void) {
return _GLOBAL_REENT; return _GLOBAL_REENT;
} }

View file

@ -144,7 +144,7 @@ esp_err_t bootloader_common_get_partition_description(const esp_partition_pos_t
/** /**
* @brief Configure VDDSDIO, call this API to rise VDDSDIO to 1.9V when VDDSDIO regulator is enabled as 1.8V mode. * @brief Configure VDDSDIO, call this API to rise VDDSDIO to 1.9V when VDDSDIO regulator is enabled as 1.8V mode.
*/ */
void bootloader_common_vddsdio_configure(); void bootloader_common_vddsdio_configure(void);
#ifdef __cplusplus #ifdef __cplusplus
} }

View file

@ -25,7 +25,7 @@ extern "C" {
* *
* @return None * @return None
*/ */
void bootloader_flash_update_id(); void bootloader_flash_update_id(void);
/** /**
* @brief Set the flash CS setup and hold time. * @brief Set the flash CS setup and hold time.
@ -35,7 +35,7 @@ void bootloader_flash_update_id();
* *
* @return None * @return None
*/ */
void bootloader_flash_cs_timing_config(); void bootloader_flash_cs_timing_config(void);
/** /**
* @brief Configure SPI flash clock. * @brief Configure SPI flash clock.

View file

@ -122,7 +122,7 @@ esp_err_t esp_flash_encrypt_region(uint32_t src_addr, size_t data_length);
* serial re-flashing of an unauthorised code in absence of secure boot. * serial re-flashing of an unauthorised code in absence of secure boot.
* *
*/ */
void esp_flash_write_protect_crypt_cnt(); void esp_flash_write_protect_crypt_cnt(void);
/** @brief Return the flash encryption mode /** @brief Return the flash encryption mode
* *
@ -131,7 +131,7 @@ void esp_flash_write_protect_crypt_cnt();
* *
* @return * @return
*/ */
esp_flash_enc_mode_t esp_get_flash_encryption_mode(); esp_flash_enc_mode_t esp_get_flash_encryption_mode(void);
#ifdef __cplusplus #ifdef __cplusplus
} }

View file

@ -35,7 +35,7 @@
* *
* @return Number of free pages * @return Number of free pages
*/ */
uint32_t bootloader_mmap_get_free_pages(); uint32_t bootloader_mmap_get_free_pages(void);
/** /**
* @brief Map a region of flash to data memory * @brief Map a region of flash to data memory

View file

@ -25,4 +25,4 @@
* @return ESP_OK - If the setting is successful. * @return ESP_OK - If the setting is successful.
* ESP_FAIL - If the setting is not successful. * ESP_FAIL - If the setting is not successful.
*/ */
esp_err_t bootloader_init(); esp_err_t bootloader_init(void);

View file

@ -26,7 +26,7 @@
typedef void *bootloader_sha256_handle_t; typedef void *bootloader_sha256_handle_t;
bootloader_sha256_handle_t bootloader_sha256_start(); bootloader_sha256_handle_t bootloader_sha256_start(void);
void bootloader_sha256_data(bootloader_sha256_handle_t handle, const void *data, size_t data_len); void bootloader_sha256_data(bootloader_sha256_handle_t handle, const void *data, size_t data_len);

View file

@ -30,7 +30,7 @@ void bootloader_enable_qio_mode(void);
* mfg_id = (ID >> 16) & 0xFF; * mfg_id = (ID >> 16) & 0xFF;
flash_id = ID & 0xffff; flash_id = ID & 0xffff;
*/ */
uint32_t bootloader_read_flash_id(); uint32_t bootloader_read_flash_id(void);
#ifdef __cplusplus #ifdef __cplusplus
} }

View file

@ -18,7 +18,7 @@
#include "soc/dport_reg.h" #include "soc/dport_reg.h"
#include "soc/efuse_periph.h" #include "soc/efuse_periph.h"
void bootloader_clock_configure() void bootloader_clock_configure(void)
{ {
// ROM bootloader may have put a lot of text into UART0 FIFO. // ROM bootloader may have put a lot of text into UART0 FIFO.
// Wait for it to be printed. // Wait for it to be printed.

View file

@ -256,7 +256,7 @@ esp_err_t bootloader_common_get_partition_description(const esp_partition_pos_t
return ESP_OK; return ESP_OK;
} }
void bootloader_common_vddsdio_configure() void bootloader_common_vddsdio_configure(void)
{ {
#if CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V #if CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V
rtc_vddsdio_config_t cfg = rtc_vddsdio_get_config(); rtc_vddsdio_config_t cfg = rtc_vddsdio_get_config();

View file

@ -25,7 +25,7 @@ static const char *TAG = "bootloader_mmap";
static spi_flash_mmap_handle_t map; static spi_flash_mmap_handle_t map;
uint32_t bootloader_mmap_get_free_pages() uint32_t bootloader_mmap_get_free_pages(void)
{ {
return spi_flash_mmap_get_free_pages(SPI_FLASH_MMAP_DATA); return spi_flash_mmap_get_free_pages(SPI_FLASH_MMAP_DATA);
} }
@ -103,7 +103,7 @@ static bool mapped;
// Current bootloader mapping (ab)used for bootloader_read() // Current bootloader mapping (ab)used for bootloader_read()
static uint32_t current_read_mapping = UINT32_MAX; static uint32_t current_read_mapping = UINT32_MAX;
uint32_t bootloader_mmap_get_free_pages() uint32_t bootloader_mmap_get_free_pages(void)
{ {
/** /**
* Allow mapping up to 50 of the 51 available MMU blocks (last one used for reads) * Allow mapping up to 50 of the 51 available MMU blocks (last one used for reads)

View file

@ -27,12 +27,12 @@
#include "flash_qio_mode.h" #include "flash_qio_mode.h"
#include "bootloader_flash_config.h" #include "bootloader_flash_config.h"
void bootloader_flash_update_id() void bootloader_flash_update_id(void)
{ {
g_rom_flashchip.device_id = bootloader_read_flash_id(); g_rom_flashchip.device_id = bootloader_read_flash_id();
} }
void IRAM_ATTR bootloader_flash_cs_timing_config() void IRAM_ATTR bootloader_flash_cs_timing_config(void)
{ {
SET_PERI_REG_MASK(SPI_USER_REG(0), SPI_CS_HOLD_M | SPI_CS_SETUP_M); SET_PERI_REG_MASK(SPI_USER_REG(0), SPI_CS_HOLD_M | SPI_CS_SETUP_M);
SET_PERI_REG_BITS(SPI_CTRL2_REG(0), SPI_HOLD_TIME_V, 1, SPI_HOLD_TIME_S); SET_PERI_REG_BITS(SPI_CTRL2_REG(0), SPI_HOLD_TIME_V, 1, SPI_HOLD_TIME_S);

View file

@ -61,7 +61,7 @@ extern int _data_end;
static const char* TAG = "boot"; static const char* TAG = "boot";
static esp_err_t bootloader_main(); static esp_err_t bootloader_main(void);
static void print_flash_info(const esp_image_header_t* pfhdr); static void print_flash_info(const esp_image_header_t* pfhdr);
static void update_flash_config(const esp_image_header_t* pfhdr); static void update_flash_config(const esp_image_header_t* pfhdr);
static void bootloader_init_flash_configure(const esp_image_header_t* pfhdr); static void bootloader_init_flash_configure(const esp_image_header_t* pfhdr);
@ -69,7 +69,7 @@ static void uart_console_configure(void);
static void wdt_reset_check(void); static void wdt_reset_check(void);
esp_err_t bootloader_init() esp_err_t bootloader_init(void)
{ {
cpu_configure_region_protection(); cpu_configure_region_protection();
cpu_init_memctl(); cpu_init_memctl();
@ -117,7 +117,7 @@ esp_err_t bootloader_init()
return ESP_OK; return ESP_OK;
} }
static esp_err_t bootloader_main() static esp_err_t bootloader_main(void)
{ {
bootloader_common_vddsdio_configure(); bootloader_common_vddsdio_configure();
/* Read and keep flash ID, for further use. */ /* Read and keep flash ID, for further use. */
@ -434,7 +434,7 @@ void __assert_func(const char *file, int line, const char *func, const char *exp
while(1) {} while(1) {}
} }
void abort() void abort(void)
{ {
#if !CONFIG_ESP32_PANIC_SILENT_REBOOT #if !CONFIG_ESP32_PANIC_SILENT_REBOOT
ets_printf("abort() was called at PC 0x%08x\r\n", (intptr_t)__builtin_return_address(0) - 3); ets_printf("abort() was called at PC 0x%08x\r\n", (intptr_t)__builtin_return_address(0) - 3);

View file

@ -27,7 +27,7 @@ static const size_t BLOCK_WORDS = (64 / sizeof(uint32_t));
// Words in final SHA256 digest // Words in final SHA256 digest
static const size_t DIGEST_WORDS = (32 / sizeof(uint32_t)); static const size_t DIGEST_WORDS = (32 / sizeof(uint32_t));
bootloader_sha256_handle_t bootloader_sha256_start() bootloader_sha256_handle_t bootloader_sha256_start(void)
{ {
// Enable SHA hardware // Enable SHA hardware
ets_sha_enable(); ets_sha_enable();

View file

@ -38,7 +38,7 @@ static const char *TAG = "flash_encrypt";
/* Static functions for stages of flash encryption */ /* Static functions for stages of flash encryption */
static esp_err_t initialise_flash_encryption(void); static esp_err_t initialise_flash_encryption(void);
static esp_err_t encrypt_flash_contents(uint32_t flash_crypt_cnt, bool flash_crypt_wr_dis); static esp_err_t encrypt_flash_contents(uint32_t flash_crypt_cnt, bool flash_crypt_wr_dis);
static esp_err_t encrypt_bootloader(); static esp_err_t encrypt_bootloader(void);
static esp_err_t encrypt_and_load_partition_table(esp_partition_info_t *partition_table, int *num_partitions); static esp_err_t encrypt_and_load_partition_table(esp_partition_info_t *partition_table, int *num_partitions);
static esp_err_t encrypt_partition(int index, const esp_partition_info_t *partition); static esp_err_t encrypt_partition(int index, const esp_partition_info_t *partition);
@ -223,7 +223,7 @@ static esp_err_t encrypt_flash_contents(uint32_t flash_crypt_cnt, bool flash_cry
return ESP_OK; return ESP_OK;
} }
static esp_err_t encrypt_bootloader() static esp_err_t encrypt_bootloader(void)
{ {
esp_err_t err; esp_err_t err;
uint32_t image_length; uint32_t image_length;

View file

@ -95,7 +95,7 @@ static bool secure_boot_generate(uint32_t image_len){
} }
/* Burn values written to the efuse write registers */ /* Burn values written to the efuse write registers */
static inline void burn_efuses() static inline void burn_efuses(void)
{ {
esp_efuse_burn_new_values(); esp_efuse_burn_new_values();
} }

View file

@ -17,7 +17,7 @@
#include "esp_efuse_table.h" #include "esp_efuse_table.h"
#include "esp_flash_encrypt.h" #include "esp_flash_encrypt.h"
void esp_flash_write_protect_crypt_cnt() void esp_flash_write_protect_crypt_cnt(void)
{ {
uint8_t flash_crypt_cnt_wr_dis = 0; uint8_t flash_crypt_cnt_wr_dis = 0;
esp_efuse_read_field_blob(ESP_EFUSE_WR_DIS_FLASH_CRYPT_CNT, &flash_crypt_cnt_wr_dis, 1); esp_efuse_read_field_blob(ESP_EFUSE_WR_DIS_FLASH_CRYPT_CNT, &flash_crypt_cnt_wr_dis, 1);
@ -26,7 +26,7 @@ void esp_flash_write_protect_crypt_cnt()
} }
} }
esp_flash_enc_mode_t esp_get_flash_encryption_mode() esp_flash_enc_mode_t esp_get_flash_encryption_mode(void)
{ {
uint8_t efuse_flash_crypt_cnt_wr_protected = 0; uint8_t efuse_flash_crypt_cnt_wr_protected = 0;
uint8_t dis_dl_enc = 0, dis_dl_dec = 0, dis_dl_cache = 0; uint8_t dis_dl_enc = 0, dis_dl_dec = 0, dis_dl_cache = 0;

View file

@ -53,11 +53,11 @@ typedef struct __attribute__((packed)) {
} qio_info_t; } qio_info_t;
/* Read 8 bit status using RDSR command */ /* Read 8 bit status using RDSR command */
static unsigned read_status_8b_rdsr(); static unsigned read_status_8b_rdsr(void);
/* Read 8 bit status (second byte) using RDSR2 command */ /* Read 8 bit status (second byte) using RDSR2 command */
static unsigned read_status_8b_rdsr2(); static unsigned read_status_8b_rdsr2(void);
/* read 16 bit status using RDSR & RDSR2 (low and high bytes) */ /* read 16 bit status using RDSR & RDSR2 (low and high bytes) */
static unsigned read_status_16b_rdsr_rdsr2(); static unsigned read_status_16b_rdsr_rdsr2(void);
/* Write 8 bit status using WRSR */ /* Write 8 bit status using WRSR */
static void write_status_8b_wrsr(unsigned new_status); static void write_status_8b_wrsr(unsigned new_status);
@ -67,7 +67,7 @@ static void write_status_8b_wrsr2(unsigned new_status);
static void write_status_16b_wrsr(unsigned new_status); static void write_status_16b_wrsr(unsigned new_status);
/* Read 8 bit status of XM25QU64A */ /* Read 8 bit status of XM25QU64A */
static unsigned read_status_8b_xmc25qu64a(); static unsigned read_status_8b_xmc25qu64a(void);
/* Write 8 bit status of XM25QU64A */ /* Write 8 bit status of XM25QU64A */
static void write_status_8b_xmc25qu64a(unsigned new_status); static void write_status_8b_xmc25qu64a(unsigned new_status);
@ -121,7 +121,7 @@ static uint32_t execute_flash_command(uint8_t command, uint32_t mosi_data, uint8
/* dummy_len_plus values defined in ROM for SPI flash configuration */ /* dummy_len_plus values defined in ROM for SPI flash configuration */
extern uint8_t g_rom_spiflash_dummy_len_plus[]; extern uint8_t g_rom_spiflash_dummy_len_plus[];
uint32_t bootloader_read_flash_id() uint32_t bootloader_read_flash_id(void)
{ {
uint32_t id = execute_flash_command(CMD_RDID, 0, 0, 24); uint32_t id = execute_flash_command(CMD_RDID, 0, 0, 24);
id = ((id & 0xff) << 16) | ((id >> 16) & 0xff) | (id & 0xff00); id = ((id & 0xff) << 16) | ((id >> 16) & 0xff) | (id & 0xff00);
@ -223,17 +223,17 @@ static esp_err_t enable_qio_mode(read_status_fn_t read_status_fn,
return ESP_OK; return ESP_OK;
} }
static unsigned read_status_8b_rdsr() static unsigned read_status_8b_rdsr(void)
{ {
return execute_flash_command(CMD_RDSR, 0, 0, 8); return execute_flash_command(CMD_RDSR, 0, 0, 8);
} }
static unsigned read_status_8b_rdsr2() static unsigned read_status_8b_rdsr2(void)
{ {
return execute_flash_command(CMD_RDSR2, 0, 0, 8); return execute_flash_command(CMD_RDSR2, 0, 0, 8);
} }
static unsigned read_status_16b_rdsr_rdsr2() static unsigned read_status_16b_rdsr_rdsr2(void)
{ {
return execute_flash_command(CMD_RDSR, 0, 0, 8) | (execute_flash_command(CMD_RDSR2, 0, 0, 8) << 8); return execute_flash_command(CMD_RDSR, 0, 0, 8) | (execute_flash_command(CMD_RDSR2, 0, 0, 8) << 8);
} }
@ -253,7 +253,7 @@ static void write_status_16b_wrsr(unsigned new_status)
execute_flash_command(CMD_WRSR, new_status, 16, 0); execute_flash_command(CMD_WRSR, new_status, 16, 0);
} }
static unsigned read_status_8b_xmc25qu64a() static unsigned read_status_8b_xmc25qu64a(void)
{ {
execute_flash_command(CMD_OTPEN, 0, 0, 0); /* Enter OTP mode */ execute_flash_command(CMD_OTPEN, 0, 0, 0); /* Enter OTP mode */
esp_rom_spiflash_wait_idle(&g_rom_flashchip); esp_rom_spiflash_wait_idle(&g_rom_flashchip);

View file

@ -18,7 +18,7 @@
#include <sys/param.h> #include <sys/param.h>
#include <mbedtls/sha256.h> #include <mbedtls/sha256.h>
bootloader_sha256_handle_t bootloader_sha256_start() bootloader_sha256_handle_t bootloader_sha256_start(void)
{ {
mbedtls_sha256_context *ctx = (mbedtls_sha256_context *)malloc(sizeof(mbedtls_sha256_context)); mbedtls_sha256_context *ctx = (mbedtls_sha256_context *)malloc(sizeof(mbedtls_sha256_context));
if (!ctx) { if (!ctx) {

View file

@ -54,7 +54,7 @@ esp_err_t esp_spp_init(esp_spp_mode_t mode)
return (btc_transfer_context(&msg, &arg, sizeof(btc_spp_args_t), NULL) == BT_STATUS_SUCCESS ? ESP_OK : ESP_FAIL); return (btc_transfer_context(&msg, &arg, sizeof(btc_spp_args_t), NULL) == BT_STATUS_SUCCESS ? ESP_OK : ESP_FAIL);
} }
esp_err_t esp_spp_deinit() esp_err_t esp_spp_deinit(void)
{ {
btc_msg_t msg; btc_msg_t msg;
btc_spp_args_t arg; btc_spp_args_t arg;
@ -164,7 +164,7 @@ esp_err_t esp_spp_write(uint32_t handle, int len, uint8_t *p_data)
return (btc_transfer_context(&msg, &arg, sizeof(btc_spp_args_t), btc_spp_arg_deep_copy) == BT_STATUS_SUCCESS ? ESP_OK : ESP_FAIL); return (btc_transfer_context(&msg, &arg, sizeof(btc_spp_args_t), btc_spp_arg_deep_copy) == BT_STATUS_SUCCESS ? ESP_OK : ESP_FAIL);
} }
esp_err_t esp_spp_vfs_register() esp_err_t esp_spp_vfs_register(void)
{ {
ESP_BLUEDROID_STATUS_CHECK(ESP_BLUEDROID_STATUS_ENABLED); ESP_BLUEDROID_STATUS_CHECK(ESP_BLUEDROID_STATUS_ENABLED);

View file

@ -205,7 +205,7 @@ esp_err_t esp_spp_init(esp_spp_mode_t mode);
* - ESP_OK: success * - ESP_OK: success
* - other: failed * - other: failed
*/ */
esp_err_t esp_spp_deinit(); esp_err_t esp_spp_deinit(void);
/** /**

View file

@ -360,7 +360,7 @@ const tBTA_DM_ST_TBL bta_dm_search_st_tbl[] = {
** Returns void ** Returns void
** **
*******************************************************************************/ *******************************************************************************/
void bta_dm_sm_disable( ) void bta_dm_sm_disable(void)
{ {
bta_sys_deregister( BTA_ID_DM ); bta_sys_deregister( BTA_ID_DM );
} }
@ -412,7 +412,7 @@ BOOLEAN bta_dm_sm_execute(BT_HDR *p_msg)
** Returns void ** Returns void
** **
*******************************************************************************/ *******************************************************************************/
void bta_dm_search_sm_disable( ) void bta_dm_search_sm_disable(void)
{ {
bta_sys_deregister( BTA_ID_DM_SEARCH ); bta_sys_deregister( BTA_ID_DM_SEARCH );

View file

@ -46,7 +46,7 @@ static void bta_dm_pm_timer_cback(void *p_tle);
static void bta_dm_pm_btm_cback(BD_ADDR bd_addr, tBTM_PM_STATUS status, UINT16 value, UINT8 hci_status); static void bta_dm_pm_btm_cback(BD_ADDR bd_addr, tBTM_PM_STATUS status, UINT16 value, UINT8 hci_status);
static BOOLEAN bta_dm_pm_park(BD_ADDR peer_addr); static BOOLEAN bta_dm_pm_park(BD_ADDR peer_addr);
static BOOLEAN bta_dm_pm_sniff(tBTA_DM_PEER_DEVICE *p_peer_dev, UINT8 index); static BOOLEAN bta_dm_pm_sniff(tBTA_DM_PEER_DEVICE *p_peer_dev, UINT8 index);
static BOOLEAN bta_dm_pm_is_sco_active (); static BOOLEAN bta_dm_pm_is_sco_active (void);
static void bta_dm_pm_hid_check(BOOLEAN bScoActive); static void bta_dm_pm_hid_check(BOOLEAN bScoActive);
static void bta_dm_pm_set_sniff_policy(tBTA_DM_PEER_DEVICE *p_dev, BOOLEAN bDisable); static void bta_dm_pm_set_sniff_policy(tBTA_DM_PEER_DEVICE *p_dev, BOOLEAN bDisable);
static void bta_dm_pm_stop_timer_by_index(tBTA_PM_TIMER *p_timer, static void bta_dm_pm_stop_timer_by_index(tBTA_PM_TIMER *p_timer,
@ -1001,7 +1001,7 @@ void bta_dm_pm_timer(tBTA_DM_MSG *p_data)
** Returns BOOLEAN. TRUE if SCO active, else FALSE ** Returns BOOLEAN. TRUE if SCO active, else FALSE
** **
*******************************************************************************/ *******************************************************************************/
static BOOLEAN bta_dm_pm_is_sco_active () static BOOLEAN bta_dm_pm_is_sco_active (void)
{ {
int j; int j;
BOOLEAN bScoActive = FALSE; BOOLEAN bScoActive = FALSE;

View file

@ -48,7 +48,7 @@ static void getFilename(char *buffer, BD_ADDR bda)
, bda[0], bda[1], bda[2], bda[3], bda[4], bda[5]); , bda[0], bda[1], bda[2], bda[3], bda[4], bda[5]);
} }
static void cacheClose() static void cacheClose(void)
{ {
if (sCacheFD != 0) { if (sCacheFD != 0) {
fclose(sCacheFD); fclose(sCacheFD);

View file

@ -94,7 +94,7 @@ UINT32 service_index = 0;
BOOLEAN service_availability = TRUE; BOOLEAN service_availability = TRUE;
/* helper functions for handling AT commands queueing */ /* helper functions for handling AT commands queueing */
static void bta_hf_client_handle_ok(); static void bta_hf_client_handle_ok(void);
static void bta_hf_client_clear_queued_at(void) static void bta_hf_client_clear_queued_at(void)
{ {
@ -268,7 +268,7 @@ static void bta_hf_client_start_at_hold_timer(void)
** No buffer parsing is being done here. ** No buffer parsing is being done here.
*******************************************************************************/ *******************************************************************************/
static void bta_hf_client_handle_ok() static void bta_hf_client_handle_ok(void)
{ {
APPL_TRACE_DEBUG("%s", __FUNCTION__); APPL_TRACE_DEBUG("%s", __FUNCTION__);
@ -342,7 +342,7 @@ static void bta_hf_client_handle_error(tBTA_HF_CLIENT_AT_RESULT_TYPE type, UINT1
bta_hf_client_send_queued_at(); bta_hf_client_send_queued_at();
} }
static void bta_hf_client_handle_ring() static void bta_hf_client_handle_ring(void)
{ {
APPL_TRACE_DEBUG("%s", __FUNCTION__); APPL_TRACE_DEBUG("%s", __FUNCTION__);
bta_hf_client_evt_val(BTA_HF_CLIENT_RING_INDICATION, 0); bta_hf_client_evt_val(BTA_HF_CLIENT_RING_INDICATION, 0);

View file

@ -212,7 +212,7 @@ extern void bta_hf_client_sm_execute(UINT16 event,
extern void bta_hf_client_slc_seq(BOOLEAN error); extern void bta_hf_client_slc_seq(BOOLEAN error);
extern void bta_hf_client_collision_cback (tBTA_SYS_CONN_STATUS status, UINT8 id, extern void bta_hf_client_collision_cback (tBTA_SYS_CONN_STATUS status, UINT8 id,
UINT8 app_id, BD_ADDR peer_addr); UINT8 app_id, BD_ADDR peer_addr);
extern void bta_hf_client_resume_open (); extern void bta_hf_client_resume_open (void);
/* SDP functions */ /* SDP functions */
extern BOOLEAN bta_hf_client_add_record(char *p_service_name, extern BOOLEAN bta_hf_client_add_record(char *p_service_name,

View file

@ -1205,7 +1205,7 @@ extern void BTA_GATTC_ConfigureMTU (UINT16 conn_id);
** Returns None ** Returns None
** **
*******************************************************************************/ *******************************************************************************/
extern void BTA_GATTS_Init(); extern void BTA_GATTS_Init(void);
/******************************************************************************* /*******************************************************************************
** **

View file

@ -683,7 +683,7 @@ void bta_jv_disable (tBTA_JV_MSG *p_data)
* list. * list.
* If no free PSMs exist, 0 will be returned. * If no free PSMs exist, 0 will be returned.
*/ */
static UINT16 bta_jv_get_free_psm() static UINT16 bta_jv_get_free_psm(void)
{ {
const int cnt = sizeof(bta_jv_cb.free_psm_list) / sizeof(bta_jv_cb.free_psm_list[0]); const int cnt = sizeof(bta_jv_cb.free_psm_list) / sizeof(bta_jv_cb.free_psm_list[0]);
for (int i = 0; i < cnt; i++) { for (int i = 0; i < cnt; i++) {

View file

@ -60,7 +60,7 @@ static void queue_int_add(connect_node_t *p_param)
list_append(connect_queue, p_node); list_append(connect_queue, p_node);
} }
static void queue_int_advance() static void queue_int_advance(void)
{ {
if (connect_queue && !list_is_empty(connect_queue)) { if (connect_queue && !list_is_empty(connect_queue)) {
list_remove(connect_queue, list_front(connect_queue)); list_remove(connect_queue, list_front(connect_queue));

View file

@ -424,7 +424,7 @@ static void btc_a2dp_source_data_post(void)
osi_thread_post(a2dp_source_local_param.btc_aa_src_task_hdl, btc_a2dp_source_handle_timer, NULL, 2, OSI_THREAD_MAX_TIMEOUT); osi_thread_post(a2dp_source_local_param.btc_aa_src_task_hdl, btc_a2dp_source_handle_timer, NULL, 2, OSI_THREAD_MAX_TIMEOUT);
} }
static UINT64 time_now_us() static UINT64 time_now_us(void)
{ {
#if _POSIX_TIMERS #if _POSIX_TIMERS
struct timespec ts_now; struct timespec ts_now;

View file

@ -79,7 +79,7 @@ void app_ble_sec_gen_ltk(UINT8 key_size)
** Returns NULL ** Returns NULL
** **
*******************************************************************************/ *******************************************************************************/
void app_ble_sec_init() void app_ble_sec_init(void)
{ {
// Reset Security Environment // Reset Security Environment
memset(&app_sec_env, 0, sizeof(app_sec_env)); memset(&app_sec_env, 0, sizeof(app_sec_env));

View file

@ -837,7 +837,7 @@ static ssize_t spp_vfs_read(int fd, void * dst, size_t size)
return item_size; return item_size;
} }
esp_err_t btc_spp_vfs_register() esp_err_t btc_spp_vfs_register(void)
{ {
esp_vfs_t vfs = { esp_vfs_t vfs = {
.flags = ESP_VFS_FLAG_DEFAULT, .flags = ESP_VFS_FLAG_DEFAULT,

View file

@ -544,7 +544,7 @@ static const controller_t interface = {
#endif /* (BTM_SCO_HCI_INCLUDED == TRUE) */ #endif /* (BTM_SCO_HCI_INCLUDED == TRUE) */
}; };
const controller_t *controller_get_interface() const controller_t *controller_get_interface(void)
{ {
static bool loaded = false; static bool loaded = false;
if (!loaded) { if (!loaded) {

View file

@ -86,6 +86,6 @@ typedef struct controller_t {
#endif /* #if (BTM_SCO_HCI_INCLUDED == TRUE) */ #endif /* #if (BTM_SCO_HCI_INCLUDED == TRUE) */
} controller_t; } controller_t;
const controller_t *controller_get_interface(); const controller_t *controller_get_interface(void);
#endif /*_CONTROLLER_H_*/ #endif /*_CONTROLLER_H_*/

View file

@ -121,7 +121,7 @@ static bool hal_open(const hci_hal_callbacks_t *upper_callbacks, void *task_thre
return true; return true;
} }
static void hal_close() static void hal_close(void)
{ {
hci_hal_env_deinit(); hci_hal_env_deinit();
@ -367,7 +367,7 @@ static const hci_hal_t interface = {
transmit_data, transmit_data,
}; };
const hci_hal_t *hci_hal_h4_get_interface() const hci_hal_t *hci_hal_h4_get_interface(void)
{ {
return &interface; return &interface;
} }

View file

@ -535,7 +535,7 @@ static waiting_command_t *get_waiting_command(command_opcode_t opcode)
return NULL; return NULL;
} }
static void init_layer_interface() static void init_layer_interface(void)
{ {
if (!interface_created) { if (!interface_created) {
interface.transmit_command = transmit_command; interface.transmit_command = transmit_command;
@ -555,7 +555,7 @@ static const packet_fragmenter_callbacks_t packet_fragmenter_callbacks = {
fragmenter_transmit_finished fragmenter_transmit_finished
}; };
const hci_t *hci_layer_get_interface() const hci_t *hci_layer_get_interface(void)
{ {
hal = hci_hal_h4_get_interface(); hal = hci_hal_h4_get_interface();
packet_fragmenter = packet_fragmenter_get_interface(); packet_fragmenter = packet_fragmenter_get_interface();

View file

@ -273,7 +273,7 @@ static const hci_packet_factory_t interface = {
make_write_default_erroneous_data_report, make_write_default_erroneous_data_report,
}; };
const hci_packet_factory_t *hci_packet_factory_get_interface() const hci_packet_factory_t *hci_packet_factory_get_interface(void)
{ {
return &interface; return &interface;
} }

View file

@ -250,7 +250,7 @@ static const hci_packet_parser_t interface = {
parse_ble_read_suggested_default_data_length_response parse_ble_read_suggested_default_data_length_response
}; };
const hci_packet_parser_t *hci_packet_parser_get_interface() const hci_packet_parser_t *hci_packet_parser_get_interface(void)
{ {
return &interface; return &interface;
} }

View file

@ -92,7 +92,7 @@ typedef struct hci_t {
void (*transmit_downward)(uint16_t type, void *data); void (*transmit_downward)(uint16_t type, void *data);
} hci_t; } hci_t;
const hci_t *hci_layer_get_interface(); const hci_t *hci_layer_get_interface(void);
int hci_start_up(void); int hci_start_up(void);
void hci_shut_down(void); void hci_shut_down(void);

View file

@ -48,6 +48,6 @@ typedef struct {
BT_HDR *(*make_write_default_erroneous_data_report)(uint8_t enable); BT_HDR *(*make_write_default_erroneous_data_report)(uint8_t enable);
} hci_packet_factory_t; } hci_packet_factory_t;
const hci_packet_factory_t *hci_packet_factory_get_interface(); const hci_packet_factory_t *hci_packet_factory_get_interface(void);
#endif /*_HCI_PACKET_FACTORY_H_*/ #endif /*_HCI_PACKET_FACTORY_H_*/

View file

@ -97,6 +97,6 @@ typedef struct {
); );
} hci_packet_parser_t; } hci_packet_parser_t;
const hci_packet_parser_t *hci_packet_parser_get_interface(); const hci_packet_parser_t *hci_packet_parser_get_interface(void);
#endif /*_HCI_PACKET_PARSER_H_*/ #endif /*_HCI_PACKET_PARSER_H_*/

View file

@ -57,6 +57,6 @@ typedef struct packet_fragmenter_t {
void (*reassemble_and_dispatch)(BT_HDR *packet); void (*reassemble_and_dispatch)(BT_HDR *packet);
} packet_fragmenter_t; } packet_fragmenter_t;
const packet_fragmenter_t *packet_fragmenter_get_interface(); const packet_fragmenter_t *packet_fragmenter_get_interface(void);
#endif /* _PACKET_FRAGMENTER_H_ */ #endif /* _PACKET_FRAGMENTER_H_ */

View file

@ -55,14 +55,14 @@ static void init(const packet_fragmenter_callbacks_t *result_callbacks)
partial_packets = hash_map_new(NUMBER_OF_BUCKETS, hash_function_naive, NULL, NULL, NULL); partial_packets = hash_map_new(NUMBER_OF_BUCKETS, hash_function_naive, NULL, NULL, NULL);
} }
static void cleanup() static void cleanup(void)
{ {
if (partial_packets) { if (partial_packets) {
hash_map_free(partial_packets); hash_map_free(partial_packets);
} }
} }
static BT_HDR *fragment_get_current_packet() static BT_HDR *fragment_get_current_packet(void)
{ {
return current_fragment_packet; return current_fragment_packet;
} }
@ -224,7 +224,7 @@ static const packet_fragmenter_t interface = {
reassemble_and_dispatch reassemble_and_dispatch
}; };
const packet_fragmenter_t *packet_fragmenter_get_interface() const packet_fragmenter_t *packet_fragmenter_get_interface(void)
{ {
controller = controller_get_interface(); controller = controller_get_interface();
return &interface; return &interface;

View file

@ -195,7 +195,7 @@ void bte_main_enable_lpm(BOOLEAN enable)
** Returns None ** Returns None
** **
******************************************************************************/ ******************************************************************************/
void bte_main_lpm_allow_bt_device_sleep() void bte_main_lpm_allow_bt_device_sleep(void)
{ {
/**/ /**/
//hci->send_low_power_command(LPM_WAKE_DEASSERT); //hci->send_low_power_command(LPM_WAKE_DEASSERT);
@ -210,7 +210,7 @@ void bte_main_lpm_allow_bt_device_sleep()
** Returns None ** Returns None
** **
******************************************************************************/ ******************************************************************************/
void bte_main_lpm_wake_bt_device() void bte_main_lpm_wake_bt_device(void)
{ {
//hci->send_low_power_command(LPM_WAKE_ASSERT); //hci->send_low_power_command(LPM_WAKE_ASSERT);
} }

View file

@ -171,7 +171,7 @@ void AVDT_Deregister(void)
** Returns void. ** Returns void.
** **
*******************************************************************************/ *******************************************************************************/
void AVDT_SINK_Activate() void AVDT_SINK_Activate(void)
{ {
tAVDT_SCB *p_scb = &avdt_cb.scb[0]; tAVDT_SCB *p_scb = &avdt_cb.scb[0];
int i; int i;
@ -200,7 +200,7 @@ void AVDT_SINK_Activate()
** Returns void. ** Returns void.
** **
*******************************************************************************/ *******************************************************************************/
void AVDT_SINK_Deactivate() void AVDT_SINK_Deactivate(void)
{ {
tAVDT_SCB *p_scb = &avdt_cb.scb[0]; tAVDT_SCB *p_scb = &avdt_cb.scb[0];
int i; int i;

View file

@ -90,7 +90,7 @@ static UINT8 btm_ble_cs_update_pf_counter(tBTM_BLE_SCAN_COND_OP action,
** Returns status ** Returns status
** **
*******************************************************************************/ *******************************************************************************/
tBTM_STATUS btm_ble_obtain_vsc_details() tBTM_STATUS btm_ble_obtain_vsc_details(void)
{ {
tBTM_STATUS st = BTM_SUCCESS; tBTM_STATUS st = BTM_SUCCESS;

View file

@ -60,7 +60,7 @@ static bool bdaddr_equality_fn(const void *x, const void *y)
return bdaddr_equals((bt_bdaddr_t *)x, (bt_bdaddr_t *)y); return bdaddr_equals((bt_bdaddr_t *)x, (bt_bdaddr_t *)y);
} }
static void background_connections_lazy_init() static void background_connections_lazy_init(void)
{ {
if (!background_connections) { if (!background_connections) {
background_connections = hash_map_new(background_connection_buckets, background_connections = hash_map_new(background_connection_buckets,
@ -91,7 +91,7 @@ static BOOLEAN background_connection_remove(bt_bdaddr_t *address)
return FALSE; return FALSE;
} }
static void background_connections_clear() static void background_connections_clear(void)
{ {
if (background_connections) { if (background_connections) {
hash_map_clear(background_connections); hash_map_clear(background_connections);
@ -110,7 +110,7 @@ static bool background_connections_pending_cb(hash_map_entry_t *hash_entry, void
return true; return true;
} }
static bool background_connections_pending() static bool background_connections_pending(void)
{ {
bool pending_connections = false; bool pending_connections = false;
if (background_connections) { if (background_connections) {

View file

@ -2017,7 +2017,7 @@ UINT8 *BTM_CheckAdvData( UINT8 *p_adv, UINT8 type, UINT8 *p_length)
** BTM_BLE_GENRAL_DISCOVERABLE ** BTM_BLE_GENRAL_DISCOVERABLE
** **
*******************************************************************************/ *******************************************************************************/
UINT16 BTM_BleReadDiscoverability() UINT16 BTM_BleReadDiscoverability(void)
{ {
BTM_TRACE_API("%s\n", __FUNCTION__); BTM_TRACE_API("%s\n", __FUNCTION__);
@ -2034,7 +2034,7 @@ UINT16 BTM_BleReadDiscoverability()
** Returns BTM_BLE_NON_CONNECTABLE or BTM_BLE_CONNECTABLE ** Returns BTM_BLE_NON_CONNECTABLE or BTM_BLE_CONNECTABLE
** **
*******************************************************************************/ *******************************************************************************/
UINT16 BTM_BleReadConnectability() UINT16 BTM_BleReadConnectability(void)
{ {
BTM_TRACE_API ("%s\n", __FUNCTION__); BTM_TRACE_API ("%s\n", __FUNCTION__);

View file

@ -769,7 +769,7 @@ void btm_ble_multi_adv_vse_cback(UINT8 len, UINT8 *p)
** Returns void ** Returns void
** **
*******************************************************************************/ *******************************************************************************/
void btm_ble_multi_adv_init() void btm_ble_multi_adv_init(void)
{ {
#if BTM_DYNAMIC_MEMORY == TRUE #if BTM_DYNAMIC_MEMORY == TRUE
btm_multi_adv_cb_ptr = (tBTM_BLE_MULTI_ADV_CB *)osi_malloc(sizeof(tBTM_BLE_MULTI_ADV_CB)); btm_multi_adv_cb_ptr = (tBTM_BLE_MULTI_ADV_CB *)osi_malloc(sizeof(tBTM_BLE_MULTI_ADV_CB));

View file

@ -1626,7 +1626,7 @@ BOOLEAN BTM_BleGetCurrentAddress(BD_ADDR addr, uint8_t *addr_type);
** BTM_BLE_GENRAL_DISCOVERABLE ** BTM_BLE_GENRAL_DISCOVERABLE
** **
*******************************************************************************/ *******************************************************************************/
UINT16 BTM_BleReadDiscoverability(); UINT16 BTM_BleReadDiscoverability(void);
/******************************************************************************* /*******************************************************************************
** **
@ -1639,7 +1639,7 @@ UINT16 BTM_BleReadDiscoverability();
** **
*******************************************************************************/ *******************************************************************************/
//extern //extern
UINT16 BTM_BleReadConnectability (); UINT16 BTM_BleReadConnectability (void);
void BTM_Recovery_Pre_State(void); void BTM_Recovery_Pre_State(void);
@ -1755,7 +1755,7 @@ void BTM_BleEnableMixedPrivacyMode(BOOLEAN mixed_on);
** **
*******************************************************************************/ *******************************************************************************/
//extern //extern
UINT8 BTM_BleMaxMultiAdvInstanceCount(); UINT8 BTM_BleMaxMultiAdvInstanceCount(void);
/******************************************************************************* /*******************************************************************************
** **

View file

@ -80,7 +80,7 @@ void coap_free_endpoint(coap_endpoint_t *ep);
static int ep_initialized = 0; static int ep_initialized = 0;
struct coap_endpoint_t * struct coap_endpoint_t *
coap_malloc_endpoint() { coap_malloc_endpoint(void) {
static struct coap_endpoint_t ep; static struct coap_endpoint_t ep;
if (ep_initialized) { if (ep_initialized) {

View file

@ -70,7 +70,7 @@ esp_err_t esp_console_init(const esp_console_config_t *config)
return ESP_OK; return ESP_OK;
} }
esp_err_t esp_console_deinit() esp_err_t esp_console_deinit(void)
{ {
if (!s_tmp_line_buf) { if (!s_tmp_line_buf) {
return ESP_ERR_INVALID_STATE; return ESP_ERR_INVALID_STATE;
@ -232,7 +232,7 @@ static int help_command(int argc, char **argv)
} }
esp_err_t esp_console_register_help_command() esp_err_t esp_console_register_help_command(void)
{ {
esp_console_cmd_t command = { esp_console_cmd_t command = {
.command = "help", .command = "help",

View file

@ -52,7 +52,7 @@ esp_err_t esp_console_init(const esp_console_config_t* config);
* - ESP_OK on success * - ESP_OK on success
* - ESP_ERR_INVALID_STATE if not initialized yet * - ESP_ERR_INVALID_STATE if not initialized yet
*/ */
esp_err_t esp_console_deinit(); esp_err_t esp_console_deinit(void);
/** /**
@ -185,7 +185,7 @@ const char *esp_console_get_hint(const char *buf, int *color, int *bold);
* - ESP_OK on success * - ESP_OK on success
* - ESP_ERR_INVALID_STATE, if esp_console_init wasn't called * - ESP_ERR_INVALID_STATE, if esp_console_init wasn't called
*/ */
esp_err_t esp_console_register_help_command(); esp_err_t esp_console_register_help_command(void);
#ifdef __cplusplus #ifdef __cplusplus
} }

View file

@ -205,7 +205,7 @@ void linenoiseSetDumbMode(int set) {
/* Use the ESC [6n escape sequence to query the horizontal cursor position /* Use the ESC [6n escape sequence to query the horizontal cursor position
* and return it. On error -1 is returned, on success the position of the * and return it. On error -1 is returned, on success the position of the
* cursor. */ * cursor. */
static int getCursorPosition() { static int getCursorPosition(void) {
char buf[32]; char buf[32];
int cols, rows; int cols, rows;
unsigned int i = 0; unsigned int i = 0;
@ -228,7 +228,7 @@ static int getCursorPosition() {
/* Try to get the number of columns in the current terminal, or assume 80 /* Try to get the number of columns in the current terminal, or assume 80
* if it fails. */ * if it fails. */
static int getColumns() { static int getColumns(void) {
int start, cols; int start, cols;
/* Get the initial position so we can restore it later. */ /* Get the initial position so we can restore it later. */
@ -887,7 +887,7 @@ static int linenoiseEdit(char *buf, size_t buflen, const char *prompt)
return l.len; return l.len;
} }
int linenoiseProbe() { int linenoiseProbe(void) {
/* Switch to non-blocking mode */ /* Switch to non-blocking mode */
int flags = fcntl(STDIN_FILENO, F_GETFL); int flags = fcntl(STDIN_FILENO, F_GETFL);
flags |= O_NONBLOCK; flags |= O_NONBLOCK;
@ -1000,7 +1000,7 @@ void linenoiseFree(void *ptr) {
/* ================================ History ================================= */ /* ================================ History ================================= */
void linenoiseHistoryFree() { void linenoiseHistoryFree(void) {
if (history) { if (history) {
for (int j = 0; j < history_len; j++) { for (int j = 0; j < history_len; j++) {
free(history[j]); free(history[j]);

View file

@ -63,7 +63,7 @@ int linenoiseHistoryAdd(const char *line);
int linenoiseHistorySetMaxLen(int len); int linenoiseHistorySetMaxLen(int len);
int linenoiseHistorySave(const char *filename); int linenoiseHistorySave(const char *filename);
int linenoiseHistoryLoad(const char *filename); int linenoiseHistoryLoad(const char *filename);
void linenoiseHistoryFree(); void linenoiseHistoryFree(void);
void linenoiseClearScreen(void); void linenoiseClearScreen(void);
void linenoiseSetMultiLine(int ml); void linenoiseSetMultiLine(int ml);
void linenoiseSetDumbMode(int set); void linenoiseSetDumbMode(int set);

View file

@ -36,7 +36,7 @@ static size_t s_static_init_max_waiting_count = 0; //!< maximum ever va
extern "C" int __cxa_guard_acquire(__guard* pg); extern "C" int __cxa_guard_acquire(__guard* pg);
extern "C" void __cxa_guard_release(__guard* pg); extern "C" void __cxa_guard_release(__guard* pg);
extern "C" void __cxa_guard_abort(__guard* pg); extern "C" void __cxa_guard_abort(__guard* pg);
extern "C" void __cxa_guard_dummy(); extern "C" void __cxa_guard_dummy(void);
/** /**
* Layout of the guard object (defined by the ABI). * Layout of the guard object (defined by the ABI).
@ -215,6 +215,6 @@ extern "C" void __cxa_guard_abort(__guard* pg)
* Dummy function used to force linking this file instead of the same one in libstdc++. * Dummy function used to force linking this file instead of the same one in libstdc++.
* This works via -u __cxa_guard_dummy flag in component.mk * This works via -u __cxa_guard_dummy flag in component.mk
*/ */
extern "C" void __cxa_guard_dummy() extern "C" void __cxa_guard_dummy(void)
{ {
} }

View file

@ -29,7 +29,7 @@ extern "C" {
* This is an internal API for I2S module to call to enable I2S-ADC function. * This is an internal API for I2S module to call to enable I2S-ADC function.
* Note that adc_power_off() can still power down ADC. * Note that adc_power_off() can still power down ADC.
*/ */
void adc_power_always_on(); void adc_power_always_on(void);
/** /**
* @brief For I2S dma to claim the usage of ADC1. * @brief For I2S dma to claim the usage of ADC1.
@ -41,7 +41,7 @@ void adc_power_always_on();
* - ESP_OK success * - ESP_OK success
* - ESP_ERR_TIMEOUT reserved for future use. Currently the function will wait until success. * - ESP_ERR_TIMEOUT reserved for future use. Currently the function will wait until success.
*/ */
esp_err_t adc1_i2s_mode_acquire(); esp_err_t adc1_i2s_mode_acquire(void);
/** /**
* @brief For ADC1 to claim the usage of ADC1. * @brief For ADC1 to claim the usage of ADC1.
@ -53,7 +53,7 @@ esp_err_t adc1_i2s_mode_acquire();
* - ESP_OK success * - ESP_OK success
* - ESP_ERR_TIMEOUT reserved for future use. Currently the function will wait until success. * - ESP_ERR_TIMEOUT reserved for future use. Currently the function will wait until success.
*/ */
esp_err_t adc1_adc_mode_acquire(); esp_err_t adc1_adc_mode_acquire(void);
/** /**
* @brief to let other tasks use the ADC1 when I2S is not work. * @brief to let other tasks use the ADC1 when I2S is not work.
@ -63,7 +63,7 @@ esp_err_t adc1_adc_mode_acquire();
* *
* @return always return ESP_OK. * @return always return ESP_OK.
*/ */
esp_err_t adc1_lock_release(); esp_err_t adc1_lock_release(void);
#ifdef __cplusplus #ifdef __cplusplus
} }

View file

@ -141,7 +141,7 @@ static portMUX_TYPE can_spinlock = portMUX_INITIALIZER_UNLOCKED;
/* ------------------- Configuration Register Functions---------------------- */ /* ------------------- Configuration Register Functions---------------------- */
static inline esp_err_t can_enter_reset_mode() static inline esp_err_t can_enter_reset_mode(void)
{ {
/* Enter reset mode (required to write to configuration registers). Reset mode /* Enter reset mode (required to write to configuration registers). Reset mode
also prevents all CAN activity on the current module and is automatically also prevents all CAN activity on the current module and is automatically
@ -151,7 +151,7 @@ static inline esp_err_t can_enter_reset_mode()
return ESP_OK; return ESP_OK;
} }
static inline esp_err_t can_exit_reset_mode() static inline esp_err_t can_exit_reset_mode(void)
{ {
/* Exiting reset mode will return the CAN module to operating mode. Reset mode /* Exiting reset mode will return the CAN module to operating mode. Reset mode
must also be exited in order to trigger BUS-OFF recovery sequence. */ must also be exited in order to trigger BUS-OFF recovery sequence. */
@ -160,7 +160,7 @@ static inline esp_err_t can_exit_reset_mode()
return ESP_OK; return ESP_OK;
} }
static inline void can_config_pelican() static inline void can_config_pelican(void)
{ {
//Use PeliCAN address layout. Exposes extra registers //Use PeliCAN address layout. Exposes extra registers
CAN.clock_divider_reg.can_mode = 1; CAN.clock_divider_reg.can_mode = 1;
@ -286,23 +286,23 @@ static void can_set_tx_buffer_and_transmit(can_frame_t *frame)
can_set_command(command); can_set_command(command);
} }
static inline uint32_t can_get_status() static inline uint32_t can_get_status(void)
{ {
return CAN.status_reg.val; return CAN.status_reg.val;
} }
static inline uint32_t can_get_interrupt_reason() static inline uint32_t can_get_interrupt_reason(void)
{ {
return CAN.interrupt_reg.val; return CAN.interrupt_reg.val;
} }
static inline uint32_t can_get_arbitration_lost_capture() static inline uint32_t can_get_arbitration_lost_capture(void)
{ {
return CAN.arbitration_lost_captue_reg.val; return CAN.arbitration_lost_captue_reg.val;
//Todo: ALC read only to re-arm arb lost interrupt. Add function to decode ALC //Todo: ALC read only to re-arm arb lost interrupt. Add function to decode ALC
} }
static inline uint32_t can_get_error_code_capture() static inline uint32_t can_get_error_code_capture(void)
{ {
return CAN.error_code_capture_reg.val; return CAN.error_code_capture_reg.val;
//Todo: ECC read only to re-arm bus error interrupt. Add function to decode ECC //Todo: ECC read only to re-arm bus error interrupt. Add function to decode ECC
@ -328,7 +328,7 @@ static inline void can_get_rx_buffer_and_clear(can_frame_t *frame)
can_set_command(CMD_RELEASE_RX_BUFF); can_set_command(CMD_RELEASE_RX_BUFF);
} }
static inline uint32_t can_get_rx_message_counter() static inline uint32_t can_get_rx_message_counter(void)
{ {
return CAN.rx_message_counter_reg.val; return CAN.rx_message_counter_reg.val;
} }
@ -725,7 +725,7 @@ esp_err_t can_driver_install(const can_general_config_t *g_config, const can_tim
return ret; return ret;
} }
esp_err_t can_driver_uninstall() esp_err_t can_driver_uninstall(void)
{ {
can_obj_t *p_can_obj_dummy; can_obj_t *p_can_obj_dummy;
@ -761,7 +761,7 @@ esp_err_t can_driver_uninstall()
return ESP_OK; return ESP_OK;
} }
esp_err_t can_start() esp_err_t can_start(void)
{ {
//Check state //Check state
CAN_ENTER_CRITICAL(); CAN_ENTER_CRITICAL();
@ -791,7 +791,7 @@ esp_err_t can_start()
return ESP_OK; return ESP_OK;
} }
esp_err_t can_stop() esp_err_t can_stop(void)
{ {
//Check state //Check state
CAN_ENTER_CRITICAL(); CAN_ENTER_CRITICAL();
@ -928,7 +928,7 @@ esp_err_t can_reconfigure_alerts(uint32_t alerts_enabled, uint32_t *current_aler
return ESP_OK; return ESP_OK;
} }
esp_err_t can_initiate_recovery() esp_err_t can_initiate_recovery(void)
{ {
CAN_ENTER_CRITICAL(); CAN_ENTER_CRITICAL();
//Check state //Check state
@ -982,7 +982,7 @@ esp_err_t can_get_status_info(can_status_info_t *status_info)
return ESP_OK; return ESP_OK;
} }
esp_err_t can_clear_transmit_queue() esp_err_t can_clear_transmit_queue(void)
{ {
//Check State //Check State
CAN_CHECK(p_can_obj != NULL, ESP_ERR_INVALID_STATE); CAN_CHECK(p_can_obj != NULL, ESP_ERR_INVALID_STATE);
@ -997,7 +997,7 @@ esp_err_t can_clear_transmit_queue()
return ESP_OK; return ESP_OK;
} }
esp_err_t can_clear_receive_queue() esp_err_t can_clear_receive_queue(void)
{ {
//Check State //Check State
CAN_CHECK(p_can_obj != NULL, ESP_ERR_INVALID_STATE); CAN_CHECK(p_can_obj != NULL, ESP_ERR_INVALID_STATE);

View file

@ -419,7 +419,7 @@ esp_err_t gpio_install_isr_service(int intr_alloc_flags)
return ret; return ret;
} }
void gpio_uninstall_isr_service() void gpio_uninstall_isr_service(void)
{ {
if (gpio_isr_func == NULL) { if (gpio_isr_func == NULL) {
return; return;

View file

@ -942,7 +942,7 @@ esp_err_t i2c_set_pin(i2c_port_t i2c_num, int sda_io_num, int scl_io_num, gpio_p
return ESP_OK; return ESP_OK;
} }
i2c_cmd_handle_t i2c_cmd_link_create() i2c_cmd_handle_t i2c_cmd_link_create(void)
{ {
#if !CONFIG_SPIRAM_USE_MALLOC #if !CONFIG_SPIRAM_USE_MALLOC
i2c_cmd_desc_t* cmd_desc = (i2c_cmd_desc_t*) calloc(1, sizeof(i2c_cmd_desc_t)); i2c_cmd_desc_t* cmd_desc = (i2c_cmd_desc_t*) calloc(1, sizeof(i2c_cmd_desc_t));

View file

@ -740,7 +740,7 @@ esp_err_t i2s_set_dac_mode(i2s_dac_mode_t dac_mode)
return ESP_OK; return ESP_OK;
} }
static esp_err_t _i2s_adc_mode_recover() static esp_err_t _i2s_adc_mode_recover(void)
{ {
I2S_CHECK(((_i2s_adc_unit != -1) && (_i2s_adc_channel != -1)), "i2s ADC recover error, not initialized...", ESP_ERR_INVALID_ARG); I2S_CHECK(((_i2s_adc_unit != -1) && (_i2s_adc_channel != -1)), "i2s ADC recover error, not initialized...", ESP_ERR_INVALID_ARG);
return adc_i2s_mode_init(_i2s_adc_unit, _i2s_adc_channel); return adc_i2s_mode_init(_i2s_adc_unit, _i2s_adc_channel);

View file

@ -229,13 +229,13 @@ int adc1_get_voltage(adc1_channel_t channel) __attribute__((deprecated));
/** /**
* @brief Enable ADC power * @brief Enable ADC power
*/ */
void adc_power_on(); void adc_power_on(void);
/** /**
* @brief Power off SAR ADC * @brief Power off SAR ADC
* This function will force power down for ADC * This function will force power down for ADC
*/ */
void adc_power_off(); void adc_power_off(void);
/** /**
* @brief Initialize ADC pad * @brief Initialize ADC pad
@ -292,7 +292,7 @@ esp_err_t adc_i2s_mode_init(adc_unit_t adc_unit, adc_channel_t channel);
* Note that adc1_config_channel_atten, adc1_config_width functions need * Note that adc1_config_channel_atten, adc1_config_width functions need
* to be called to configure ADC1 channels, before ADC1 is used by the ULP. * to be called to configure ADC1 channels, before ADC1 is used by the ULP.
*/ */
void adc1_ulp_enable(); void adc1_ulp_enable(void);
/** /**
* @brief Read Hall Sensor * @brief Read Hall Sensor
@ -313,7 +313,7 @@ void adc1_ulp_enable();
* *
* @return The hall sensor reading. * @return The hall sensor reading.
*/ */
int hall_sensor_read(); int hall_sensor_read(void);
/** /**
* @brief Get the gpio number of a specific ADC2 channel. * @brief Get the gpio number of a specific ADC2 channel.

View file

@ -31,7 +31,7 @@ extern "C" {
* - ESP_OK success * - ESP_OK success
* - ESP_ERR_TIMEOUT reserved for future use. Currently the function will wait until success. * - ESP_ERR_TIMEOUT reserved for future use. Currently the function will wait until success.
*/ */
esp_err_t adc2_wifi_acquire(); esp_err_t adc2_wifi_acquire(void);
/** /**
@ -42,7 +42,7 @@ esp_err_t adc2_wifi_acquire();
* *
* @return always return ESP_OK. * @return always return ESP_OK.
*/ */
esp_err_t adc2_wifi_release(); esp_err_t adc2_wifi_release(void);
#ifdef __cplusplus #ifdef __cplusplus
} }

View file

@ -238,7 +238,7 @@ esp_err_t can_driver_install(const can_general_config_t *g_config, const can_tim
* - ESP_OK: Successfully uninstalled CAN driver * - ESP_OK: Successfully uninstalled CAN driver
* - ESP_ERR_INVALID_STATE: Driver is not in stopped/bus-off state, or is not installed * - ESP_ERR_INVALID_STATE: Driver is not in stopped/bus-off state, or is not installed
*/ */
esp_err_t can_driver_uninstall(); esp_err_t can_driver_uninstall(void);
/** /**
* @brief Start the CAN driver * @brief Start the CAN driver
@ -253,7 +253,7 @@ esp_err_t can_driver_uninstall();
* - ESP_OK: CAN driver is now running * - ESP_OK: CAN driver is now running
* - ESP_ERR_INVALID_STATE: Driver is not in stopped state, or is not installed * - ESP_ERR_INVALID_STATE: Driver is not in stopped state, or is not installed
*/ */
esp_err_t can_start(); esp_err_t can_start(void);
/** /**
* @brief Stop the CAN driver * @brief Stop the CAN driver
@ -272,7 +272,7 @@ esp_err_t can_start();
* - ESP_OK: CAN driver is now Stopped * - ESP_OK: CAN driver is now Stopped
* - ESP_ERR_INVALID_STATE: Driver is not in running state, or is not installed * - ESP_ERR_INVALID_STATE: Driver is not in running state, or is not installed
*/ */
esp_err_t can_stop(); esp_err_t can_stop(void);
/** /**
* @brief Transmit a CAN message * @brief Transmit a CAN message
@ -379,7 +379,7 @@ esp_err_t can_reconfigure_alerts(uint32_t alerts_enabled, uint32_t *current_aler
* - ESP_OK: Bus recovery started * - ESP_OK: Bus recovery started
* - ESP_ERR_INVALID_STATE: CAN driver is not in the bus-off state, or is not installed * - ESP_ERR_INVALID_STATE: CAN driver is not in the bus-off state, or is not installed
*/ */
esp_err_t can_initiate_recovery(); esp_err_t can_initiate_recovery(void);
/** /**
* @brief Get current status information of the CAN driver * @brief Get current status information of the CAN driver
@ -405,7 +405,7 @@ esp_err_t can_get_status_info(can_status_info_t *status_info);
* - ESP_OK: Transmit queue cleared * - ESP_OK: Transmit queue cleared
* - ESP_ERR_INVALID_STATE: CAN driver is not installed or TX queue is disabled * - ESP_ERR_INVALID_STATE: CAN driver is not installed or TX queue is disabled
*/ */
esp_err_t can_clear_transmit_queue(); esp_err_t can_clear_transmit_queue(void);
/** /**
* @brief Clear the receive queue * @brief Clear the receive queue
@ -419,7 +419,7 @@ esp_err_t can_clear_transmit_queue();
* - ESP_OK: Transmit queue cleared * - ESP_OK: Transmit queue cleared
* - ESP_ERR_INVALID_STATE: CAN driver is not installed * - ESP_ERR_INVALID_STATE: CAN driver is not installed
*/ */
esp_err_t can_clear_receive_queue(); esp_err_t can_clear_receive_queue(void);
#ifdef __cplusplus #ifdef __cplusplus
} }

View file

@ -99,12 +99,12 @@ esp_err_t dac_output_disable(dac_channel_t channel);
/** /**
* @brief Enable DAC output data from I2S * @brief Enable DAC output data from I2S
*/ */
esp_err_t dac_i2s_enable(); esp_err_t dac_i2s_enable(void);
/** /**
* @brief Disable DAC output data from I2S * @brief Disable DAC output data from I2S
*/ */
esp_err_t dac_i2s_disable(); esp_err_t dac_i2s_disable(void);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

View file

@ -475,7 +475,7 @@ esp_err_t gpio_install_isr_service(int intr_alloc_flags);
/** /**
* @brief Uninstall the driver's GPIO ISR service, freeing related resources. * @brief Uninstall the driver's GPIO ISR service, freeing related resources.
*/ */
void gpio_uninstall_isr_service(); void gpio_uninstall_isr_service(void);
/** /**
* @brief Add ISR handler for the corresponding GPIO pin. * @brief Add ISR handler for the corresponding GPIO pin.

View file

@ -224,7 +224,7 @@ esp_err_t i2c_set_pin(i2c_port_t i2c_num, int sda_io_num, int scl_io_num,
* *
* @return i2c command link handler * @return i2c command link handler
*/ */
i2c_cmd_handle_t i2c_cmd_link_create(); i2c_cmd_handle_t i2c_cmd_link_create(void);
/** /**
* @brief Free I2C command link * @brief Free I2C command link

View file

@ -435,7 +435,7 @@ esp_err_t ledc_fade_func_install(int intr_alloc_flags);
* @brief Uninstall LEDC fade function. * @brief Uninstall LEDC fade function.
* *
*/ */
void ledc_fade_func_uninstall(); void ledc_fade_func_uninstall(void);
/** /**
* @brief Start LEDC fading. * @brief Start LEDC fading.

View file

@ -219,7 +219,7 @@ esp_err_t rtc_gpio_isolate(gpio_num_t gpio_num);
* Force hold signal is enabled before going into deep sleep for pins which * Force hold signal is enabled before going into deep sleep for pins which
* are used for EXT1 wakeup. * are used for EXT1 wakeup.
*/ */
void rtc_gpio_force_hold_dis_all(); void rtc_gpio_force_hold_dis_all(void);
/** /**
* @brief Set RTC GPIO pad drive capability * @brief Set RTC GPIO pad drive capability

View file

@ -111,7 +111,7 @@ esp_err_t sdio_slave_initialize(sdio_slave_config_t *config);
/** De-initialize the sdio slave driver to release the resources. /** De-initialize the sdio slave driver to release the resources.
*/ */
void sdio_slave_deinit(); void sdio_slave_deinit(void);
/** Start hardware for sending and receiving, as well as set the IOREADY1 to 1. /** Start hardware for sending and receiving, as well as set the IOREADY1 to 1.
* *
@ -122,19 +122,19 @@ void sdio_slave_deinit();
* - ESP_ERR_INVALID_STATE if already started. * - ESP_ERR_INVALID_STATE if already started.
* - ESP_OK otherwise. * - ESP_OK otherwise.
*/ */
esp_err_t sdio_slave_start(); esp_err_t sdio_slave_start(void);
/** Stop hardware from sending and receiving, also set IOREADY1 to 0. /** Stop hardware from sending and receiving, also set IOREADY1 to 0.
* *
* @note this will not clear the data already in the driver, and also not reset the PKT_LEN and TOKEN1 counting. Call ``sdio_slave_reset`` to do that. * @note this will not clear the data already in the driver, and also not reset the PKT_LEN and TOKEN1 counting. Call ``sdio_slave_reset`` to do that.
*/ */
void sdio_slave_stop(); void sdio_slave_stop(void);
/** Clear the data still in the driver, as well as reset the PKT_LEN and TOKEN1 counting. /** Clear the data still in the driver, as well as reset the PKT_LEN and TOKEN1 counting.
* *
* @return always return ESP_OK. * @return always return ESP_OK.
*/ */
esp_err_t sdio_slave_reset(); esp_err_t sdio_slave_reset(void);
/*--------------------------------------------------------------------------- /*---------------------------------------------------------------------------
* Receive * Receive
@ -263,7 +263,7 @@ esp_err_t sdio_slave_write_reg(int pos, uint8_t reg);
* *
* @return the interrupt mask. * @return the interrupt mask.
*/ */
sdio_slave_hostint_t sdio_slave_get_host_intena(); sdio_slave_hostint_t sdio_slave_get_host_intena(void);
/** Set the interrupt enable for host. /** Set the interrupt enable for host.
* *

View file

@ -91,7 +91,7 @@ typedef struct {
* - ESP_ERR_INVALID_STATE if sdmmc_host_init was already called * - ESP_ERR_INVALID_STATE if sdmmc_host_init was already called
* - ESP_ERR_NO_MEM if memory can not be allocated * - ESP_ERR_NO_MEM if memory can not be allocated
*/ */
esp_err_t sdmmc_host_init(); esp_err_t sdmmc_host_init(void);
/** /**
* @brief Initialize given slot of SDMMC peripheral * @brief Initialize given slot of SDMMC peripheral
@ -218,7 +218,7 @@ esp_err_t sdmmc_host_io_int_wait(int slot, TickType_t timeout_ticks);
* - ESP_OK on success * - ESP_OK on success
* - ESP_ERR_INVALID_STATE if sdmmc_host_init function has not been called * - ESP_ERR_INVALID_STATE if sdmmc_host_init function has not been called
*/ */
esp_err_t sdmmc_host_deinit(); esp_err_t sdmmc_host_deinit(void);
/** /**
* @brief Enable the pull-ups of sd pins. * @brief Enable the pull-ups of sd pins.

View file

@ -91,7 +91,7 @@ typedef struct {
* - ESP_OK on success * - ESP_OK on success
* - other error codes may be returned in future versions * - other error codes may be returned in future versions
*/ */
esp_err_t sdspi_host_init(); esp_err_t sdspi_host_init(void);
/** /**
* @brief Initialize SD SPI driver for the specific SPI controller * @brief Initialize SD SPI driver for the specific SPI controller
@ -159,7 +159,7 @@ esp_err_t sdspi_host_set_card_clk(int slot, uint32_t freq_khz);
* - ESP_OK on success * - ESP_OK on success
* - ESP_ERR_INVALID_STATE if sdspi_host_init function has not been called * - ESP_ERR_INVALID_STATE if sdspi_host_init function has not been called
*/ */
esp_err_t sdspi_host_deinit(); esp_err_t sdspi_host_deinit(void);
/** /**
* @brief Enable SDIO interrupt. * @brief Enable SDIO interrupt.

View file

@ -381,7 +381,7 @@ bool spicommon_dmaworkaround_req_reset(int dmachan, dmaworkaround_cb_t cb, void
* *
* @return True when a DMA reset is requested but hasn't completed yet. False otherwise. * @return True when a DMA reset is requested but hasn't completed yet. False otherwise.
*/ */
bool spicommon_dmaworkaround_reset_in_progress(); bool spicommon_dmaworkaround_reset_in_progress(void);
/** /**

View file

@ -117,7 +117,7 @@ typedef intr_handle_t touch_isr_handle_t;
* - ESP_OK Success * - ESP_OK Success
* - ESP_FAIL Touch pad init error * - ESP_FAIL Touch pad init error
*/ */
esp_err_t touch_pad_init(); esp_err_t touch_pad_init(void);
/** /**
* @brief Un-install touch pad driver. * @brief Un-install touch pad driver.
@ -126,7 +126,7 @@ esp_err_t touch_pad_init();
* - ESP_OK Success * - ESP_OK Success
* - ESP_FAIL Touch pad driver not initialized * - ESP_FAIL Touch pad driver not initialized
*/ */
esp_err_t touch_pad_deinit(); esp_err_t touch_pad_deinit(void);
/** /**
* @brief Configure touch pad interrupt threshold. * @brief Configure touch pad interrupt threshold.
@ -364,7 +364,7 @@ esp_err_t touch_pad_get_fsm_mode(touch_fsm_mode_t *mode);
* @return * @return
* - ESP_OK on success * - ESP_OK on success
*/ */
esp_err_t touch_pad_sw_start(); esp_err_t touch_pad_sw_start(void);
/** /**
* @brief Set touch sensor interrupt threshold * @brief Set touch sensor interrupt threshold
@ -468,28 +468,28 @@ esp_err_t touch_pad_clear_group_mask(uint16_t set1_mask, uint16_t set2_mask, uin
* @return * @return
* - ESP_OK on success * - ESP_OK on success
*/ */
esp_err_t touch_pad_clear_status(); esp_err_t touch_pad_clear_status(void);
/** /**
* @brief Get the touch sensor status, usually used in ISR to decide which pads are 'touched'. * @brief Get the touch sensor status, usually used in ISR to decide which pads are 'touched'.
* @return * @return
* - touch status * - touch status
*/ */
uint32_t touch_pad_get_status(); uint32_t touch_pad_get_status(void);
/** /**
* @brief To enable touch pad interrupt * @brief To enable touch pad interrupt
* @return * @return
* - ESP_OK on success * - ESP_OK on success
*/ */
esp_err_t touch_pad_intr_enable(); esp_err_t touch_pad_intr_enable(void);
/** /**
* @brief To disable touch pad interrupt * @brief To disable touch pad interrupt
* @return * @return
* - ESP_OK on success * - ESP_OK on success
*/ */
esp_err_t touch_pad_intr_disable(); esp_err_t touch_pad_intr_disable(void);
/** /**
* @brief set touch pad filter calibration period, in ms. * @brief set touch pad filter calibration period, in ms.
@ -539,7 +539,7 @@ esp_err_t touch_pad_filter_start(uint32_t filter_period_ms);
* - ESP_OK Success * - ESP_OK Success
* - ESP_ERR_INVALID_STATE driver state error * - ESP_ERR_INVALID_STATE driver state error
*/ */
esp_err_t touch_pad_filter_stop(); esp_err_t touch_pad_filter_stop(void);
/** /**
* @brief delete touch pad filter driver and release the memory * @brief delete touch pad filter driver and release the memory
@ -548,7 +548,7 @@ esp_err_t touch_pad_filter_stop();
* - ESP_OK Success * - ESP_OK Success
* - ESP_ERR_INVALID_STATE driver state error * - ESP_ERR_INVALID_STATE driver state error
*/ */
esp_err_t touch_pad_filter_delete(); esp_err_t touch_pad_filter_delete(void);
/** /**
* @brief Get the touch pad which caused wakeup from sleep * @brief Get the touch pad which caused wakeup from sleep

View file

@ -40,7 +40,7 @@ void uart_set_select_notif_callback(uart_port_t uart_num, uart_select_notif_call
/** /**
* @brief Get mutex guarding select() notifications * @brief Get mutex guarding select() notifications
*/ */
portMUX_TYPE *uart_get_selectlock(); portMUX_TYPE *uart_get_selectlock(void);
#ifdef __cplusplus #ifdef __cplusplus
} }

View file

@ -712,7 +712,7 @@ esp_err_t ledc_fade_func_install(int intr_alloc_flags)
return ledc_isr_register(ledc_fade_isr, NULL, intr_alloc_flags | ESP_INTR_FLAG_IRAM, &s_ledc_fade_isr_handle); return ledc_isr_register(ledc_fade_isr, NULL, intr_alloc_flags | ESP_INTR_FLAG_IRAM, &s_ledc_fade_isr_handle);
} }
void ledc_fade_func_uninstall() void ledc_fade_func_uninstall(void)
{ {
if (s_ledc_fade_rec == NULL) { if (s_ledc_fade_rec == NULL) {
return; return;

View file

@ -321,7 +321,7 @@ esp_err_t rmt_get_status(rmt_channel_t channel, uint32_t* status)
return ESP_OK; return ESP_OK;
} }
rmt_data_mode_t rmt_get_data_mode() rmt_data_mode_t rmt_get_data_mode(void)
{ {
return (rmt_data_mode_t) (RMT.apb_conf.fifo_mask); return (rmt_data_mode_t) (RMT.apb_conf.fifo_mask);
} }

View file

@ -368,7 +368,7 @@ esp_err_t rtc_gpio_isolate(gpio_num_t gpio_num)
return ESP_OK; return ESP_OK;
} }
void rtc_gpio_force_hold_dis_all() void rtc_gpio_force_hold_dis_all(void)
{ {
for (int gpio = 0; gpio < GPIO_PIN_COUNT; ++gpio) { for (int gpio = 0; gpio < GPIO_PIN_COUNT; ++gpio) {
const rtc_gpio_desc_t* desc = &rtc_gpio_desc[gpio]; const rtc_gpio_desc_t* desc = &rtc_gpio_desc[gpio];
@ -657,7 +657,7 @@ esp_err_t touch_pad_get_fsm_mode(touch_fsm_mode_t *mode)
return ESP_OK; return ESP_OK;
} }
esp_err_t touch_pad_sw_start() esp_err_t touch_pad_sw_start(void)
{ {
portENTER_CRITICAL(&rtc_spinlock); portENTER_CRITICAL(&rtc_spinlock);
SENS.sar_touch_ctrl2.touch_start_en = 0; SENS.sar_touch_ctrl2.touch_start_en = 0;
@ -772,13 +772,13 @@ esp_err_t touch_pad_clear_group_mask(uint16_t set1_mask, uint16_t set2_mask, uin
return ESP_OK; return ESP_OK;
} }
uint32_t IRAM_ATTR touch_pad_get_status() uint32_t IRAM_ATTR touch_pad_get_status(void)
{ {
uint32_t status = SENS.sar_touch_ctrl2.touch_meas_en; uint32_t status = SENS.sar_touch_ctrl2.touch_meas_en;
return TOUCH_BITS_SWAP(status); return TOUCH_BITS_SWAP(status);
} }
esp_err_t IRAM_ATTR touch_pad_clear_status() esp_err_t IRAM_ATTR touch_pad_clear_status(void)
{ {
portENTER_CRITICAL(&rtc_spinlock); portENTER_CRITICAL(&rtc_spinlock);
SENS.sar_touch_ctrl2.touch_meas_en_clr = 1; SENS.sar_touch_ctrl2.touch_meas_en_clr = 1;
@ -786,7 +786,7 @@ esp_err_t IRAM_ATTR touch_pad_clear_status()
return ESP_OK; return ESP_OK;
} }
esp_err_t touch_pad_intr_enable() esp_err_t touch_pad_intr_enable(void)
{ {
portENTER_CRITICAL(&rtc_spinlock); portENTER_CRITICAL(&rtc_spinlock);
RTCCNTL.int_ena.rtc_touch = 1; RTCCNTL.int_ena.rtc_touch = 1;
@ -794,7 +794,7 @@ esp_err_t touch_pad_intr_enable()
return ESP_OK; return ESP_OK;
} }
esp_err_t touch_pad_intr_disable() esp_err_t touch_pad_intr_disable(void)
{ {
portENTER_CRITICAL(&rtc_spinlock); portENTER_CRITICAL(&rtc_spinlock);
RTCCNTL.int_ena.rtc_touch = 0; RTCCNTL.int_ena.rtc_touch = 0;
@ -834,7 +834,7 @@ esp_err_t touch_pad_config(touch_pad_t touch_num, uint16_t threshold)
return ESP_OK; return ESP_OK;
} }
esp_err_t touch_pad_init() esp_err_t touch_pad_init(void)
{ {
if (rtc_touch_mux == NULL) { if (rtc_touch_mux == NULL) {
rtc_touch_mux = xSemaphoreCreateMutex(); rtc_touch_mux = xSemaphoreCreateMutex();
@ -852,7 +852,7 @@ esp_err_t touch_pad_init()
return ESP_OK; return ESP_OK;
} }
esp_err_t touch_pad_deinit() esp_err_t touch_pad_deinit(void)
{ {
RTC_MODULE_CHECK(rtc_touch_mux != NULL, "Touch pad not initialized", ESP_FAIL); RTC_MODULE_CHECK(rtc_touch_mux != NULL, "Touch pad not initialized", ESP_FAIL);
if (s_touch_pad_filter != NULL) { if (s_touch_pad_filter != NULL) {
@ -1006,7 +1006,7 @@ err_no_mem:
return ESP_ERR_NO_MEM; return ESP_ERR_NO_MEM;
} }
esp_err_t touch_pad_filter_stop() esp_err_t touch_pad_filter_stop(void)
{ {
RTC_MODULE_CHECK(s_touch_pad_filter != NULL, "Touch pad filter not initialized", ESP_ERR_INVALID_STATE); RTC_MODULE_CHECK(s_touch_pad_filter != NULL, "Touch pad filter not initialized", ESP_ERR_INVALID_STATE);
RTC_MODULE_CHECK(rtc_touch_mux != NULL, "Touch pad not initialized", ESP_ERR_INVALID_STATE); RTC_MODULE_CHECK(rtc_touch_mux != NULL, "Touch pad not initialized", ESP_ERR_INVALID_STATE);
@ -1022,7 +1022,7 @@ esp_err_t touch_pad_filter_stop()
return ret; return ret;
} }
esp_err_t touch_pad_filter_delete() esp_err_t touch_pad_filter_delete(void)
{ {
RTC_MODULE_CHECK(s_touch_pad_filter != NULL, "Touch pad filter not initialized", ESP_ERR_INVALID_STATE); RTC_MODULE_CHECK(s_touch_pad_filter != NULL, "Touch pad filter not initialized", ESP_ERR_INVALID_STATE);
RTC_MODULE_CHECK(rtc_touch_mux != NULL, "Touch pad not initialized", ESP_ERR_INVALID_STATE); RTC_MODULE_CHECK(rtc_touch_mux != NULL, "Touch pad not initialized", ESP_ERR_INVALID_STATE);
@ -1143,14 +1143,14 @@ static esp_err_t adc_set_atten(adc_unit_t adc_unit, adc_channel_t channel, adc_a
return ESP_OK; return ESP_OK;
} }
void adc_power_always_on() void adc_power_always_on(void)
{ {
portENTER_CRITICAL(&rtc_spinlock); portENTER_CRITICAL(&rtc_spinlock);
SENS.sar_meas_wait2.force_xpd_sar = SENS_FORCE_XPD_SAR_PU; SENS.sar_meas_wait2.force_xpd_sar = SENS_FORCE_XPD_SAR_PU;
portEXIT_CRITICAL(&rtc_spinlock); portEXIT_CRITICAL(&rtc_spinlock);
} }
void adc_power_on() void adc_power_on(void)
{ {
portENTER_CRITICAL(&rtc_spinlock); portENTER_CRITICAL(&rtc_spinlock);
//The power FSM controlled mode saves more power, while the ADC noise may get increased. //The power FSM controlled mode saves more power, while the ADC noise may get increased.
@ -1168,7 +1168,7 @@ void adc_power_on()
portEXIT_CRITICAL(&rtc_spinlock); portEXIT_CRITICAL(&rtc_spinlock);
} }
void adc_power_off() void adc_power_off(void)
{ {
portENTER_CRITICAL(&rtc_spinlock); portENTER_CRITICAL(&rtc_spinlock);
//Bit1 0:Fsm 1: SW mode //Bit1 0:Fsm 1: SW mode
@ -1474,7 +1474,7 @@ esp_err_t adc1_config_width(adc_bits_width_t width_bit)
return ESP_OK; return ESP_OK;
} }
static inline void adc1_fsm_disable() static inline void adc1_fsm_disable(void)
{ {
//channel is set in the convert function //channel is set in the convert function
SENS.sar_meas_wait2.force_xpd_amp = SENS_FORCE_XPD_AMP_PD; SENS.sar_meas_wait2.force_xpd_amp = SENS_FORCE_XPD_AMP_PD;
@ -1487,7 +1487,7 @@ static inline void adc1_fsm_disable()
SENS.sar_meas_wait2.sar_amp_wait3 = 1; SENS.sar_meas_wait2.sar_amp_wait3 = 1;
} }
esp_err_t adc1_i2s_mode_acquire() esp_err_t adc1_i2s_mode_acquire(void)
{ {
//lazy initialization //lazy initialization
//for i2s, block until acquire the lock //for i2s, block until acquire the lock
@ -1501,7 +1501,7 @@ esp_err_t adc1_i2s_mode_acquire()
return ESP_OK; return ESP_OK;
} }
esp_err_t adc1_adc_mode_acquire() esp_err_t adc1_adc_mode_acquire(void)
{ {
//lazy initialization //lazy initialization
//for adc1, block until acquire the lock //for adc1, block until acquire the lock
@ -1517,7 +1517,7 @@ esp_err_t adc1_adc_mode_acquire()
return ESP_OK; return ESP_OK;
} }
esp_err_t adc1_lock_release() esp_err_t adc1_lock_release(void)
{ {
RTC_MODULE_CHECK((uint32_t*)adc1_i2s_lock != NULL, "adc1 lock release called before acquire", ESP_ERR_INVALID_STATE ); RTC_MODULE_CHECK((uint32_t*)adc1_i2s_lock != NULL, "adc1 lock release called before acquire", ESP_ERR_INVALID_STATE );
// for now the WiFi would use ADC2 and set xpd_sar force on. // for now the WiFi would use ADC2 and set xpd_sar force on.
@ -1548,7 +1548,7 @@ int adc1_get_raw(adc1_channel_t channel)
return adc_value; return adc_value;
} }
int adc1_get_voltage(adc1_channel_t channel) //Deprecated. Use adc1_get_raw() instead int adc1_get_voltage(adc1_channel_t channel) //Deprecated. Use adc1_get_raw(void) instead
{ {
return adc1_get_raw(channel); return adc1_get_raw(channel);
} }
@ -1611,7 +1611,7 @@ esp_err_t adc2_pad_get_io_num(adc2_channel_t channel, gpio_num_t *gpio_num)
return ESP_OK; return ESP_OK;
} }
esp_err_t adc2_wifi_acquire() esp_err_t adc2_wifi_acquire(void)
{ {
//lazy initialization //lazy initialization
//for wifi, block until acquire the lock //for wifi, block until acquire the lock
@ -1620,7 +1620,7 @@ esp_err_t adc2_wifi_acquire()
return ESP_OK; return ESP_OK;
} }
esp_err_t adc2_wifi_release() esp_err_t adc2_wifi_release(void)
{ {
RTC_MODULE_CHECK((uint32_t*)adc2_wifi_lock != NULL, "wifi release called before acquire", ESP_ERR_INVALID_STATE ); RTC_MODULE_CHECK((uint32_t*)adc2_wifi_lock != NULL, "wifi release called before acquire", ESP_ERR_INVALID_STATE );
@ -1878,7 +1878,7 @@ esp_err_t dac_out_voltage(dac_channel_t channel, uint8_t dac_value)
return ESP_OK; return ESP_OK;
} }
esp_err_t dac_i2s_enable() esp_err_t dac_i2s_enable(void)
{ {
portENTER_CRITICAL(&rtc_spinlock); portENTER_CRITICAL(&rtc_spinlock);
SET_PERI_REG_MASK(SENS_SAR_DAC_CTRL1_REG, SENS_DAC_DIG_FORCE_M | SENS_DAC_CLK_INV_M); SET_PERI_REG_MASK(SENS_SAR_DAC_CTRL1_REG, SENS_DAC_DIG_FORCE_M | SENS_DAC_CLK_INV_M);
@ -1886,7 +1886,7 @@ esp_err_t dac_i2s_enable()
return ESP_OK; return ESP_OK;
} }
esp_err_t dac_i2s_disable() esp_err_t dac_i2s_disable(void)
{ {
portENTER_CRITICAL(&rtc_spinlock); portENTER_CRITICAL(&rtc_spinlock);
CLEAR_PERI_REG_MASK(SENS_SAR_DAC_CTRL1_REG, SENS_DAC_DIG_FORCE_M | SENS_DAC_CLK_INV_M); CLEAR_PERI_REG_MASK(SENS_SAR_DAC_CTRL1_REG, SENS_DAC_DIG_FORCE_M | SENS_DAC_CLK_INV_M);
@ -1903,7 +1903,7 @@ static inline void adc1_hall_enable(bool enable)
RTCIO.hall_sens.xpd_hall = enable; RTCIO.hall_sens.xpd_hall = enable;
} }
static int hall_sensor_get_value() //hall sensor without LNA static int hall_sensor_get_value(void) //hall sensor without LNA
{ {
int Sens_Vp0; int Sens_Vp0;
int Sens_Vn0; int Sens_Vn0;
@ -1932,7 +1932,7 @@ static int hall_sensor_get_value() //hall sensor without LNA
return hall_value; return hall_value;
} }
int hall_sensor_read() int hall_sensor_read(void)
{ {
adc_gpio_init(ADC_UNIT_1, ADC1_CHANNEL_0); adc_gpio_init(ADC_UNIT_1, ADC1_CHANNEL_0);
adc_gpio_init(ADC_UNIT_1, ADC1_CHANNEL_3); adc_gpio_init(ADC_UNIT_1, ADC1_CHANNEL_3);
@ -1974,7 +1974,7 @@ static void rtc_isr(void* arg)
REG_WRITE(RTC_CNTL_INT_CLR_REG, status); REG_WRITE(RTC_CNTL_INT_CLR_REG, status);
} }
static esp_err_t rtc_isr_ensure_installed() static esp_err_t rtc_isr_ensure_installed(void)
{ {
esp_err_t err = ESP_OK; esp_err_t err = ESP_OK;
portENTER_CRITICAL(&s_rtc_isr_handler_list_lock); portENTER_CRITICAL(&s_rtc_isr_handler_list_lock);

View file

@ -215,17 +215,17 @@ static void sdio_intr_host(void*);
static void sdio_intr_send(void*); static void sdio_intr_send(void*);
static void sdio_intr_recv(void*); static void sdio_intr_recv(void*);
static esp_err_t send_flush_data(); static esp_err_t send_flush_data(void);
static esp_err_t send_reset_counter(); static esp_err_t send_reset_counter(void);
static void recv_flush_data(); static void recv_flush_data(void);
static void recv_reset_counter(); static void recv_reset_counter(void);
static esp_err_t send_start(); static esp_err_t send_start(void);
static void send_stop(); static void send_stop(void);
static esp_err_t recv_start(); static esp_err_t recv_start(void);
static void recv_stop(); static void recv_stop(void);
static void deinit_context(); static void deinit_context(void);
/**************** Ring buffer for SDIO use *****************/ /**************** Ring buffer for SDIO use *****************/
@ -395,7 +395,7 @@ static void __attribute((unused)) dump_ll(lldesc_t *queue)
ESP_EARLY_LOGI(TAG, "total: %d", cnt); ESP_EARLY_LOGI(TAG, "total: %d", cnt);
} }
static inline void deinit_context() static inline void deinit_context(void)
{ {
context.config = (sdio_slave_config_t){}; context.config = (sdio_slave_config_t){};
for(int i = 0; i < 9; i++) { for(int i = 0; i < 9; i++) {
@ -417,7 +417,7 @@ esp_err_t link_desc_to_last(uint8_t* desc, void* arg)
return ESP_OK; return ESP_OK;
} }
static esp_err_t init_ringbuf() static esp_err_t init_ringbuf(void)
{ {
esp_err_t ret = sdio_ringbuf_init(&context.sendbuf, sizeof(buf_desc_t), context.config.send_queue_size); esp_err_t ret = sdio_ringbuf_init(&context.sendbuf, sizeof(buf_desc_t), context.config.send_queue_size);
if (ret != ESP_OK) return ret; if (ret != ESP_OK) return ret;
@ -591,7 +591,7 @@ esp_err_t sdio_slave_initialize(sdio_slave_config_t *config)
return ESP_OK; return ESP_OK;
} }
void sdio_slave_deinit() void sdio_slave_deinit(void)
{ {
esp_err_t ret = esp_intr_free(context.intr_handle); esp_err_t ret = esp_intr_free(context.intr_handle);
assert(ret==ESP_OK); assert(ret==ESP_OK);
@ -599,7 +599,7 @@ void sdio_slave_deinit()
deinit_context(); deinit_context();
} }
esp_err_t sdio_slave_start() esp_err_t sdio_slave_start(void)
{ {
esp_err_t ret; esp_err_t ret;
HOST.slc0_int_clr.val = UINT32_MAX;//clear all interrupts HOST.slc0_int_clr.val = UINT32_MAX;//clear all interrupts
@ -611,7 +611,7 @@ esp_err_t sdio_slave_start()
return ESP_OK; return ESP_OK;
} }
esp_err_t sdio_slave_reset() esp_err_t sdio_slave_reset(void)
{ {
send_flush_data(); send_flush_data();
send_reset_counter(); send_reset_counter();
@ -620,7 +620,7 @@ esp_err_t sdio_slave_reset()
return ESP_OK; return ESP_OK;
} }
void sdio_slave_stop() void sdio_slave_stop(void)
{ {
HINF.cfg_data1.sdio_ioready1 = 0; //set IO ready to 1 to stop host from using HINF.cfg_data1.sdio_ioready1 = 0; //set IO ready to 1 to stop host from using
send_stop(); send_stop();
@ -696,7 +696,7 @@ esp_err_t sdio_slave_write_reg(int pos, uint8_t reg)
return ESP_OK; return ESP_OK;
} }
sdio_slave_hostint_t sdio_slave_get_host_intena() sdio_slave_hostint_t sdio_slave_get_host_intena(void)
{ {
return HOST.slc0_func1_int_ena.val; return HOST.slc0_func1_int_ena.val;
} }
@ -742,12 +742,12 @@ static inline void send_start_transmission(const void* desc)
SLC.slc0_rx_link.start = 1; SLC.slc0_rx_link.start = 1;
} }
static inline void send_stop_ll_operation() static inline void send_stop_ll_operation(void)
{ {
SLC.slc0_rx_link.stop = 1; SLC.slc0_rx_link.stop = 1;
} }
static inline uint32_t send_length_read() static inline uint32_t send_length_read(void)
{ {
return HOST.pkt_len.reg_slc0_len; return HOST.pkt_len.reg_slc0_len;
} }
@ -760,7 +760,7 @@ DMA_ATTR static const buf_desc_t start_desc = {
.eof = 1, .eof = 1,
}; };
static inline void send_isr_invoker_enable() static inline void send_isr_invoker_enable(void)
{ {
//force trigger rx_done interrupt. the interrupt is abused to invoke ISR from the app by the enable bit and never cleared. //force trigger rx_done interrupt. the interrupt is abused to invoke ISR from the app by the enable bit and never cleared.
send_start_transmission(&start_desc); send_start_transmission(&start_desc);
@ -770,29 +770,29 @@ static inline void send_isr_invoker_enable()
send_stop_ll_operation(); send_stop_ll_operation();
} }
static inline void send_isr_invoker_disable() static inline void send_isr_invoker_disable(void)
{ {
SLC.slc0_int_clr.rx_done = 1; SLC.slc0_int_clr.rx_done = 1;
} }
static inline void send_intr_enable() static inline void send_intr_enable(void)
{ {
SLC.slc0_int_ena.rx_eof = 1; SLC.slc0_int_ena.rx_eof = 1;
send_isr_invoker_enable(); send_isr_invoker_enable();
} }
static inline void send_intr_disable() static inline void send_intr_disable(void)
{ {
send_isr_invoker_disable(); send_isr_invoker_disable();
SLC.slc0_int_ena.rx_eof = 0; SLC.slc0_int_ena.rx_eof = 0;
} }
static inline void send_isr_invoke() static inline void send_isr_invoke(void)
{ {
SLC.slc0_int_ena.rx_done = 1; SLC.slc0_int_ena.rx_done = 1;
} }
static inline send_state_t send_get_state() static inline send_state_t send_get_state(void)
{ {
return context.send_state; return context.send_state;
} }
@ -803,7 +803,7 @@ static inline void send_set_state(send_state_t state)
} }
//start hw operation with existing data (if exist) //start hw operation with existing data (if exist)
static esp_err_t send_start() static esp_err_t send_start(void)
{ {
SDIO_SLAVE_CHECK(send_get_state() == STATE_IDLE, SDIO_SLAVE_CHECK(send_get_state() == STATE_IDLE,
"already started", ESP_ERR_INVALID_STATE); "already started", ESP_ERR_INVALID_STATE);
@ -814,7 +814,7 @@ static esp_err_t send_start()
} }
//only stop hw operations, no touch to data as well as counter //only stop hw operations, no touch to data as well as counter
static void send_stop() static void send_stop(void)
{ {
SLC.slc0_rx_link.stop = 1; SLC.slc0_rx_link.stop = 1;
send_intr_disable(); send_intr_disable();
@ -866,7 +866,7 @@ static inline esp_err_t send_isr_check_new_pkt(portBASE_TYPE *yield)
return ESP_OK; return ESP_OK;
} }
static inline esp_err_t send_isr_new_packet() static inline esp_err_t send_isr_new_packet(void)
{ {
// since eof is changed, we have to stop and reset the link list, // since eof is changed, we have to stop and reset the link list,
// and restart new link list operation // and restart new link list operation
@ -973,7 +973,7 @@ esp_err_t sdio_slave_transmit(uint8_t* addr, size_t len)
} }
//clear data but keep counter //clear data but keep counter
static esp_err_t send_flush_data() static esp_err_t send_flush_data(void)
{ {
//only works in idle state / wait to send state //only works in idle state / wait to send state
SDIO_SLAVE_CHECK(send_get_state() == STATE_IDLE, SDIO_SLAVE_CHECK(send_get_state() == STATE_IDLE,
@ -1019,7 +1019,7 @@ static esp_err_t send_flush_data()
} }
//clear counter but keep data //clear counter but keep data
static esp_err_t send_reset_counter() static esp_err_t send_reset_counter(void)
{ {
SDIO_SLAVE_CHECK(send_get_state() == STATE_IDLE, SDIO_SLAVE_CHECK(send_get_state() == STATE_IDLE,
"reset counter when transmission started", ESP_ERR_INVALID_STATE); "reset counter when transmission started", ESP_ERR_INVALID_STATE);
@ -1061,28 +1061,28 @@ static esp_err_t send_reset_counter()
#define CHECK_HANDLE_IDLE(desc) do { if (desc == NULL || !desc->not_receiving) {\ #define CHECK_HANDLE_IDLE(desc) do { if (desc == NULL || !desc->not_receiving) {\
return ESP_ERR_INVALID_ARG; } } while(0) return ESP_ERR_INVALID_ARG; } } while(0)
static inline void critical_enter_recv() static inline void critical_enter_recv(void)
{ {
portENTER_CRITICAL(&context.recv_spinlock); portENTER_CRITICAL(&context.recv_spinlock);
} }
static inline void critical_exit_recv() static inline void critical_exit_recv(void)
{ {
portEXIT_CRITICAL(&context.recv_spinlock); portEXIT_CRITICAL(&context.recv_spinlock);
} }
static inline void recv_size_inc() static inline void recv_size_inc(void)
{ {
// fields wdata and inc_more should be written by the same instruction. // fields wdata and inc_more should be written by the same instruction.
SLC.slc0_token1.val = FIELD_TO_VALUE2(SLC_SLC0_TOKEN1_WDATA, 1) | FIELD_TO_VALUE2(SLC_SLC0_TOKEN1_INC_MORE, 1); SLC.slc0_token1.val = FIELD_TO_VALUE2(SLC_SLC0_TOKEN1_WDATA, 1) | FIELD_TO_VALUE2(SLC_SLC0_TOKEN1_INC_MORE, 1);
} }
static inline void recv_size_reset() static inline void recv_size_reset(void)
{ {
SLC.slc0_token1.val = FIELD_TO_VALUE2(SLC_SLC0_TOKEN1_WDATA, 0) | FIELD_TO_VALUE2(SLC_SLC0_TOKEN1_WR, 1); SLC.slc0_token1.val = FIELD_TO_VALUE2(SLC_SLC0_TOKEN1_WDATA, 0) | FIELD_TO_VALUE2(SLC_SLC0_TOKEN1_WR, 1);
} }
static inline buf_desc_t* recv_get_first_empty_buf() static inline buf_desc_t* recv_get_first_empty_buf(void)
{ {
buf_stailq_t *const queue = &context.recv_link_list; buf_stailq_t *const queue = &context.recv_link_list;
buf_desc_t *desc = STAILQ_FIRST(queue); buf_desc_t *desc = STAILQ_FIRST(queue);
@ -1092,7 +1092,7 @@ static inline buf_desc_t* recv_get_first_empty_buf()
return desc; return desc;
} }
static esp_err_t recv_start() static esp_err_t recv_start(void)
{ {
SLC.conf0.slc0_tx_rst = 1; SLC.conf0.slc0_tx_rst = 1;
SLC.conf0.slc0_tx_rst = 0; SLC.conf0.slc0_tx_rst = 0;
@ -1113,14 +1113,14 @@ static esp_err_t recv_start()
return ESP_OK; return ESP_OK;
} }
static void recv_stop() static void recv_stop(void)
{ {
SLC.slc0_tx_link.stop = 1; SLC.slc0_tx_link.stop = 1;
SLC.slc0_int_ena.tx_done = 0; SLC.slc0_int_ena.tx_done = 0;
} }
// reset the counter, but keep the data // reset the counter, but keep the data
static void recv_reset_counter() static void recv_reset_counter(void)
{ {
recv_size_reset(); recv_size_reset();
@ -1135,7 +1135,7 @@ static void recv_reset_counter()
} }
// remove data, still increase the counter // remove data, still increase the counter
static void recv_flush_data() static void recv_flush_data(void)
{ {
buf_stailq_t *const queue = &context.recv_link_list; buf_stailq_t *const queue = &context.recv_link_list;
@ -1276,7 +1276,7 @@ uint8_t* sdio_slave_recv_get_buf(sdio_slave_buf_handle_t handle, size_t *len_o)
return desc->buf; return desc->buf;
} }
static void __attribute((unused)) sdio_slave_recv_get_loaded_buffer_num() static void __attribute((unused)) sdio_slave_recv_get_loaded_buffer_num(void)
{ {
buf_stailq_t *const queue = &context.recv_link_list; buf_stailq_t *const queue = &context.recv_link_list;
dump_queue(queue); dump_queue(queue);

View file

@ -30,7 +30,7 @@
static void sdmmc_isr(void* arg); static void sdmmc_isr(void* arg);
static void sdmmc_host_dma_init(); static void sdmmc_host_dma_init(void);
static const char* TAG = "sdmmc_periph"; static const char* TAG = "sdmmc_periph";
@ -40,7 +40,7 @@ static SemaphoreHandle_t s_io_intr_event;
size_t s_slot_width[2] = {1,1}; size_t s_slot_width[2] = {1,1};
void sdmmc_host_reset() void sdmmc_host_reset(void)
{ {
// Set reset bits // Set reset bits
SDMMC.ctrl.controller_reset = 1; SDMMC.ctrl.controller_reset = 1;
@ -97,7 +97,7 @@ static void sdmmc_host_set_clk_div(int div)
ets_delay_us(10); ets_delay_us(10);
} }
static void sdmmc_host_input_clk_disable() static void sdmmc_host_input_clk_disable(void)
{ {
SDMMC.clock.val = 0; SDMMC.clock.val = 0;
} }
@ -216,7 +216,7 @@ esp_err_t sdmmc_host_start_command(int slot, sdmmc_hw_cmd_t cmd, uint32_t arg) {
return ESP_OK; return ESP_OK;
} }
esp_err_t sdmmc_host_init() esp_err_t sdmmc_host_init(void)
{ {
if (s_intr_handle) { if (s_intr_handle) {
return ESP_ERR_INVALID_STATE; return ESP_ERR_INVALID_STATE;
@ -402,7 +402,7 @@ esp_err_t sdmmc_host_init_slot(int slot, const sdmmc_slot_config_t* slot_config)
return ESP_OK; return ESP_OK;
} }
esp_err_t sdmmc_host_deinit() esp_err_t sdmmc_host_deinit(void)
{ {
if (!s_intr_handle) { if (!s_intr_handle) {
return ESP_ERR_INVALID_STATE; return ESP_ERR_INVALID_STATE;
@ -490,7 +490,7 @@ esp_err_t sdmmc_host_set_bus_ddr_mode(int slot, bool ddr_enabled)
return ESP_OK; return ESP_OK;
} }
static void sdmmc_host_dma_init() static void sdmmc_host_dma_init(void)
{ {
SDMMC.ctrl.dma_enable = 1; SDMMC.ctrl.dma_enable = 1;
SDMMC.bmod.val = 0; SDMMC.bmod.val = 0;
@ -501,7 +501,7 @@ static void sdmmc_host_dma_init()
} }
void sdmmc_host_dma_stop() void sdmmc_host_dma_stop(void)
{ {
SDMMC.ctrl.use_internal_dma = 0; SDMMC.ctrl.use_internal_dma = 0;
SDMMC.ctrl.dma_reset = 1; SDMMC.ctrl.dma_reset = 1;
@ -524,12 +524,12 @@ void sdmmc_host_dma_prepare(sdmmc_desc_t* desc, size_t block_size, size_t data_s
sdmmc_host_dma_resume(); sdmmc_host_dma_resume();
} }
void sdmmc_host_dma_resume() void sdmmc_host_dma_resume(void)
{ {
SDMMC.pldmnd = 1; SDMMC.pldmnd = 1;
} }
bool sdmmc_host_card_busy() bool sdmmc_host_card_busy(void)
{ {
return SDMMC.status.data_busy == 1; return SDMMC.status.data_busy == 1;
} }

View file

@ -26,7 +26,7 @@ typedef struct {
uint32_t dma_status; ///< masked DMA interrupt status uint32_t dma_status; ///< masked DMA interrupt status
} sdmmc_event_t; } sdmmc_event_t;
void sdmmc_host_reset(); void sdmmc_host_reset(void);
esp_err_t sdmmc_host_start_command(int slot, sdmmc_hw_cmd_t cmd, uint32_t arg); esp_err_t sdmmc_host_start_command(int slot, sdmmc_hw_cmd_t cmd, uint32_t arg);
@ -34,13 +34,13 @@ esp_err_t sdmmc_host_wait_for_event(int tick_count, sdmmc_event_t* out_event);
void sdmmc_host_dma_prepare(sdmmc_desc_t* desc, size_t block_size, size_t data_size); void sdmmc_host_dma_prepare(sdmmc_desc_t* desc, size_t block_size, size_t data_size);
void sdmmc_host_dma_stop(); void sdmmc_host_dma_stop(void);
void sdmmc_host_dma_resume(); void sdmmc_host_dma_resume(void);
bool sdmmc_host_card_busy(); bool sdmmc_host_card_busy(void);
esp_err_t sdmmc_host_transaction_handler_init(); esp_err_t sdmmc_host_transaction_handler_init(void);
void sdmmc_host_transaction_handler_deinit(); void sdmmc_host_transaction_handler_deinit(void);

View file

@ -72,7 +72,7 @@ static bool s_is_app_cmd; // This flag is set if the next command is an APP co
static esp_pm_lock_handle_t s_pm_lock; static esp_pm_lock_handle_t s_pm_lock;
#endif #endif
static esp_err_t handle_idle_state_events(); static esp_err_t handle_idle_state_events(void);
static sdmmc_hw_cmd_t make_hw_cmd(sdmmc_command_t* cmd); static sdmmc_hw_cmd_t make_hw_cmd(sdmmc_command_t* cmd);
static esp_err_t handle_event(sdmmc_command_t* cmd, sdmmc_req_state_t* state, static esp_err_t handle_event(sdmmc_command_t* cmd, sdmmc_req_state_t* state,
sdmmc_event_t* unhandled_events); sdmmc_event_t* unhandled_events);
@ -80,10 +80,10 @@ static esp_err_t process_events(sdmmc_event_t evt, sdmmc_command_t* cmd,
sdmmc_req_state_t* pstate, sdmmc_event_t* unhandled_events); sdmmc_req_state_t* pstate, sdmmc_event_t* unhandled_events);
static void process_command_response(uint32_t status, sdmmc_command_t* cmd); static void process_command_response(uint32_t status, sdmmc_command_t* cmd);
static void fill_dma_descriptors(size_t num_desc); static void fill_dma_descriptors(size_t num_desc);
static size_t get_free_descriptors_count(); static size_t get_free_descriptors_count(void);
static bool wait_for_busy_cleared(int timeout_ms); static bool wait_for_busy_cleared(int timeout_ms);
esp_err_t sdmmc_host_transaction_handler_init() esp_err_t sdmmc_host_transaction_handler_init(void)
{ {
assert(s_request_mutex == NULL); assert(s_request_mutex == NULL);
s_request_mutex = xSemaphoreCreateMutex(); s_request_mutex = xSemaphoreCreateMutex();
@ -102,7 +102,7 @@ esp_err_t sdmmc_host_transaction_handler_init()
return ESP_OK; return ESP_OK;
} }
void sdmmc_host_transaction_handler_deinit() void sdmmc_host_transaction_handler_deinit(void)
{ {
assert(s_request_mutex); assert(s_request_mutex);
#ifdef CONFIG_PM_ENABLE #ifdef CONFIG_PM_ENABLE
@ -182,7 +182,7 @@ out:
return ret; return ret;
} }
static size_t get_free_descriptors_count() static size_t get_free_descriptors_count(void)
{ {
const size_t next = s_cur_transfer.next_desc; const size_t next = s_cur_transfer.next_desc;
size_t count = 0; size_t count = 0;
@ -234,7 +234,7 @@ static void fill_dma_descriptors(size_t num_desc)
} }
} }
static esp_err_t handle_idle_state_events() static esp_err_t handle_idle_state_events(void)
{ {
/* Handle any events which have happened in between transfers. /* Handle any events which have happened in between transfers.
* Under current assumptions (no SDIO support) only card detect events * Under current assumptions (no SDIO support) only card detect events

View file

@ -225,12 +225,12 @@ static esp_err_t init_spi_dev(int slot, int clock_speed_hz)
return spi_bus_add_device((spi_host_device_t) slot, &devcfg, &s_slots[slot].handle); return spi_bus_add_device((spi_host_device_t) slot, &devcfg, &s_slots[slot].handle);
} }
esp_err_t sdspi_host_init() esp_err_t sdspi_host_init(void)
{ {
return ESP_OK; return ESP_OK;
} }
esp_err_t sdspi_host_deinit() esp_err_t sdspi_host_deinit(void)
{ {
for (size_t i = 0; i < sizeof(s_slots)/sizeof(s_slots[0]); ++i) { for (size_t i = 0; i < sizeof(s_slots)/sizeof(s_slots[0]); ++i) {
if (s_slots[i].handle) { if (s_slots[i].handle) {

View file

@ -394,7 +394,7 @@ bool IRAM_ATTR spicommon_dmaworkaround_req_reset(int dmachan, dmaworkaround_cb_t
return ret; return ret;
} }
bool IRAM_ATTR spicommon_dmaworkaround_reset_in_progress() bool IRAM_ATTR spicommon_dmaworkaround_reset_in_progress(void)
{ {
return (dmaworkaround_waiting_for_chan != 0); return (dmaworkaround_waiting_for_chan != 0);
} }

View file

@ -75,7 +75,7 @@ static void disp_buf(uint8_t *buf, int len)
printf("\n"); printf("\n");
} }
static i2c_config_t i2c_master_init() static i2c_config_t i2c_master_init(void)
{ {
i2c_config_t conf_master = { i2c_config_t conf_master = {
.mode = I2C_MODE_MASTER, .mode = I2C_MODE_MASTER,
@ -88,7 +88,7 @@ static i2c_config_t i2c_master_init()
return conf_master; return conf_master;
} }
static i2c_config_t i2c_slave_init() static i2c_config_t i2c_slave_init(void)
{ {
i2c_config_t conf_slave = { i2c_config_t conf_slave = {
.mode = I2C_MODE_SLAVE, .mode = I2C_MODE_SLAVE,
@ -252,7 +252,7 @@ TEST_CASE("I2C driver memory leaking check", "[i2c]")
TEST_ASSERT_INT_WITHIN(100, size, esp_get_free_heap_size()); TEST_ASSERT_INT_WITHIN(100, size, esp_get_free_heap_size());
} }
static void i2c_master_write_test() static void i2c_master_write_test(void)
{ {
uint8_t *data_wr = (uint8_t *) malloc(DATA_LENGTH); uint8_t *data_wr = (uint8_t *) malloc(DATA_LENGTH);
int i; int i;
@ -276,7 +276,7 @@ static void i2c_master_write_test()
TEST_ESP_OK(i2c_driver_delete(I2C_MASTER_NUM)); TEST_ESP_OK(i2c_driver_delete(I2C_MASTER_NUM));
} }
static void i2c_slave_read_test() static void i2c_slave_read_test(void)
{ {
uint8_t *data_rd = (uint8_t *) malloc(DATA_LENGTH); uint8_t *data_rd = (uint8_t *) malloc(DATA_LENGTH);
int size_rd = 0; int size_rd = 0;
@ -308,7 +308,7 @@ static void i2c_slave_read_test()
TEST_CASE_MULTIPLE_DEVICES("I2C master write slave test", "[i2c][test_env=UT_T2_I2C][timeout=150]", i2c_master_write_test, i2c_slave_read_test); TEST_CASE_MULTIPLE_DEVICES("I2C master write slave test", "[i2c][test_env=UT_T2_I2C][timeout=150]", i2c_master_write_test, i2c_slave_read_test);
static void master_read_slave_test() static void master_read_slave_test(void)
{ {
uint8_t *data_rd = (uint8_t *) malloc(DATA_LENGTH); uint8_t *data_rd = (uint8_t *) malloc(DATA_LENGTH);
memset(data_rd, 0, DATA_LENGTH); memset(data_rd, 0, DATA_LENGTH);
@ -340,7 +340,7 @@ static void master_read_slave_test()
i2c_driver_delete(I2C_MASTER_NUM); i2c_driver_delete(I2C_MASTER_NUM);
} }
static void slave_write_buffer_test() static void slave_write_buffer_test(void)
{ {
uint8_t *data_wr = (uint8_t *) malloc(DATA_LENGTH); uint8_t *data_wr = (uint8_t *) malloc(DATA_LENGTH);
int size_rd; int size_rd;
@ -367,7 +367,7 @@ static void slave_write_buffer_test()
TEST_CASE_MULTIPLE_DEVICES("I2C master read slave test", "[i2c][test_env=UT_T2_I2C][timeout=150]", master_read_slave_test, slave_write_buffer_test); TEST_CASE_MULTIPLE_DEVICES("I2C master read slave test", "[i2c][test_env=UT_T2_I2C][timeout=150]", master_read_slave_test, slave_write_buffer_test);
static void i2c_master_write_read_test() static void i2c_master_write_read_test(void)
{ {
uint8_t *data_rd = (uint8_t *) malloc(DATA_LENGTH); uint8_t *data_rd = (uint8_t *) malloc(DATA_LENGTH);
memset(data_rd, 0, DATA_LENGTH); memset(data_rd, 0, DATA_LENGTH);
@ -409,7 +409,7 @@ static void i2c_master_write_read_test()
i2c_driver_delete(I2C_MASTER_NUM); i2c_driver_delete(I2C_MASTER_NUM);
} }
static void i2c_slave_read_write_test() static void i2c_slave_read_write_test(void)
{ {
uint8_t *data_rd = (uint8_t *) malloc(DATA_LENGTH); uint8_t *data_rd = (uint8_t *) malloc(DATA_LENGTH);
memset(data_rd, 0, DATA_LENGTH); memset(data_rd, 0, DATA_LENGTH);
@ -445,7 +445,7 @@ static void i2c_slave_read_write_test()
TEST_CASE_MULTIPLE_DEVICES("I2C read and write test", "[i2c][test_env=UT_T2_I2C][timeout=150]", i2c_master_write_read_test, i2c_slave_read_write_test); TEST_CASE_MULTIPLE_DEVICES("I2C read and write test", "[i2c][test_env=UT_T2_I2C][timeout=150]", i2c_master_write_read_test, i2c_slave_read_write_test);
static void i2c_master_repeat_write() static void i2c_master_repeat_write(void)
{ {
uint8_t *data_wr = (uint8_t *) malloc(DATA_LENGTH); uint8_t *data_wr = (uint8_t *) malloc(DATA_LENGTH);
int times = 3; int times = 3;
@ -471,7 +471,7 @@ static void i2c_master_repeat_write()
i2c_driver_delete(I2C_MASTER_NUM); i2c_driver_delete(I2C_MASTER_NUM);
} }
static void i2c_slave_repeat_read() static void i2c_slave_repeat_read(void)
{ {
int size_rd = 0; int size_rd = 0;
int times = 3; int times = 3;

View file

@ -262,7 +262,7 @@ static int get_rx_data(RingbufHandle_t rb)
/** /**
* @brief RMT transmitter initialization * @brief RMT transmitter initialization
*/ */
static void tx_init() static void tx_init(void)
{ {
// the sender once it send something, its frq is 38kHz, and the duty cycle is 50% // the sender once it send something, its frq is 38kHz, and the duty cycle is 50%
rmt_tx_config_t tx_cfg = { rmt_tx_config_t tx_cfg = {
@ -289,7 +289,7 @@ static void tx_init()
/** /**
* @brief RMT receiver initialization * @brief RMT receiver initialization
*/ */
static void rx_init() static void rx_init(void)
{ {
rmt_rx_config_t rx_cfg = { rmt_rx_config_t rx_cfg = {
.filter_en = true, .filter_en = true,

View file

@ -154,7 +154,7 @@ void test_sio_master_round(bool test_mosi)
master_free_device_bus(spi); master_free_device_bus(spi);
} }
void test_sio_master() void test_sio_master(void)
{ {
test_sio_master_round(true); test_sio_master_round(true);
unity_send_signal("master ready"); unity_send_signal("master ready");
@ -210,7 +210,7 @@ void test_sio_slave_round(bool test_mosi)
spi_slave_free(TEST_SLAVE_HOST); spi_slave_free(TEST_SLAVE_HOST);
} }
void test_sio_slave() void test_sio_slave(void)
{ {
test_sio_slave_round(true); test_sio_slave_round(true);
unity_wait_for_signal("master ready"); unity_wait_for_signal("master ready");

View file

@ -51,7 +51,7 @@ static void master_init_nodma( spi_device_handle_t* spi)
TEST_ASSERT(ret==ESP_OK); TEST_ASSERT(ret==ESP_OK);
} }
static void slave_init() static void slave_init(void)
{ {
//Configuration for the SPI bus //Configuration for the SPI bus
spi_bus_config_t buscfg={ spi_bus_config_t buscfg={

View file

@ -127,7 +127,7 @@ static void all_timer_init(timer_config_t config, bool flag)
} }
// start all of timer // start all of timer
static void all_timer_start() static void all_timer_start(void)
{ {
esp_err_t ret; esp_err_t ret;
ret = timer_start(TIMER_GROUP_0, TIMER_0); ret = timer_start(TIMER_GROUP_0, TIMER_0);
@ -153,7 +153,7 @@ static void all_timer_set_counter_value(uint64_t set_timer_val)
TEST_ASSERT(ret == ESP_OK); TEST_ASSERT(ret == ESP_OK);
} }
static void all_timer_pause() static void all_timer_pause(void)
{ {
esp_err_t ret; esp_err_t ret;
ret = timer_pause(TIMER_GROUP_0, TIMER_0); ret = timer_pause(TIMER_GROUP_0, TIMER_0);

Some files were not shown because too many files have changed in this diff Show more