Skip to content

Commit f1ff3cf

Browse files
committed
Merge branch 'unused'
2 parents b50287d + cb5c925 commit f1ff3cf

File tree

16 files changed

+7
-252
lines changed

16 files changed

+7
-252
lines changed

.ci/check-tidy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ for dir in build build-build; do
5757
echo "Checking $(echo ${SOURCES} | wc -w) files with clang-tidy"
5858

5959
# The list of tidy checks must stay in sync with scripts/tidy
60-
${CLANGTIDY} -quiet -p ${dir} -checks=-*,clang-analyzer-*,-clang-analyzer-cplusplus*,bugprone-*,performance-*,portability-*,readability-*,-readability-braces-around-statements,-readability-magic-numbers,-readability-isolate-declaration,-readability-identifier-length,-readability-function-cognitive-complexity,-bugprone-reserved-identifier,-performance-no-int-to-ptr -warnings-as-errors=* -header-filter '.*' ${SOURCES}
60+
${CLANGTIDY} -quiet -p ${dir} -checks=-*,clang-analyzer-*,-clang-analyzer-cplusplus*,bugprone-*,performance-*,portability-*,readability-*,-readability-braces-around-statements,-readability-magic-numbers,-readability-isolate-declaration,-readability-identifier-length,-readability-function-cognitive-complexity,-bugprone-reserved-identifier,-bugprone-easily-swappable-parameters,-performance-no-int-to-ptr -warnings-as-errors=* -header-filter '.*' ${SOURCES}
6161
done

src/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ set(DBB-FIRMWARE-SOURCES
3737
${CMAKE_SOURCE_DIR}/src/workflow/blocking.c
3838
${CMAKE_SOURCE_DIR}/src/workflow/idle_workflow.c
3939
${CMAKE_SOURCE_DIR}/src/workflow/orientation_screen.c
40-
${CMAKE_SOURCE_DIR}/src/workflow/status.c
41-
${CMAKE_SOURCE_DIR}/src/workflow/verify_recipient.c
42-
${CMAKE_SOURCE_DIR}/src/workflow/verify_total.c
4340
${CMAKE_SOURCE_DIR}/src/apps/btc/btc_common.c
4441
${CMAKE_SOURCE_DIR}/src/queue.c
4542
${CMAKE_SOURCE_DIR}/src/usb/usb_processing.c

src/firmware_main_loop.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include "ui/screen_stack.h"
2323
#include "usb/usb.h"
2424
#include "usb/usb_processing.h"
25-
#include "workflow/workflow.h"
2625
#include <rust/rust.h>
2726

2827
void firmware_main_loop(void)

src/memory/smarteeprom.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include <screen.h>
2323
#include <stdint.h>
2424
#include <string.h>
25-
#include <workflow/status.h>
2625

2726
#define SMARTEEPROM_WRITE_MODE_UNBUFFERED (0)
2827
#define SMARTEEPROM_WRITE_MODE_BUFFERED (1)
@@ -69,8 +68,8 @@ void smarteeprom_setup(void)
6968
* however, we want to inform the user that there's a big issue.
7069
*/
7170
for (int i = 0; i < 3; ++i) {
72-
workflow_status_blocking("Failed to erase SmartEEPROM memory area.", false);
73-
workflow_status_blocking("We suggest you reset the device and contact support.", false);
71+
screen_print_debug("Failed to erase SmartEEPROM memory area.", 3000);
72+
screen_print_debug("We suggest you reset the device and contact support.", 3000);
7473
}
7574
}
7675
/*
@@ -110,9 +109,8 @@ void smarteeprom_bb02_config(void)
110109
NVMCTRL->SEECFG.bit.WMODE = SMARTEEPROM_WRITE_MODE_BUFFERED;
111110
if (NVMCTRL->SEESTAT.bit.LOAD != 0) {
112111
for (int i = 0; i < 3; ++i) {
113-
workflow_status_blocking(
114-
"SmartEEPROM just initialized, but data found in cache!", false);
115-
workflow_status_blocking("We suggest you reset the device and contact support.", false);
112+
screen_print_debug("SmartEEPROM just initialized, but data found in cache!", 3000);
113+
screen_print_debug("We suggest you reset the device and contact support.", 3000);
116114
}
117115
}
118116
}

src/reset.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include "keystore.h"
1919
#include "memory/memory.h"
2020
#include "memory/smarteeprom.h"
21-
#include "workflow/status.h"
2221

2322
#ifndef TESTING
2423
#include "securechip/securechip.h"

src/rust/bitbox02-rust-c/src/workflow.rs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ extern crate alloc;
2020

2121
use alloc::boxed::Box;
2222
use alloc::string::String;
23-
use bitbox02_rust::bb02_async::{block_on, spin, Task};
24-
use bitbox02_rust::workflow::{confirm, status};
23+
use bitbox02_rust::bb02_async::{spin, Task};
24+
use bitbox02_rust::workflow::confirm;
2525
use core::task::Poll;
2626

2727
enum TaskState<'a, O> {
@@ -123,11 +123,3 @@ pub unsafe extern "C" fn rust_workflow_abort_current() {
123123
CONFIRM_PARAMS = None;
124124
CONFIRM_STATE = TaskState::Nothing;
125125
}
126-
127-
#[no_mangle]
128-
pub unsafe extern "C" fn rust_workflow_status_blocking(
129-
msg: crate::util::CStr,
130-
status_success: bool,
131-
) {
132-
block_on(status::status(msg.as_ref(), status_success))
133-
}

src/u2f/u2f_app.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include <stdint.h>
2222

2323
#include <util.h>
24-
#include <workflow/workflow.h>
2524

2625
/** Size of application IDs */
2726
#define U2F_APPID_SIZE 32

src/workflow/status.c

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/workflow/status.h

Lines changed: 0 additions & 29 deletions
This file was deleted.

src/workflow/verify_recipient.c

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)