From eec44e994aa54b3903d153865a427cdbdf7357f5 Mon Sep 17 00:00:00 2001 From: Alexandre Paillier Date: Fri, 9 Sep 2022 17:21:35 +0200 Subject: [PATCH] Removed duplicated function signature of ui_idle --- src/ui_callbacks.h | 1 - src_bagl/ui_flow.c | 4 ++-- src_features/getEth2PublicKey/ui_common_getEth2PublicKey.c | 2 +- src_features/getPublicKey/ui_common_getPublicKey.c | 2 +- .../ui_common_performPrivacyOperation.c | 2 +- src_features/signMessage/ui_common_signMessage.c | 2 +- src_features/signMessageEIP712/ui_common_signMessage712.c | 2 +- src_features/signTx/ui_common_signTx.c | 2 +- .../stark_getPublicKey/ui_common_stark_getPublicKey.c | 2 +- src_features/stark_sign/ui_common_stark_sign.c | 2 +- src_features/stark_unsafe_sign/ui_common_stark_unsafe_sign.c | 2 +- 11 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/ui_callbacks.h b/src/ui_callbacks.h index 419706a..1616e3e 100644 --- a/src/ui_callbacks.h +++ b/src/ui_callbacks.h @@ -23,7 +23,6 @@ unsigned int io_seproxyhal_touch_stark_unsafe_sign_ok(const bagl_element_t *e); unsigned int io_seproxyhal_touch_stark_pubkey_ok(const bagl_element_t *e); unsigned int io_seproxyhal_touch_stark_ok(const bagl_element_t *e); -void ui_idle(void); void ui_warning_contract_data(void); void io_seproxyhal_send_status(uint32_t sw); diff --git a/src_bagl/ui_flow.c b/src_bagl/ui_flow.c index d6c0a16..79cedf4 100644 --- a/src_bagl/ui_flow.c +++ b/src_bagl/ui_flow.c @@ -1,5 +1,5 @@ #include "shared_context.h" -#include "ui_callbacks.h" +#include "common_ui.h" void display_settings(const ux_flow_step_t* const start_step); void switch_settings_blind_signing(void); @@ -184,4 +184,4 @@ UX_STEP_CB( #endif // clang-format on -UX_FLOW(ux_warning_contract_data_flow, &ux_warning_contract_data_step); \ No newline at end of file +UX_FLOW(ux_warning_contract_data_flow, &ux_warning_contract_data_step); diff --git a/src_features/getEth2PublicKey/ui_common_getEth2PublicKey.c b/src_features/getEth2PublicKey/ui_common_getEth2PublicKey.c index ca10fc3..77b38c0 100644 --- a/src_features/getEth2PublicKey/ui_common_getEth2PublicKey.c +++ b/src_features/getEth2PublicKey/ui_common_getEth2PublicKey.c @@ -2,7 +2,7 @@ #include "shared_context.h" #include "feature_getEth2PublicKey.h" -#include "ui_callbacks.h" +#include "common_ui.h" unsigned int io_seproxyhal_touch_eth2_address_ok(__attribute__((unused)) const bagl_element_t *e) { uint32_t tx = set_result_get_eth2_publicKey(); diff --git a/src_features/getPublicKey/ui_common_getPublicKey.c b/src_features/getPublicKey/ui_common_getPublicKey.c index c7bd3a3..d38724a 100644 --- a/src_features/getPublicKey/ui_common_getPublicKey.c +++ b/src_features/getPublicKey/ui_common_getPublicKey.c @@ -1,6 +1,6 @@ #include "shared_context.h" #include "feature_getPublicKey.h" -#include "ui_callbacks.h" +#include "common_ui.h" unsigned int io_seproxyhal_touch_address_ok(__attribute__((unused)) const bagl_element_t *e) { uint32_t tx = set_result_get_publicKey(); diff --git a/src_features/performPrivacyOperation/ui_common_performPrivacyOperation.c b/src_features/performPrivacyOperation/ui_common_performPrivacyOperation.c index ac045f2..a2cb1c3 100644 --- a/src_features/performPrivacyOperation/ui_common_performPrivacyOperation.c +++ b/src_features/performPrivacyOperation/ui_common_performPrivacyOperation.c @@ -1,6 +1,6 @@ #include "shared_context.h" #include "feature_getPublicKey.h" -#include "ui_callbacks.h" +#include "common_ui.h" #include "feature_performPrivacyOperation.h" unsigned int io_seproxyhal_touch_privacy_ok(__attribute__((unused)) const bagl_element_t *e) { diff --git a/src_features/signMessage/ui_common_signMessage.c b/src_features/signMessage/ui_common_signMessage.c index 6436093..4f5c8f2 100644 --- a/src_features/signMessage/ui_common_signMessage.c +++ b/src_features/signMessage/ui_common_signMessage.c @@ -1,6 +1,6 @@ #include "os_io_seproxyhal.h" #include "shared_context.h" -#include "ui_callbacks.h" +#include "common_ui.h" unsigned int io_seproxyhal_touch_signMessage_ok(void) { uint8_t privateKeyData[INT256_LENGTH]; diff --git a/src_features/signMessageEIP712/ui_common_signMessage712.c b/src_features/signMessageEIP712/ui_common_signMessage712.c index e7dea8f..4d5e266 100644 --- a/src_features/signMessageEIP712/ui_common_signMessage712.c +++ b/src_features/signMessageEIP712/ui_common_signMessage712.c @@ -1,6 +1,6 @@ #include "os_io_seproxyhal.h" #include "shared_context.h" -#include "ui_callbacks.h" +#include "common_ui.h" static const uint8_t EIP_712_MAGIC[] = {0x19, 0x01}; diff --git a/src_features/signTx/ui_common_signTx.c b/src_features/signTx/ui_common_signTx.c index 6c482d0..ef8171f 100644 --- a/src_features/signTx/ui_common_signTx.c +++ b/src_features/signTx/ui_common_signTx.c @@ -1,7 +1,7 @@ #include "os_io_seproxyhal.h" #include "shared_context.h" #include "utils.h" -#include "ui_callbacks.h" +#include "common_ui.h" unsigned int io_seproxyhal_touch_tx_ok(__attribute__((unused)) const bagl_element_t *e) { uint8_t privateKeyData[INT256_LENGTH]; diff --git a/src_features/stark_getPublicKey/ui_common_stark_getPublicKey.c b/src_features/stark_getPublicKey/ui_common_stark_getPublicKey.c index 94a6658..31b9714 100644 --- a/src_features/stark_getPublicKey/ui_common_stark_getPublicKey.c +++ b/src_features/stark_getPublicKey/ui_common_stark_getPublicKey.c @@ -1,7 +1,7 @@ #ifdef HAVE_STARKWARE #include "shared_context.h" -#include "ui_callbacks.h" +#include "common_ui.h" #include "feature_stark_getPublicKey.h" unsigned int io_seproxyhal_touch_stark_pubkey_ok(__attribute__((unused)) const bagl_element_t *e) { diff --git a/src_features/stark_sign/ui_common_stark_sign.c b/src_features/stark_sign/ui_common_stark_sign.c index a44ee99..a45f7f9 100644 --- a/src_features/stark_sign/ui_common_stark_sign.c +++ b/src_features/stark_sign/ui_common_stark_sign.c @@ -3,7 +3,7 @@ #include "os_io_seproxyhal.h" #include "shared_context.h" #include "stark_utils.h" -#include "ui_callbacks.h" +#include "common_ui.h" unsigned int io_seproxyhal_touch_stark_ok(__attribute__((unused)) const bagl_element_t *e) { uint8_t privateKeyData[32]; diff --git a/src_features/stark_unsafe_sign/ui_common_stark_unsafe_sign.c b/src_features/stark_unsafe_sign/ui_common_stark_unsafe_sign.c index 899c59d..4774627 100644 --- a/src_features/stark_unsafe_sign/ui_common_stark_unsafe_sign.c +++ b/src_features/stark_unsafe_sign/ui_common_stark_unsafe_sign.c @@ -3,7 +3,7 @@ #include "os_io_seproxyhal.h" #include "shared_context.h" #include "stark_utils.h" -#include "ui_callbacks.h" +#include "common_ui.h" unsigned int io_seproxyhal_touch_stark_unsafe_sign_ok(__attribute__((unused)) const bagl_element_t *e) {