From 82a07888f58e094c869ee6d3410cd7497b375604 Mon Sep 17 00:00:00 2001 From: Willy-JL <49810075+Willy-JL@users.noreply.github.com> Date: Tue, 2 Apr 2024 16:05:03 +0100 Subject: [PATCH] Fix function prototypes after merge --- applications/main/archive/helpers/archive_favorites.c | 2 +- applications/main/archive/helpers/archive_favorites.h | 2 +- applications/main/subghz/helpers/subghz_gps.h | 2 +- applications/system/ir_remote/infrared_remote.c | 2 +- applications/system/ir_remote/infrared_remote.h | 2 +- applications/system/ir_remote/infrared_remote_button.c | 2 +- applications/system/ir_remote/infrared_remote_button.h | 2 +- applications/system/ir_remote/infrared_signal.c | 2 +- applications/system/ir_remote/infrared_signal.h | 2 +- .../system/subghz_remote/helpers/subrem_presets.c | 2 +- .../system/subghz_remote/helpers/subrem_presets.h | 2 +- .../system/subghz_remote/helpers/txrx/subghz_txrx.c | 2 +- .../system/subghz_remote/helpers/txrx/subghz_txrx.h | 2 +- applications/system/subghz_remote/views/edit_menu.c | 2 +- applications/system/subghz_remote/views/edit_menu.h | 2 +- applications/system/subghz_remote/views/remote.c | 2 +- applications/system/subghz_remote/views/remote.h | 2 +- furi/core/timer.c | 2 +- furi/core/timer.h | 2 +- lib/drivers/SK6805.c | 6 +++--- lib/drivers/SK6805.h | 6 +++--- lib/drivers/rgb_backlight.c | 10 +++++----- lib/drivers/rgb_backlight.h | 10 +++++----- lib/momentum/assets.c | 4 ++-- lib/momentum/momentum.h | 8 ++++---- lib/momentum/namespoof.c | 2 +- lib/momentum/namespoof.h | 2 +- lib/momentum/settings.c | 4 ++-- lib/nfc/protocols/emv/emv.c | 2 +- lib/nfc/protocols/emv/emv.h | 2 +- lib/subghz/blocks/custom_btn.c | 10 +++++----- lib/subghz/blocks/custom_btn.h | 8 ++++---- lib/subghz/blocks/custom_btn_i.h | 2 +- lib/subghz/protocols/alutech_at_4n.c | 4 ++-- lib/subghz/protocols/came_atomo.c | 4 ++-- lib/subghz/protocols/faac_slh.c | 2 +- lib/subghz/protocols/nice_flor_s.c | 4 ++-- lib/subghz/protocols/public_api.h | 2 +- lib/subghz/protocols/secplus_v2.c | 4 ++-- lib/subghz/protocols/somfy_telis.c | 4 ++-- targets/f7/furi_hal/furi_hal_subghz.h | 2 +- targets/furi_hal_include/furi_hal_usb.h | 2 +- 42 files changed, 71 insertions(+), 71 deletions(-) diff --git a/applications/main/archive/helpers/archive_favorites.c b/applications/main/archive/helpers/archive_favorites.c index 9fb3154c9..464e2e032 100644 --- a/applications/main/archive/helpers/archive_favorites.c +++ b/applications/main/archive/helpers/archive_favorites.c @@ -46,7 +46,7 @@ static bool archive_favorites_read_line(File* file, FuriString* str_result) { return result; } -uint16_t archive_favorites_count() { +uint16_t archive_favorites_count(void) { Storage* fs_api = furi_record_open(RECORD_STORAGE); File* file = storage_file_alloc(fs_api); diff --git a/applications/main/archive/helpers/archive_favorites.h b/applications/main/archive/helpers/archive_favorites.h index 308355899..81cc646f1 100644 --- a/applications/main/archive/helpers/archive_favorites.h +++ b/applications/main/archive/helpers/archive_favorites.h @@ -5,7 +5,7 @@ #define ARCHIVE_FAV_PATH ANY_PATH("favorites.txt") #define ARCHIVE_FAV_TEMP_PATH ANY_PATH("favorites.tmp") -uint16_t archive_favorites_count(); +uint16_t archive_favorites_count(void); bool archive_favorites_read(void* context); bool archive_favorites_delete(const char* format, ...) _ATTRIBUTE((__format__(__printf__, 1, 2))); bool archive_is_favorite(const char* format, ...) _ATTRIBUTE((__format__(__printf__, 1, 2))); diff --git a/applications/main/subghz/helpers/subghz_gps.h b/applications/main/subghz/helpers/subghz_gps.h index 402fd0214..2eba92739 100644 --- a/applications/main/subghz/helpers/subghz_gps.h +++ b/applications/main/subghz/helpers/subghz_gps.h @@ -49,7 +49,7 @@ struct SubGhzGPS { * * @return SubGhzGPS* SubGhzGPS object */ -SubGhzGPS* subghz_gps_plugin_init(); +SubGhzGPS* subghz_gps_plugin_init(uint32_t baudrate); /** * Deinitialize SubGhzGPS plugin diff --git a/applications/system/ir_remote/infrared_remote.c b/applications/system/ir_remote/infrared_remote.c index 3a528a656..033df2d4e 100644 --- a/applications/system/ir_remote/infrared_remote.c +++ b/applications/system/ir_remote/infrared_remote.c @@ -27,7 +27,7 @@ static void infrared_remote_clear_buttons(InfraredRemote* remote) { InfraredButtonArray_reset(remote->buttons); } -InfraredRemote* infrared_remote_alloc() { +InfraredRemote* infrared_remote_alloc(void) { InfraredRemote* remote = malloc(sizeof(InfraredRemote)); InfraredButtonArray_init(remote->buttons); remote->name = furi_string_alloc(); diff --git a/applications/system/ir_remote/infrared_remote.h b/applications/system/ir_remote/infrared_remote.h index 00ca2e107..fe3dc851a 100644 --- a/applications/system/ir_remote/infrared_remote.h +++ b/applications/system/ir_remote/infrared_remote.h @@ -8,7 +8,7 @@ typedef struct InfraredRemote InfraredRemote; -InfraredRemote* infrared_remote_alloc(); +InfraredRemote* infrared_remote_alloc(void); void infrared_remote_free(InfraredRemote* remote); void infrared_remote_reset(InfraredRemote* remote); diff --git a/applications/system/ir_remote/infrared_remote_button.c b/applications/system/ir_remote/infrared_remote_button.c index 1f6315ec5..510c9da12 100644 --- a/applications/system/ir_remote/infrared_remote_button.c +++ b/applications/system/ir_remote/infrared_remote_button.c @@ -7,7 +7,7 @@ struct InfraredRemoteButton { InfraredSignal* signal; }; -InfraredRemoteButton* infrared_remote_button_alloc() { +InfraredRemoteButton* infrared_remote_button_alloc(void) { InfraredRemoteButton* button = malloc(sizeof(InfraredRemoteButton)); button->name = furi_string_alloc(); button->signal = infrared_signal_alloc(); diff --git a/applications/system/ir_remote/infrared_remote_button.h b/applications/system/ir_remote/infrared_remote_button.h index f25b759b5..1b9b65188 100644 --- a/applications/system/ir_remote/infrared_remote_button.h +++ b/applications/system/ir_remote/infrared_remote_button.h @@ -4,7 +4,7 @@ typedef struct InfraredRemoteButton InfraredRemoteButton; -InfraredRemoteButton* infrared_remote_button_alloc(); +InfraredRemoteButton* infrared_remote_button_alloc(void); void infrared_remote_button_free(InfraredRemoteButton* button); void infrared_remote_button_set_name(InfraredRemoteButton* button, const char* name); diff --git a/applications/system/ir_remote/infrared_signal.c b/applications/system/ir_remote/infrared_signal.c index 0c7e3d3bf..3c0944ea7 100644 --- a/applications/system/ir_remote/infrared_signal.c +++ b/applications/system/ir_remote/infrared_signal.c @@ -166,7 +166,7 @@ static bool infrared_signal_read_body(InfraredSignal* signal, FlipperFormat* ff) return success; } -InfraredSignal* infrared_signal_alloc() { +InfraredSignal* infrared_signal_alloc(void) { InfraredSignal* signal = malloc(sizeof(InfraredSignal)); signal->is_raw = false; diff --git a/applications/system/ir_remote/infrared_signal.h b/applications/system/ir_remote/infrared_signal.h index 637d859b0..e0ef355d9 100644 --- a/applications/system/ir_remote/infrared_signal.h +++ b/applications/system/ir_remote/infrared_signal.h @@ -16,7 +16,7 @@ typedef struct { float duty_cycle; } InfraredRawSignal; -InfraredSignal* infrared_signal_alloc(); +InfraredSignal* infrared_signal_alloc(void); void infrared_signal_free(InfraredSignal* signal); bool infrared_signal_is_raw(InfraredSignal* signal); diff --git a/applications/system/subghz_remote/helpers/subrem_presets.c b/applications/system/subghz_remote/helpers/subrem_presets.c index 818fe183d..b0ce1932d 100644 --- a/applications/system/subghz_remote/helpers/subrem_presets.c +++ b/applications/system/subghz_remote/helpers/subrem_presets.c @@ -2,7 +2,7 @@ #define TAG "SubRemPresets" -SubRemSubFilePreset* subrem_sub_file_preset_alloc() { +SubRemSubFilePreset* subrem_sub_file_preset_alloc(void) { SubRemSubFilePreset* sub_preset = malloc(sizeof(SubRemSubFilePreset)); sub_preset->fff_data = flipper_format_string_alloc(); diff --git a/applications/system/subghz_remote/helpers/subrem_presets.h b/applications/system/subghz_remote/helpers/subrem_presets.h index d66181b90..b9f9e7cbb 100644 --- a/applications/system/subghz_remote/helpers/subrem_presets.h +++ b/applications/system/subghz_remote/helpers/subrem_presets.h @@ -27,7 +27,7 @@ typedef struct { SubRemSubFilePreset* subs_preset[SubRemSubKeyNameMaxCount]; } SubRemMapPreset; -SubRemSubFilePreset* subrem_sub_file_preset_alloc(); +SubRemSubFilePreset* subrem_sub_file_preset_alloc(void); void subrem_sub_file_preset_free(SubRemSubFilePreset* sub_preset); diff --git a/applications/system/subghz_remote/helpers/txrx/subghz_txrx.c b/applications/system/subghz_remote/helpers/txrx/subghz_txrx.c index a1f53c2e8..a9b382847 100644 --- a/applications/system/subghz_remote/helpers/txrx/subghz_txrx.c +++ b/applications/system/subghz_remote/helpers/txrx/subghz_txrx.c @@ -25,7 +25,7 @@ static void subghz_txrx_radio_device_power_off(SubGhzTxRx* instance) { if(furi_hal_power_is_otg_enabled()) furi_hal_power_disable_otg(); } -SubGhzTxRx* subghz_txrx_alloc() { +SubGhzTxRx* subghz_txrx_alloc(void) { SubGhzTxRx* instance = malloc(sizeof(SubGhzTxRx)); instance->setting = subghz_setting_alloc(); subghz_setting_load(instance->setting, EXT_PATH("subghz/assets/setting_user")); diff --git a/applications/system/subghz_remote/helpers/txrx/subghz_txrx.h b/applications/system/subghz_remote/helpers/txrx/subghz_txrx.h index 93c4a2276..8a96c54c3 100644 --- a/applications/system/subghz_remote/helpers/txrx/subghz_txrx.h +++ b/applications/system/subghz_remote/helpers/txrx/subghz_txrx.h @@ -53,7 +53,7 @@ typedef enum { * * @return SubGhzTxRx* pointer to SubGhzTxRx */ -SubGhzTxRx* subghz_txrx_alloc(); +SubGhzTxRx* subghz_txrx_alloc(void); /** * Free SubGhzTxRx diff --git a/applications/system/subghz_remote/views/edit_menu.c b/applications/system/subghz_remote/views/edit_menu.c index 6dd590ed0..91d826f03 100644 --- a/applications/system/subghz_remote/views/edit_menu.c +++ b/applications/system/subghz_remote/views/edit_menu.c @@ -242,7 +242,7 @@ void subrem_view_edit_menu_exit(void* context) { furi_assert(context); } -SubRemViewEditMenu* subrem_view_edit_menu_alloc() { +SubRemViewEditMenu* subrem_view_edit_menu_alloc(void) { SubRemViewEditMenu* subrem_view_edit_menu = malloc(sizeof(SubRemViewEditMenu)); // View allocation and configuration diff --git a/applications/system/subghz_remote/views/edit_menu.h b/applications/system/subghz_remote/views/edit_menu.h index 7ceb7fac0..12d33e8ba 100644 --- a/applications/system/subghz_remote/views/edit_menu.h +++ b/applications/system/subghz_remote/views/edit_menu.h @@ -13,7 +13,7 @@ void subrem_view_edit_menu_set_callback( SubRemViewEditMenuCallback callback, void* context); -SubRemViewEditMenu* subrem_view_edit_menu_alloc(); +SubRemViewEditMenu* subrem_view_edit_menu_alloc(void); void subrem_view_edit_menu_free(SubRemViewEditMenu* subrem_view_edit_menu); diff --git a/applications/system/subghz_remote/views/remote.c b/applications/system/subghz_remote/views/remote.c index 0774d3875..ca6df70a3 100644 --- a/applications/system/subghz_remote/views/remote.c +++ b/applications/system/subghz_remote/views/remote.c @@ -277,7 +277,7 @@ void subrem_view_remote_exit(void* context) { furi_assert(context); } -SubRemViewRemote* subrem_view_remote_alloc() { +SubRemViewRemote* subrem_view_remote_alloc(void) { SubRemViewRemote* subrem_view_remote = malloc(sizeof(SubRemViewRemote)); // View allocation and configuration diff --git a/applications/system/subghz_remote/views/remote.h b/applications/system/subghz_remote/views/remote.h index 39f9a007d..505140298 100644 --- a/applications/system/subghz_remote/views/remote.h +++ b/applications/system/subghz_remote/views/remote.h @@ -20,7 +20,7 @@ void subrem_view_remote_set_callback( SubRemViewRemoteCallback callback, void* context); -SubRemViewRemote* subrem_view_remote_alloc(); +SubRemViewRemote* subrem_view_remote_alloc(void); void subrem_view_remote_free(SubRemViewRemote* subrem_view_remote); diff --git a/furi/core/timer.c b/furi/core/timer.c index e9cbc555e..815004a9b 100644 --- a/furi/core/timer.c +++ b/furi/core/timer.c @@ -14,7 +14,7 @@ typedef struct { void* context; } TimerCallback_t; -const char* furi_timer_get_current_name() { +const char* furi_timer_get_current_name(void) { return current_timer_name; } diff --git a/furi/core/timer.h b/furi/core/timer.h index 4a8d3b09e..e90896929 100644 --- a/furi/core/timer.h +++ b/furi/core/timer.h @@ -105,7 +105,7 @@ void furi_timer_set_thread_priority(FuriTimerThreadPriority priority); * * @return The pointer to the timer name, or NULL */ -const char* furi_timer_get_current_name(); +const char* furi_timer_get_current_name(void); #ifdef __cplusplus } diff --git a/lib/drivers/SK6805.c b/lib/drivers/SK6805.c index 63178cfd2..cbf9eded6 100644 --- a/lib/drivers/SK6805.c +++ b/lib/drivers/SK6805.c @@ -39,13 +39,13 @@ static const GpioPin led_pin = {.port = GPIOA, .pin = LL_GPIO_PIN_8}; static uint8_t led_buffer[SK6805_LED_COUNT][3]; -void SK6805_init() { +void SK6805_init(void) { DEBUG_INIT(); furi_hal_gpio_write(SK6805_LED_PIN, false); furi_hal_gpio_init(SK6805_LED_PIN, GpioModeOutputPushPull, GpioPullNo, GpioSpeedVeryHigh); } -uint8_t SK6805_get_led_count() { +uint8_t SK6805_get_led_count(void) { return (const uint8_t)SK6805_LED_COUNT; } void SK6805_set_led_color(uint8_t led_index, uint8_t r, uint8_t g, uint8_t b) { @@ -57,7 +57,7 @@ void SK6805_set_led_color(uint8_t led_index, uint8_t r, uint8_t g, uint8_t b) { led_buffer[led_index][2] = b; } -void SK6805_update() { +void SK6805_update(void) { FURI_LOG_T(TAG, "update"); SK6805_init(); FURI_CRITICAL_ENTER(); diff --git a/lib/drivers/SK6805.h b/lib/drivers/SK6805.h index 4cbe0072f..ed0dcdb36 100644 --- a/lib/drivers/SK6805.h +++ b/lib/drivers/SK6805.h @@ -26,14 +26,14 @@ /** * @brief Инициализация линии управления подсветкой */ -void SK6805_init(); +void SK6805_init(void); /** * @brief Получить количество светодиодов в подсветке * * @return Количество светодиодов */ -uint8_t SK6805_get_led_count(); +uint8_t SK6805_get_led_count(void); /** * @brief Установить цвет свечения светодиода @@ -48,6 +48,6 @@ void SK6805_set_led_color(uint8_t led_index, uint8_t r, uint8_t g, uint8_t b); /** * @brief Обновление состояния подсветки дисплея */ -void SK6805_update(); +void SK6805_update(void); #endif /* SK6805_H_ */ diff --git a/lib/drivers/rgb_backlight.c b/lib/drivers/rgb_backlight.c index 0da1761fb..56ccb5f33 100644 --- a/lib/drivers/rgb_backlight.c +++ b/lib/drivers/rgb_backlight.c @@ -83,7 +83,7 @@ void rgb_backlight_load_settings(bool enabled) { rgb_backlight_reconfigure(rgb_state.enabled); } -void rgb_backlight_save_settings() { +void rgb_backlight_save_settings(void) { if(!rgb_state.settings_loaded) return; furi_check(furi_mutex_acquire(rgb_state.mutex, FuriWaitForever) == FuriStatusOk); @@ -132,7 +132,7 @@ void rgb_backlight_set_rainbow_mode(RGBBacklightRainbowMode rainbow_mode) { furi_check(furi_mutex_release(rgb_state.mutex) == FuriStatusOk); } -RGBBacklightRainbowMode rgb_backlight_get_rainbow_mode() { +RGBBacklightRainbowMode rgb_backlight_get_rainbow_mode(void) { if(!rgb_state.settings_loaded) return 0; furi_check(furi_mutex_acquire(rgb_state.mutex, FuriWaitForever) == FuriStatusOk); @@ -151,7 +151,7 @@ void rgb_backlight_set_rainbow_speed(uint8_t rainbow_speed) { furi_check(furi_mutex_release(rgb_state.mutex) == FuriStatusOk); } -uint8_t rgb_backlight_get_rainbow_speed() { +uint8_t rgb_backlight_get_rainbow_speed(void) { if(!rgb_state.settings_loaded) return 0; furi_check(furi_mutex_acquire(rgb_state.mutex, FuriWaitForever) == FuriStatusOk); @@ -173,7 +173,7 @@ void rgb_backlight_set_rainbow_interval(uint32_t rainbow_interval) { furi_check(furi_mutex_release(rgb_state.mutex) == FuriStatusOk); } -uint32_t rgb_backlight_get_rainbow_interval() { +uint32_t rgb_backlight_get_rainbow_interval(void) { if(!rgb_state.settings_loaded) return 0; furi_check(furi_mutex_acquire(rgb_state.mutex, FuriWaitForever) == FuriStatusOk); @@ -193,7 +193,7 @@ void rgb_backlight_set_rainbow_saturation(uint8_t rainbow_saturation) { furi_check(furi_mutex_release(rgb_state.mutex) == FuriStatusOk); } -uint8_t rgb_backlight_get_rainbow_saturation() { +uint8_t rgb_backlight_get_rainbow_saturation(void) { if(!rgb_state.settings_loaded) return 0; furi_check(furi_mutex_acquire(rgb_state.mutex, FuriWaitForever) == FuriStatusOk); diff --git a/lib/drivers/rgb_backlight.h b/lib/drivers/rgb_backlight.h index e82c25c46..38b4f79ef 100644 --- a/lib/drivers/rgb_backlight.h +++ b/lib/drivers/rgb_backlight.h @@ -42,7 +42,7 @@ void rgb_backlight_load_settings(bool enabled); /** * @brief Save Current RGB Lighting Settings */ -void rgb_backlight_save_settings(); +void rgb_backlight_save_settings(void); /** * @brief Change the color of the backlight @@ -61,7 +61,7 @@ void rgb_backlight_get_color(uint8_t index, RgbColor* color); */ void rgb_backlight_set_rainbow_mode(RGBBacklightRainbowMode rainbow_mode); -RGBBacklightRainbowMode rgb_backlight_get_rainbow_mode(); +RGBBacklightRainbowMode rgb_backlight_get_rainbow_mode(void); /** * @brief Change rainbow speed @@ -70,7 +70,7 @@ RGBBacklightRainbowMode rgb_backlight_get_rainbow_mode(); */ void rgb_backlight_set_rainbow_speed(uint8_t rainbow_speed); -uint8_t rgb_backlight_get_rainbow_speed(); +uint8_t rgb_backlight_get_rainbow_speed(void); /** * @brief Change rainbow interval @@ -79,7 +79,7 @@ uint8_t rgb_backlight_get_rainbow_speed(); */ void rgb_backlight_set_rainbow_interval(uint32_t rainbow_interval); -uint32_t rgb_backlight_get_rainbow_interval(); +uint32_t rgb_backlight_get_rainbow_interval(void); /** * @brief Change rainbow saturation @@ -88,7 +88,7 @@ uint32_t rgb_backlight_get_rainbow_interval(); */ void rgb_backlight_set_rainbow_saturation(uint8_t rainbow_saturation); -uint8_t rgb_backlight_get_rainbow_saturation(); +uint8_t rgb_backlight_get_rainbow_saturation(void); /** * @brief Reconfigure rgb backlight with new settings diff --git a/lib/momentum/assets.c b/lib/momentum/assets.c index f17104780..8f67fcded 100644 --- a/lib/momentum/assets.c +++ b/lib/momentum/assets.c @@ -148,7 +148,7 @@ static const char* font_names[] = { [FontBatteryPercent] = "BatteryPercent", }; -void asset_packs_init() { +void asset_packs_init(void) { const char* pack = momentum_settings.asset_pack; if(pack[0] == '\0') return; @@ -180,7 +180,7 @@ void asset_packs_init() { furi_record_close(RECORD_STORAGE); } -void asset_packs_free() { +void asset_packs_free(void) { for(size_t i = 0; i < ICON_PATHS_COUNT; i++) { if(ICON_PATHS[i].icon->original != NULL) { free_icon(ICON_PATHS[i].icon); diff --git a/lib/momentum/momentum.h b/lib/momentum/momentum.h index c3d43f43b..b5eeec02f 100644 --- a/lib/momentum/momentum.h +++ b/lib/momentum/momentum.h @@ -96,12 +96,12 @@ typedef struct { CanvasFontParameters* font_params[FontTotalNumber]; } AssetPacks; -void momentum_settings_load(); -void momentum_settings_save(); +void momentum_settings_load(void); +void momentum_settings_save(void); extern MomentumSettings momentum_settings; -void asset_packs_init(); -void asset_packs_free(); +void asset_packs_init(void); +void asset_packs_free(void); extern AssetPacks asset_packs; #ifdef __cplusplus diff --git a/lib/momentum/namespoof.c b/lib/momentum/namespoof.c index 92bf044e9..7798a19fb 100644 --- a/lib/momentum/namespoof.c +++ b/lib/momentum/namespoof.c @@ -4,7 +4,7 @@ #define TAG "NameSpoof" -void namespoof_init() { +void namespoof_init(void) { FuriString* str = furi_string_alloc(); Storage* storage = furi_record_open(RECORD_STORAGE); FlipperFormat* file = flipper_format_file_alloc(storage); diff --git a/lib/momentum/namespoof.h b/lib/momentum/namespoof.h index bb4c2bf14..70d3ed9fe 100644 --- a/lib/momentum/namespoof.h +++ b/lib/momentum/namespoof.h @@ -4,4 +4,4 @@ #define NAMESPOOF_VERSION 1 #define NAMESPOOF_PATH EXT_PATH("dolphin/name.txt") -void namespoof_init(); +void namespoof_init(void); diff --git a/lib/momentum/settings.c b/lib/momentum/settings.c index 209f6bc4a..367fd51c9 100644 --- a/lib/momentum/settings.c +++ b/lib/momentum/settings.c @@ -114,7 +114,7 @@ static const struct { {setting_uint(vgm_color_bg, 0x0000, 0xFFFF)}, }; -void momentum_settings_load() { +void momentum_settings_load(void) { Storage* storage = furi_record_open(RECORD_STORAGE); FlipperFormat* file = flipper_format_file_alloc(storage); if(flipper_format_file_open_existing(file, MOMENTUM_SETTINGS_PATH)) { @@ -159,7 +159,7 @@ void momentum_settings_load() { rgb_backlight_load_settings(momentum_settings.rgb_backlight); } -void momentum_settings_save() { +void momentum_settings_save(void) { Storage* storage = furi_record_open(RECORD_STORAGE); FlipperFormat* file = flipper_format_file_alloc(storage); diff --git a/lib/nfc/protocols/emv/emv.c b/lib/nfc/protocols/emv/emv.c index af208ea10..cfdad3c6e 100644 --- a/lib/nfc/protocols/emv/emv.c +++ b/lib/nfc/protocols/emv/emv.c @@ -25,7 +25,7 @@ const NfcDeviceBase nfc_device_emv = { .get_base_data = (NfcDeviceGetBaseData)emv_get_base_data, }; -EmvData* emv_alloc() { +EmvData* emv_alloc(void) { EmvData* data = malloc(sizeof(EmvData)); data->iso14443_4a_data = iso14443_4a_alloc(); data->emv_application.pin_try_counter = 0xff; diff --git a/lib/nfc/protocols/emv/emv.h b/lib/nfc/protocols/emv/emv.h index e09eacaa4..638e93ddc 100644 --- a/lib/nfc/protocols/emv/emv.h +++ b/lib/nfc/protocols/emv/emv.h @@ -119,7 +119,7 @@ extern const NfcDeviceBase nfc_device_emv; // Virtual methods -EmvData* emv_alloc(); +EmvData* emv_alloc(void); void emv_free(EmvData* data); diff --git a/lib/subghz/blocks/custom_btn.c b/lib/subghz/blocks/custom_btn.c index e33f79887..6a185c37b 100644 --- a/lib/subghz/blocks/custom_btn.c +++ b/lib/subghz/blocks/custom_btn.c @@ -15,7 +15,7 @@ bool subghz_custom_btn_set(uint8_t btn_id) { } } -uint8_t subghz_custom_btn_get() { +uint8_t subghz_custom_btn_get(void) { return custom_btn_id; } @@ -23,7 +23,7 @@ void subghz_custom_btn_set_original(uint8_t btn_code) { custom_btn_original = btn_code; } -uint8_t subghz_custom_btn_get_original() { +uint8_t subghz_custom_btn_get_original(void) { return custom_btn_original; } @@ -31,14 +31,14 @@ void subghz_custom_btn_set_max(uint8_t b) { custom_btn_max_btns = b; } -void subghz_custom_btns_reset() { +void subghz_custom_btns_reset(void) { custom_btn_original = 0; custom_btn_max_btns = 0; controller_programming_mode = PROG_MODE_OFF; custom_btn_id = SUBGHZ_CUSTOM_BTN_OK; } -bool subghz_custom_btn_is_allowed() { +bool subghz_custom_btn_is_allowed(void) { return custom_btn_max_btns != 0; } @@ -46,6 +46,6 @@ void subghz_custom_btn_set_prog_mode(ProgMode prog_mode) { controller_programming_mode = prog_mode; } -ProgMode subghz_custom_btn_get_prog_mode() { +ProgMode subghz_custom_btn_get_prog_mode(void) { return controller_programming_mode; } diff --git a/lib/subghz/blocks/custom_btn.h b/lib/subghz/blocks/custom_btn.h index bae811120..49b66b61c 100644 --- a/lib/subghz/blocks/custom_btn.h +++ b/lib/subghz/blocks/custom_btn.h @@ -17,13 +17,13 @@ extern "C" { bool subghz_custom_btn_set(uint8_t btn_id); -uint8_t subghz_custom_btn_get(); +uint8_t subghz_custom_btn_get(void); -uint8_t subghz_custom_btn_get_original(); +uint8_t subghz_custom_btn_get_original(void); -void subghz_custom_btns_reset(); +void subghz_custom_btns_reset(void); -bool subghz_custom_btn_is_allowed(); +bool subghz_custom_btn_is_allowed(void); #ifdef __cplusplus } diff --git a/lib/subghz/blocks/custom_btn_i.h b/lib/subghz/blocks/custom_btn_i.h index aafcc82da..b800d7079 100644 --- a/lib/subghz/blocks/custom_btn_i.h +++ b/lib/subghz/blocks/custom_btn_i.h @@ -15,4 +15,4 @@ void subghz_custom_btn_set_max(uint8_t b); void subghz_custom_btn_set_prog_mode(ProgMode prog_mode); -ProgMode subghz_custom_btn_get_prog_mode(); +ProgMode subghz_custom_btn_get_prog_mode(void); diff --git a/lib/subghz/protocols/alutech_at_4n.c b/lib/subghz/protocols/alutech_at_4n.c index 5b7976ad9..8ddd8902a 100644 --- a/lib/subghz/protocols/alutech_at_4n.c +++ b/lib/subghz/protocols/alutech_at_4n.c @@ -324,7 +324,7 @@ bool subghz_protocol_alutech_at_4n_create_data( * Basic set | 0x11 | 0x22 | 0xFF | 0x44 | 0x33 | * @return Button code */ -static uint8_t subghz_protocol_alutech_at_4n_get_btn_code(); +static uint8_t subghz_protocol_alutech_at_4n_get_btn_code(void); /** * Generating an upload from data. @@ -702,7 +702,7 @@ SubGhzProtocolStatus subghz_protocol_decoder_alutech_at_4n_deserialize( return ret; } -static uint8_t subghz_protocol_alutech_at_4n_get_btn_code() { +static uint8_t subghz_protocol_alutech_at_4n_get_btn_code(void) { uint8_t custom_btn_id = subghz_custom_btn_get(); uint8_t original_btn_code = subghz_custom_btn_get_original(); uint8_t btn = original_btn_code; diff --git a/lib/subghz/protocols/came_atomo.c b/lib/subghz/protocols/came_atomo.c index c1d332131..d7eaac809 100644 --- a/lib/subghz/protocols/came_atomo.c +++ b/lib/subghz/protocols/came_atomo.c @@ -79,7 +79,7 @@ static void subghz_protocol_came_atomo_remote_controller(SubGhzBlockGeneric* ins * Basic set | 0x0 | 0x2 | 0x4 | 0x6 | * @return Button code */ -static uint8_t subghz_protocol_came_atomo_get_btn_code(); +static uint8_t subghz_protocol_came_atomo_get_btn_code(void); void* subghz_protocol_encoder_came_atomo_alloc(SubGhzEnvironment* environment) { UNUSED(environment); @@ -615,7 +615,7 @@ void atomo_decrypt(uint8_t* buff) { } } -static uint8_t subghz_protocol_came_atomo_get_btn_code() { +static uint8_t subghz_protocol_came_atomo_get_btn_code(void) { uint8_t custom_btn_id = subghz_custom_btn_get(); uint8_t original_btn_code = subghz_custom_btn_get_original(); uint8_t btn = original_btn_code; diff --git a/lib/subghz/protocols/faac_slh.c b/lib/subghz/protocols/faac_slh.c index 51f82fe8d..9a20a665d 100644 --- a/lib/subghz/protocols/faac_slh.c +++ b/lib/subghz/protocols/faac_slh.c @@ -24,7 +24,7 @@ static uint32_t temp_counter_backup = 0; static bool faac_prog_mode = false; static bool allow_zero_seed = false; -void faac_slh_reset_prog_mode() { +void faac_slh_reset_prog_mode(void) { temp_fix_backup = 0; temp_counter_backup = 0; faac_prog_mode = false; diff --git a/lib/subghz/protocols/nice_flor_s.c b/lib/subghz/protocols/nice_flor_s.c index 8ce944dff..2c8a3560f 100644 --- a/lib/subghz/protocols/nice_flor_s.c +++ b/lib/subghz/protocols/nice_flor_s.c @@ -125,7 +125,7 @@ static void subghz_protocol_nice_one_get_data(uint8_t* p, uint8_t num_parcel, ui * Basic set | 0x1 | 0x2 | 0x4 | 0x8 | * @return Button code */ -static uint8_t subghz_protocol_nice_flor_s_get_btn_code(); +static uint8_t subghz_protocol_nice_flor_s_get_btn_code(void); /** * Generating an upload from data. @@ -754,7 +754,7 @@ SubGhzProtocolStatus return ret; } -static uint8_t subghz_protocol_nice_flor_s_get_btn_code() { +static uint8_t subghz_protocol_nice_flor_s_get_btn_code(void) { uint8_t custom_btn_id = subghz_custom_btn_get(); uint8_t original_btn_code = subghz_custom_btn_get_original(); uint8_t btn = original_btn_code; diff --git a/lib/subghz/protocols/public_api.h b/lib/subghz/protocols/public_api.h index 37f3521f4..2951d0a56 100644 --- a/lib/subghz/protocols/public_api.h +++ b/lib/subghz/protocols/public_api.h @@ -214,7 +214,7 @@ bool subghz_protocol_secplus_v1_check_fixed(uint32_t fixed); // Reset prog mode vars // TODO: Remake in proper way -void faac_slh_reset_prog_mode(); +void faac_slh_reset_prog_mode(void); #ifdef __cplusplus } diff --git a/lib/subghz/protocols/secplus_v2.c b/lib/subghz/protocols/secplus_v2.c index 8edf89636..865385c0b 100644 --- a/lib/subghz/protocols/secplus_v2.c +++ b/lib/subghz/protocols/secplus_v2.c @@ -381,7 +381,7 @@ static uint64_t subghz_protocol_secplus_v2_encode_half(uint8_t roll_array[], uin * Basic set | 0x68 | 0x80 | 0x81 | 0xE2 | 0x78 * @return Button code */ -static uint8_t subghz_protocol_secplus_v2_get_btn_code(); +static uint8_t subghz_protocol_secplus_v2_get_btn_code(void); /** * Security+ 2.0 message encoding @@ -835,7 +835,7 @@ SubGhzProtocolStatus return ret; } -static uint8_t subghz_protocol_secplus_v2_get_btn_code() { +static uint8_t subghz_protocol_secplus_v2_get_btn_code(void) { uint8_t custom_btn_id = subghz_custom_btn_get(); uint8_t original_btn_code = subghz_custom_btn_get_original(); uint8_t btn = original_btn_code; diff --git a/lib/subghz/protocols/somfy_telis.c b/lib/subghz/protocols/somfy_telis.c index 421a3ac87..e4324778f 100644 --- a/lib/subghz/protocols/somfy_telis.c +++ b/lib/subghz/protocols/somfy_telis.c @@ -103,7 +103,7 @@ void subghz_protocol_encoder_somfy_telis_free(void* context) { * Basic set | 0x1 | 0x2 | 0x4 | 0x8 | * @return Button code */ -static uint8_t subghz_protocol_somfy_telis_get_btn_code(); +static uint8_t subghz_protocol_somfy_telis_get_btn_code(void); static bool subghz_protocol_somfy_telis_gen_data( SubGhzProtocolEncoderSomfyTelis* instance, @@ -669,7 +669,7 @@ SubGhzProtocolStatus subghz_protocol_somfy_telis_const.min_count_bit_for_found); } -static uint8_t subghz_protocol_somfy_telis_get_btn_code() { +static uint8_t subghz_protocol_somfy_telis_get_btn_code(void) { uint8_t custom_btn_id = subghz_custom_btn_get(); uint8_t original_btn_code = subghz_custom_btn_get_original(); uint8_t btn = original_btn_code; diff --git a/targets/f7/furi_hal/furi_hal_subghz.h b/targets/f7/furi_hal/furi_hal_subghz.h index 864368120..68c040928 100644 --- a/targets/f7/furi_hal/furi_hal_subghz.h +++ b/targets/f7/furi_hal/furi_hal_subghz.h @@ -285,7 +285,7 @@ void furi_hal_subghz_stop_async_tx(void); // External CC1101 Ebytes power amplifier control void furi_hal_subghz_set_ext_power_amp(bool enabled); -bool furi_hal_subghz_get_ext_power_amp(); +bool furi_hal_subghz_get_ext_power_amp(void); #ifdef __cplusplus } diff --git a/targets/furi_hal_include/furi_hal_usb.h b/targets/furi_hal_include/furi_hal_usb.h index 78f4d3b96..fbde57c50 100644 --- a/targets/furi_hal_include/furi_hal_usb.h +++ b/targets/furi_hal_include/furi_hal_usb.h @@ -61,7 +61,7 @@ FuriHalUsbInterface* furi_hal_usb_get_config(void); * * @return current USB device context */ -void* furi_hal_usb_get_config_context(); +void* furi_hal_usb_get_config_context(void); /** Lock USB device mode switch */