diff --git a/applications/services/cli/cli.c b/applications/services/cli/cli.c index 28ba417c2..c2a0b9cb1 100644 --- a/applications/services/cli/cli.c +++ b/applications/services/cli/cli.c @@ -424,7 +424,7 @@ void cli_delete_command(Cli* cli, const char* name) { furi_string_free(name_str); } -void cli_session_open(Cli* cli, void* session) { +void cli_session_open(Cli* cli, const void* session) { furi_check(cli); furi_check(furi_mutex_acquire(cli->mutex, FuriWaitForever) == FuriStatusOk); diff --git a/applications/services/cli/cli.h b/applications/services/cli/cli.h index bb84670a7..fe8f09032 100644 --- a/applications/services/cli/cli.h +++ b/applications/services/cli/cli.h @@ -123,7 +123,7 @@ char cli_getc(Cli* cli); */ void cli_nl(Cli* cli); -void cli_session_open(Cli* cli, void* session); +void cli_session_open(Cli* cli, const void* session); void cli_session_close(Cli* cli); diff --git a/applications/services/cli/cli_i.h b/applications/services/cli/cli_i.h index d7351b9ff..ca126dacd 100644 --- a/applications/services/cli/cli_i.h +++ b/applications/services/cli/cli_i.h @@ -50,7 +50,7 @@ struct Cli { FuriSemaphore* idle_sem; FuriString* last_line; FuriString* line; - CliSession* session; + const CliSession* session; size_t cursor_position; }; diff --git a/applications/services/cli/cli_vcp.c b/applications/services/cli/cli_vcp.c index aa399e78a..39802bd79 100644 --- a/applications/services/cli/cli_vcp.c +++ b/applications/services/cli/cli_vcp.c @@ -312,7 +312,7 @@ static bool cli_vcp_is_connected(void) { return vcp->connected; } -CliSession cli_vcp = { +const CliSession cli_vcp = { cli_vcp_init, cli_vcp_deinit, cli_vcp_rx, diff --git a/applications/services/cli/cli_vcp.h b/applications/services/cli/cli_vcp.h index 3aef2ef70..f51625342 100644 --- a/applications/services/cli/cli_vcp.h +++ b/applications/services/cli/cli_vcp.h @@ -11,7 +11,7 @@ extern "C" { typedef struct CliSession CliSession; -extern CliSession cli_vcp; +extern const CliSession cli_vcp; #ifdef __cplusplus } diff --git a/lib/ibutton/protocols/dallas/protocol_group_dallas_defs.c b/lib/ibutton/protocols/dallas/protocol_group_dallas_defs.c index b4dd51ce7..df758283b 100644 --- a/lib/ibutton/protocols/dallas/protocol_group_dallas_defs.c +++ b/lib/ibutton/protocols/dallas/protocol_group_dallas_defs.c @@ -6,7 +6,7 @@ #include "protocol_ds1971.h" #include "protocol_ds_generic.h" -const iButtonProtocolDallasBase* ibutton_protocols_dallas[] = { +const iButtonProtocolDallasBase* const ibutton_protocols_dallas[] = { [iButtonProtocolDS1990] = &ibutton_protocol_ds1990, [iButtonProtocolDS1992] = &ibutton_protocol_ds1992, [iButtonProtocolDS1996] = &ibutton_protocol_ds1996, diff --git a/lib/ibutton/protocols/dallas/protocol_group_dallas_defs.h b/lib/ibutton/protocols/dallas/protocol_group_dallas_defs.h index 2ba1dd39a..71571d91b 100644 --- a/lib/ibutton/protocols/dallas/protocol_group_dallas_defs.h +++ b/lib/ibutton/protocols/dallas/protocol_group_dallas_defs.h @@ -14,4 +14,4 @@ typedef enum { iButtonProtocolDSMax, } iButtonProtocolDallas; -extern const iButtonProtocolDallasBase* ibutton_protocols_dallas[]; +extern const iButtonProtocolDallasBase* const ibutton_protocols_dallas[]; diff --git a/lib/ibutton/protocols/misc/protocol_group_misc_defs.c b/lib/ibutton/protocols/misc/protocol_group_misc_defs.c index 09ae0bdc7..f8cae0463 100644 --- a/lib/ibutton/protocols/misc/protocol_group_misc_defs.c +++ b/lib/ibutton/protocols/misc/protocol_group_misc_defs.c @@ -3,7 +3,7 @@ #include "protocol_cyfral.h" #include "protocol_metakom.h" -const ProtocolBase* ibutton_protocols_misc[] = { +const ProtocolBase* const ibutton_protocols_misc[] = { [iButtonProtocolMiscCyfral] = &ibutton_protocol_misc_cyfral, [iButtonProtocolMiscMetakom] = &ibutton_protocol_misc_metakom, /* Add new misc protocols here */ diff --git a/lib/ibutton/protocols/misc/protocol_group_misc_defs.h b/lib/ibutton/protocols/misc/protocol_group_misc_defs.h index 0a7f92847..cde6b0aa9 100644 --- a/lib/ibutton/protocols/misc/protocol_group_misc_defs.h +++ b/lib/ibutton/protocols/misc/protocol_group_misc_defs.h @@ -8,4 +8,4 @@ typedef enum { iButtonProtocolMiscMax, } iButtonProtocolMisc; -extern const ProtocolBase* ibutton_protocols_misc[]; +extern const ProtocolBase* const ibutton_protocols_misc[]; diff --git a/lib/ibutton/protocols/protocol_group_defs.c b/lib/ibutton/protocols/protocol_group_defs.c index 40a360f0e..ac428f410 100644 --- a/lib/ibutton/protocols/protocol_group_defs.c +++ b/lib/ibutton/protocols/protocol_group_defs.c @@ -3,7 +3,7 @@ #include "dallas/protocol_group_dallas.h" #include "misc/protocol_group_misc.h" -const iButtonProtocolGroupBase* ibutton_protocol_groups[] = { +const iButtonProtocolGroupBase* const ibutton_protocol_groups[] = { [iButtonProtocolGroupDallas] = &ibutton_protocol_group_dallas, [iButtonProtocolGroupMisc] = &ibutton_protocol_group_misc, }; diff --git a/lib/ibutton/protocols/protocol_group_defs.h b/lib/ibutton/protocols/protocol_group_defs.h index 2d41e3cb8..2c00dfab4 100644 --- a/lib/ibutton/protocols/protocol_group_defs.h +++ b/lib/ibutton/protocols/protocol_group_defs.h @@ -8,4 +8,4 @@ typedef enum { iButtonProtocolGroupMax } iButtonProtocolGroup; -extern const iButtonProtocolGroupBase* ibutton_protocol_groups[]; +extern const iButtonProtocolGroupBase* const ibutton_protocol_groups[]; diff --git a/lib/lfrfid/protocols/lfrfid_protocols.c b/lib/lfrfid/protocols/lfrfid_protocols.c index 238f8e0cd..c6cc57a68 100644 --- a/lib/lfrfid/protocols/lfrfid_protocols.c +++ b/lib/lfrfid/protocols/lfrfid_protocols.c @@ -22,7 +22,7 @@ #include "protocol_gproxii.h" #include "protocol_noralsy.h" -const ProtocolBase* lfrfid_protocols[] = { +const ProtocolBase* const lfrfid_protocols[] = { [LFRFIDProtocolEM4100] = &protocol_em4100, [LFRFIDProtocolEM410032] = &protocol_em4100_32, [LFRFIDProtocolEM410016] = &protocol_em4100_16, diff --git a/lib/lfrfid/protocols/lfrfid_protocols.h b/lib/lfrfid/protocols/lfrfid_protocols.h index 86c31c60b..a33e87990 100644 --- a/lib/lfrfid/protocols/lfrfid_protocols.h +++ b/lib/lfrfid/protocols/lfrfid_protocols.h @@ -37,7 +37,7 @@ typedef enum { LFRFIDProtocolMax, } LFRFIDProtocol; -extern const ProtocolBase* lfrfid_protocols[]; +extern const ProtocolBase* const lfrfid_protocols[]; typedef enum { LFRFIDWriteTypeT5577, diff --git a/lib/lfrfid/protocols/protocol_nexwatch.c b/lib/lfrfid/protocols/protocol_nexwatch.c index a794a4a8e..08324803f 100644 --- a/lib/lfrfid/protocols/protocol_nexwatch.c +++ b/lib/lfrfid/protocols/protocol_nexwatch.c @@ -21,7 +21,7 @@ typedef struct { uint8_t chk; } ProtocolNexwatchMagic; -ProtocolNexwatchMagic magic_items[] = { +static ProtocolNexwatchMagic magic_items[] = { {0xBE, "Quadrakey", 0}, {0x88, "Nexkey", 0}, {0x86, "Honeywell", 0}}; diff --git a/lib/nfc/protocols/mf_classic/mf_classic_listener.c b/lib/nfc/protocols/mf_classic/mf_classic_listener.c index ef571117a..1f5eea271 100644 --- a/lib/nfc/protocols/mf_classic/mf_classic_listener.c +++ b/lib/nfc/protocols/mf_classic/mf_classic_listener.c @@ -19,7 +19,7 @@ typedef struct { uint8_t cmd_start_byte; size_t cmd_len_bits; size_t command_num; - MfClassicListenerCommandHandler* handler; + const MfClassicListenerCommandHandler* handler; } MfClassicListenerCmd; static void mf_classic_listener_prepare_emulation(MfClassicListener* instance) { @@ -441,42 +441,42 @@ static MfClassicListenerCommand return command; } -static MfClassicListenerCommandHandler mf_classic_listener_halt_handlers[] = { +static const MfClassicListenerCommandHandler mf_classic_listener_halt_handlers[] = { mf_classic_listener_halt_handler, }; -static MfClassicListenerCommandHandler mf_classic_listener_auth_key_a_handlers[] = { +static const MfClassicListenerCommandHandler mf_classic_listener_auth_key_a_handlers[] = { mf_classic_listener_auth_key_a_handler, mf_classic_listener_auth_second_part_handler, }; -static MfClassicListenerCommandHandler mf_classic_listener_auth_key_b_handlers[] = { +static const MfClassicListenerCommandHandler mf_classic_listener_auth_key_b_handlers[] = { mf_classic_listener_auth_key_b_handler, mf_classic_listener_auth_second_part_handler, }; -static MfClassicListenerCommandHandler mf_classic_listener_read_block_handlers[] = { +static const MfClassicListenerCommandHandler mf_classic_listener_read_block_handlers[] = { mf_classic_listener_read_block_handler, }; -static MfClassicListenerCommandHandler mf_classic_listener_write_block_handlers[] = { +static const MfClassicListenerCommandHandler mf_classic_listener_write_block_handlers[] = { mf_classic_listener_write_block_first_part_handler, mf_classic_listener_write_block_second_part_handler, }; -static MfClassicListenerCommandHandler mf_classic_listener_value_dec_handlers[] = { +static const MfClassicListenerCommandHandler mf_classic_listener_value_dec_handlers[] = { mf_classic_listener_value_dec_handler, mf_classic_listener_value_data_receive_handler, mf_classic_listener_value_transfer_handler, }; -static MfClassicListenerCommandHandler mf_classic_listener_value_inc_handlers[] = { +static const MfClassicListenerCommandHandler mf_classic_listener_value_inc_handlers[] = { mf_classic_listener_value_inc_handler, mf_classic_listener_value_data_receive_handler, mf_classic_listener_value_transfer_handler, }; -static MfClassicListenerCommandHandler mf_classic_listener_value_restore_handlers[] = { +static const MfClassicListenerCommandHandler mf_classic_listener_value_restore_handlers[] = { mf_classic_listener_value_restore_handler, mf_classic_listener_value_data_receive_handler, mf_classic_listener_value_transfer_handler, diff --git a/lib/nfc/protocols/nfc_device_defs.c b/lib/nfc/protocols/nfc_device_defs.c index 6a145445c..3f508a1fb 100644 --- a/lib/nfc/protocols/nfc_device_defs.c +++ b/lib/nfc/protocols/nfc_device_defs.c @@ -31,7 +31,7 @@ * When implementing a new protocol, add its implementation * here under its own index defined in nfc_protocol.h. */ -const NfcDeviceBase* nfc_devices[NfcProtocolNum] = { +const NfcDeviceBase* const nfc_devices[NfcProtocolNum] = { [NfcProtocolIso14443_3a] = &nfc_device_iso14443_3a, [NfcProtocolIso14443_3b] = &nfc_device_iso14443_3b, [NfcProtocolIso14443_4a] = &nfc_device_iso14443_4a, diff --git a/lib/nfc/protocols/nfc_device_defs.h b/lib/nfc/protocols/nfc_device_defs.h index f5ba2563f..e5d2707fd 100644 --- a/lib/nfc/protocols/nfc_device_defs.h +++ b/lib/nfc/protocols/nfc_device_defs.h @@ -6,7 +6,7 @@ extern "C" { #endif -extern const NfcDeviceBase* nfc_devices[]; +extern const NfcDeviceBase* const nfc_devices[]; #ifdef __cplusplus } diff --git a/lib/nfc/protocols/nfc_listener_defs.c b/lib/nfc/protocols/nfc_listener_defs.c index 2a6167e9c..c27079f5a 100644 --- a/lib/nfc/protocols/nfc_listener_defs.c +++ b/lib/nfc/protocols/nfc_listener_defs.c @@ -8,7 +8,7 @@ #include #include -const NfcListenerBase* nfc_listeners_api[NfcProtocolNum] = { +const NfcListenerBase* const nfc_listeners_api[NfcProtocolNum] = { [NfcProtocolIso14443_3a] = &nfc_listener_iso14443_3a, [NfcProtocolIso14443_3b] = NULL, [NfcProtocolIso14443_4a] = &nfc_listener_iso14443_4a, diff --git a/lib/nfc/protocols/nfc_listener_defs.h b/lib/nfc/protocols/nfc_listener_defs.h index 4d88cc098..7bd4b49b0 100644 --- a/lib/nfc/protocols/nfc_listener_defs.h +++ b/lib/nfc/protocols/nfc_listener_defs.h @@ -7,7 +7,7 @@ extern "C" { #endif -extern const NfcListenerBase* nfc_listeners_api[NfcProtocolNum]; +extern const NfcListenerBase* const nfc_listeners_api[NfcProtocolNum]; #ifdef __cplusplus } diff --git a/lib/nfc/protocols/nfc_poller_defs.c b/lib/nfc/protocols/nfc_poller_defs.c index c007740b7..f3ad15e7d 100644 --- a/lib/nfc/protocols/nfc_poller_defs.c +++ b/lib/nfc/protocols/nfc_poller_defs.c @@ -13,7 +13,7 @@ #include #include -const NfcPollerBase* nfc_pollers_api[NfcProtocolNum] = { +const NfcPollerBase* const nfc_pollers_api[NfcProtocolNum] = { [NfcProtocolIso14443_3a] = &nfc_poller_iso14443_3a, [NfcProtocolIso14443_3b] = &nfc_poller_iso14443_3b, [NfcProtocolIso14443_4a] = &nfc_poller_iso14443_4a, diff --git a/lib/nfc/protocols/nfc_poller_defs.h b/lib/nfc/protocols/nfc_poller_defs.h index a406a5f08..0156cc8b2 100644 --- a/lib/nfc/protocols/nfc_poller_defs.h +++ b/lib/nfc/protocols/nfc_poller_defs.h @@ -7,7 +7,7 @@ extern "C" { #endif -extern const NfcPollerBase* nfc_pollers_api[NfcProtocolNum]; +extern const NfcPollerBase* const nfc_pollers_api[NfcProtocolNum]; #ifdef __cplusplus } diff --git a/lib/subghz/protocols/protocol_items.c b/lib/subghz/protocols/protocol_items.c index 0d9c2a088..d7a14cd1c 100644 --- a/lib/subghz/protocols/protocol_items.c +++ b/lib/subghz/protocols/protocol_items.c @@ -1,6 +1,6 @@ #include "protocol_items.h" // IWYU pragma: keep -const SubGhzProtocol* subghz_protocol_registry_items[] = { +const SubGhzProtocol* const subghz_protocol_registry_items[] = { &subghz_protocol_gate_tx, &subghz_protocol_keeloq, &subghz_protocol_star_line, diff --git a/lib/subghz/registry.h b/lib/subghz/registry.h index 8529c1097..8de376b16 100644 --- a/lib/subghz/registry.h +++ b/lib/subghz/registry.h @@ -12,7 +12,7 @@ typedef struct SubGhzProtocolRegistry SubGhzProtocolRegistry; typedef struct SubGhzProtocol SubGhzProtocol; struct SubGhzProtocolRegistry { - const SubGhzProtocol** items; + const SubGhzProtocol* const* items; const size_t size; }; diff --git a/lib/toolbox/protocols/protocol_dict.c b/lib/toolbox/protocols/protocol_dict.c index 5680be18d..5cc46d6eb 100644 --- a/lib/toolbox/protocols/protocol_dict.c +++ b/lib/toolbox/protocols/protocol_dict.c @@ -2,12 +2,12 @@ #include "protocol_dict.h" struct ProtocolDict { - const ProtocolBase** base; + const ProtocolBase* const* base; size_t count; void* data[]; }; -ProtocolDict* protocol_dict_alloc(const ProtocolBase** protocols, size_t count) { +ProtocolDict* protocol_dict_alloc(const ProtocolBase* const* protocols, size_t count) { furi_check(protocols); ProtocolDict* dict = malloc(sizeof(ProtocolDict) + (sizeof(void*) * count)); diff --git a/lib/toolbox/protocols/protocol_dict.h b/lib/toolbox/protocols/protocol_dict.h index 543b3ead2..a7e02a988 100644 --- a/lib/toolbox/protocols/protocol_dict.h +++ b/lib/toolbox/protocols/protocol_dict.h @@ -12,7 +12,7 @@ typedef int32_t ProtocolId; #define PROTOCOL_NO (-1) #define PROTOCOL_ALL_FEATURES (0xFFFFFFFF) -ProtocolDict* protocol_dict_alloc(const ProtocolBase** protocols, size_t protocol_count); +ProtocolDict* protocol_dict_alloc(const ProtocolBase* const* protocols, size_t protocol_count); void protocol_dict_free(ProtocolDict* dict); diff --git a/scripts/fbt/sdk/collector.py b/scripts/fbt/sdk/collector.py index 5615f105e..14653eb44 100644 --- a/scripts/fbt/sdk/collector.py +++ b/scripts/fbt/sdk/collector.py @@ -113,7 +113,7 @@ def stringify_descr(type_descr): # Hack if isinstance(type_descr.ptr_to, FunctionType): return stringify_descr(type_descr.ptr_to) - return f"{stringify_descr(type_descr.ptr_to)}*" + return f"{stringify_descr(type_descr.ptr_to)}*{' const' if type_descr.const else ''}" elif isinstance(type_descr, Type): return ( f"{'const ' if type_descr.const else ''}" diff --git a/targets/f18/api_symbols.csv b/targets/f18/api_symbols.csv index 3da638149..a95ba0f5e 100644 --- a/targets/f18/api_symbols.csv +++ b/targets/f18/api_symbols.csv @@ -1,5 +1,5 @@ entry,status,name,type,params -Version,+,82.0,, +Version,+,83.0,, Header,+,applications/services/bt/bt_service/bt.h,, Header,+,applications/services/bt/bt_service/bt_keys_storage.h,, Header,+,applications/services/cli/cli.h,, @@ -785,7 +785,7 @@ Function,+,cli_print_usage,void,"const char*, const char*, const char*" Function,+,cli_read,size_t,"Cli*, uint8_t*, size_t" Function,+,cli_read_timeout,size_t,"Cli*, uint8_t*, size_t, uint32_t" Function,+,cli_session_close,void,Cli* -Function,+,cli_session_open,void,"Cli*, void*" +Function,+,cli_session_open,void,"Cli*, const void*" Function,+,cli_write,void,"Cli*, const uint8_t*, size_t" Function,+,composite_api_resolver_add,void,"CompositeApiResolver*, const ElfApiInterface*" Function,+,composite_api_resolver_alloc,CompositeApiResolver*, @@ -1733,7 +1733,7 @@ Function,-,getchar,int, Function,-,getchar_unlocked,int, Function,-,getenv,char*,const char* Function,-,gets,char*,char* -Function,-,getsubopt,int,"char**, char**, char**" +Function,-,getsubopt,int,"char**, char* const*, char**" Function,-,getw,int,FILE* Function,+,gui_add_framebuffer_callback,void,"Gui*, GuiCanvasCommitCallback, void*" Function,+,gui_add_view_port,void,"Gui*, ViewPort*, GuiLayer" @@ -2361,19 +2361,19 @@ Function,-,pow,double,"double, double" Function,-,pow10,double,double Function,-,pow10f,float,float Function,+,power_enable_low_battery_level_notification,void,"Power*, _Bool" +Function,+,power_enable_otg,void,"Power*, _Bool" Function,+,power_get_info,void,"Power*, PowerInfo*" Function,+,power_get_pubsub,FuriPubSub*,Power* Function,+,power_is_battery_healthy,_Bool,Power* Function,+,power_is_otg_enabled,_Bool,Power* Function,+,power_off,void,Power* Function,+,power_reboot,void,"Power*, PowerBootMode" -Function,+,power_enable_otg,void,"Power*, _Bool" Function,+,powf,float,"float, float" Function,-,powl,long double,"long double, long double" Function,+,pretty_format_bytes_hex_canonical,void,"FuriString*, size_t, const char*, const uint8_t*, size_t" Function,-,printf,int,"const char*, ..." Function,+,property_value_out,void,"PropertyValueContext*, const char*, unsigned int, ..." -Function,+,protocol_dict_alloc,ProtocolDict*,"const ProtocolBase**, size_t" +Function,+,protocol_dict_alloc,ProtocolDict*,"const ProtocolBase* const*, size_t" Function,+,protocol_dict_decoders_feed,ProtocolId,"ProtocolDict*, _Bool, uint32_t" Function,+,protocol_dict_decoders_feed_by_feature,ProtocolId,"ProtocolDict*, uint32_t, _Bool, uint32_t" Function,+,protocol_dict_decoders_feed_by_id,ProtocolId,"ProtocolDict*, size_t, _Bool, uint32_t" @@ -2932,13 +2932,13 @@ Variable,-,__stdio_exit_handler,void (*)(), Variable,+,_ctype_,const char[], Variable,+,_impure_data,_reent, Variable,+,_impure_ptr,_reent*, -Variable,-,_sys_errlist,const char*[], +Variable,-,_sys_errlist,const char* const[], Variable,-,_sys_nerr,int, Variable,-,ble_profile_hid,const FuriHalBleProfileTemplate*, Variable,-,ble_profile_serial,const FuriHalBleProfileTemplate*, -Variable,+,cli_vcp,CliSession, +Variable,+,cli_vcp,const CliSession, Variable,+,compress_config_heatshrink_default,const CompressConfigHeatshrink, -Variable,+,firmware_api_interface,const ElfApiInterface*, +Variable,+,firmware_api_interface,const ElfApiInterface* const, Variable,+,furi_hal_i2c_bus_external,FuriHalI2cBus, Variable,+,furi_hal_i2c_bus_power,FuriHalI2cBus, Variable,+,furi_hal_i2c_handle_external,FuriHalI2cBusHandle, @@ -3208,5 +3208,5 @@ Variable,+,usb_ccid,FuriHalUsbInterface, Variable,+,usb_cdc_dual,FuriHalUsbInterface, Variable,+,usb_cdc_single,FuriHalUsbInterface, Variable,+,usb_hid,FuriHalUsbInterface, -Variable,+,usb_hid_u2f,FuriHalUsbInterface, +Variable,+,usb_hid_u2f,const FuriHalUsbInterface, Variable,+,usbd_devfs,const usbd_driver, diff --git a/targets/f7/api_symbols.csv b/targets/f7/api_symbols.csv index 9a87f08d4..b09803e40 100644 --- a/targets/f7/api_symbols.csv +++ b/targets/f7/api_symbols.csv @@ -1,5 +1,5 @@ entry,status,name,type,params -Version,+,82.0,, +Version,+,83.0,, Header,+,applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h,, Header,+,applications/services/bt/bt_service/bt.h,, Header,+,applications/services/bt/bt_service/bt_keys_storage.h,, @@ -862,7 +862,7 @@ Function,+,cli_print_usage,void,"const char*, const char*, const char*" Function,+,cli_read,size_t,"Cli*, uint8_t*, size_t" Function,+,cli_read_timeout,size_t,"Cli*, uint8_t*, size_t, uint32_t" Function,+,cli_session_close,void,Cli* -Function,+,cli_session_open,void,"Cli*, void*" +Function,+,cli_session_open,void,"Cli*, const void*" Function,+,cli_write,void,"Cli*, const uint8_t*, size_t" Function,+,composite_api_resolver_add,void,"CompositeApiResolver*, const ElfApiInterface*" Function,+,composite_api_resolver_alloc,CompositeApiResolver*, @@ -1953,7 +1953,7 @@ Function,-,getchar,int, Function,-,getchar_unlocked,int, Function,-,getenv,char*,const char* Function,-,gets,char*,char* -Function,-,getsubopt,int,"char**, char**, char**" +Function,-,getsubopt,int,"char**, char* const*, char**" Function,-,getw,int,FILE* Function,+,gui_add_framebuffer_callback,void,"Gui*, GuiCanvasCommitCallback, void*" Function,+,gui_add_view_port,void,"Gui*, ViewPort*, GuiLayer" @@ -2655,7 +2655,7 @@ Function,+,mf_ultralight_3des_decrypt,void,"mbedtls_des3_context*, const uint8_t Function,+,mf_ultralight_3des_encrypt,void,"mbedtls_des3_context*, const uint8_t*, const uint8_t*, const uint8_t*, const uint8_t, uint8_t*" Function,+,mf_ultralight_3des_get_key,const uint8_t*,const MfUltralightData* Function,+,mf_ultralight_3des_key_valid,_Bool,const MfUltralightData* -Function,+,mf_ultralight_3des_shift_data,void,uint8_t* +Function,+,mf_ultralight_3des_shift_data,void,uint8_t* const Function,+,mf_ultralight_alloc,MfUltralightData*, Function,+,mf_ultralight_copy,void,"MfUltralightData*, const MfUltralightData*" Function,+,mf_ultralight_detect_protocol,_Bool,const Iso14443_3aData* @@ -2998,19 +2998,19 @@ Function,-,pow,double,"double, double" Function,-,pow10,double,double Function,-,pow10f,float,float Function,+,power_enable_low_battery_level_notification,void,"Power*, _Bool" +Function,+,power_enable_otg,void,"Power*, _Bool" Function,+,power_get_info,void,"Power*, PowerInfo*" Function,+,power_get_pubsub,FuriPubSub*,Power* Function,+,power_is_battery_healthy,_Bool,Power* Function,+,power_is_otg_enabled,_Bool,Power* Function,+,power_off,void,Power* Function,+,power_reboot,void,"Power*, PowerBootMode" -Function,+,power_enable_otg,void,"Power*, _Bool" Function,+,powf,float,"float, float" Function,-,powl,long double,"long double, long double" Function,+,pretty_format_bytes_hex_canonical,void,"FuriString*, size_t, const char*, const uint8_t*, size_t" Function,-,printf,int,"const char*, ..." Function,+,property_value_out,void,"PropertyValueContext*, const char*, unsigned int, ..." -Function,+,protocol_dict_alloc,ProtocolDict*,"const ProtocolBase**, size_t" +Function,+,protocol_dict_alloc,ProtocolDict*,"const ProtocolBase* const*, size_t" Function,+,protocol_dict_decoders_feed,ProtocolId,"ProtocolDict*, _Bool, uint32_t" Function,+,protocol_dict_decoders_feed_by_feature,ProtocolId,"ProtocolDict*, uint32_t, _Bool, uint32_t" Function,+,protocol_dict_decoders_feed_by_id,ProtocolId,"ProtocolDict*, size_t, _Bool, uint32_t" @@ -3783,13 +3783,13 @@ Variable,-,__stdio_exit_handler,void (*)(), Variable,+,_ctype_,const char[], Variable,+,_impure_data,_reent, Variable,+,_impure_ptr,_reent*, -Variable,-,_sys_errlist,const char*[], +Variable,-,_sys_errlist,const char* const[], Variable,-,_sys_nerr,int, Variable,-,ble_profile_hid,const FuriHalBleProfileTemplate*, Variable,-,ble_profile_serial,const FuriHalBleProfileTemplate*, -Variable,+,cli_vcp,CliSession, +Variable,+,cli_vcp,const CliSession, Variable,+,compress_config_heatshrink_default,const CompressConfigHeatshrink, -Variable,+,firmware_api_interface,const ElfApiInterface*, +Variable,+,firmware_api_interface,const ElfApiInterface* const, Variable,+,furi_hal_i2c_bus_external,FuriHalI2cBus, Variable,+,furi_hal_i2c_bus_power,FuriHalI2cBus, Variable,+,furi_hal_i2c_handle_external,FuriHalI2cBusHandle, @@ -3858,7 +3858,7 @@ Variable,+,gpio_usb_dp,const GpioPin, Variable,+,gpio_vibro,const GpioPin, Variable,+,input_pins,const InputPin[], Variable,+,input_pins_count,const size_t, -Variable,+,lfrfid_protocols,const ProtocolBase*[], +Variable,+,lfrfid_protocols,const ProtocolBase* const[], Variable,+,message_blink_set_color_blue,const NotificationMessage, Variable,+,message_blink_set_color_cyan,const NotificationMessage, Variable,+,message_blink_set_color_green,const NotificationMessage, @@ -4079,5 +4079,5 @@ Variable,+,usb_ccid,FuriHalUsbInterface, Variable,+,usb_cdc_dual,FuriHalUsbInterface, Variable,+,usb_cdc_single,FuriHalUsbInterface, Variable,+,usb_hid,FuriHalUsbInterface, -Variable,+,usb_hid_u2f,FuriHalUsbInterface, +Variable,+,usb_hid_u2f,const FuriHalUsbInterface, Variable,+,usbd_devfs,const usbd_driver, diff --git a/targets/f7/furi_hal/furi_hal_usb_u2f.c b/targets/f7/furi_hal/furi_hal_usb_u2f.c index 05f498376..82aeaf6d7 100644 --- a/targets/f7/furi_hal/furi_hal_usb_u2f.c +++ b/targets/f7/furi_hal/furi_hal_usb_u2f.c @@ -174,7 +174,7 @@ void furi_hal_hid_u2f_set_callback(HidU2fCallback cb, void* ctx) { } } -FuriHalUsbInterface usb_hid_u2f = { +const FuriHalUsbInterface usb_hid_u2f = { .init = hid_u2f_init, .deinit = hid_u2f_deinit, .wakeup = hid_u2f_on_wakeup, diff --git a/targets/furi_hal_include/furi_hal_usb.h b/targets/furi_hal_include/furi_hal_usb.h index 213e8d56f..dc4e3eaad 100644 --- a/targets/furi_hal_include/furi_hal_usb.h +++ b/targets/furi_hal_include/furi_hal_usb.h @@ -27,7 +27,7 @@ struct FuriHalUsbInterface { extern FuriHalUsbInterface usb_cdc_single; extern FuriHalUsbInterface usb_cdc_dual; extern FuriHalUsbInterface usb_hid; -extern FuriHalUsbInterface usb_hid_u2f; +extern const FuriHalUsbInterface usb_hid_u2f; extern FuriHalUsbInterface usb_ccid; typedef enum {