after merge fixes

add void

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;

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);
 

lib/subghz/blocks/custom_btn.c

@@ -15,37 +15,37 @@ 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;
 }
 
 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;
 }
 
 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;
 }
 
 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;
 }

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
 }

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);

lib/subghz/protocols/alutech_at_4n.c

@@ -323,7 +323,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.
@@ -701,7 +701,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;

lib/subghz/protocols/came_atomo.c

@@ -78,7 +78,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);
@@ -614,7 +614,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;

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;

lib/subghz/protocols/faac_slh.h

@@ -110,4 +110,4 @@ void subghz_protocol_decoder_faac_slh_get_string(void* context, FuriString* outp
 
 // Reset prog mode vars
 // TODO: Remake in proper way
-void faac_slh_reset_prog_mode();
+void faac_slh_reset_prog_mode(void);

lib/subghz/protocols/nice_flor_s.c

@@ -122,7 +122,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.
@@ -751,7 +751,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;

lib/subghz/protocols/secplus_v2.c

@@ -380,7 +380,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
@@ -834,7 +834,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;

lib/subghz/protocols/somfy_telis.c

@@ -102,7 +102,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,
@@ -668,7 +668,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;

targets/f7/furi_hal/furi_hal_subghz.c

@@ -81,7 +81,7 @@ void furi_hal_subghz_set_ext_power_amp(bool enabled) {
     furi_hal_subghz.ext_power_amp = enabled;
 }
 
-bool furi_hal_subghz_get_ext_power_amp() {
+bool furi_hal_subghz_get_ext_power_amp(void) {
     return furi_hal_subghz.ext_power_amp;
 }
 

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
 }