Skip to content

Remove dead ST31 code and refactor ST31/ST33 defines #1618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yrichard-ledger wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove dead ST31 code and refactor ST31/ST33 defines #1618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions include/exceptions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ typedef unsigned short exception_t;

typedef struct try_context_s try_context_t;

#if (defined(ST31) || defined(ST33) || defined(ST33K1M5)) && defined(__arm__)
#if defined(__arm__)
// #include <setjmp.h>
// GCC/LLVM declare way too big jmp context, reduce them to what is used on CM0+

Expand All @@ -19,7 +19,6 @@ typedef struct try_context_s try_context_t;
typedef unsigned int jmp_buf[10];

// borrowed from setjmp.h

#ifdef __GNUC__
void longjmp(jmp_buf __jmpb, int __retval) __attribute__((__noreturn__));
#else
Expand Down
4 changes: 0 additions & 4 deletions lib_cxng/src/cx_selftests.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,6 @@ void cx_printa(char *prefix, const unsigned char *r, unsigned short len)
cx_printf(("\n"));
}

#ifdef ST31
#include "product.h"
#endif

int cx_st_onefail(void)
{
volatile int i = 1; // avoid inline
Expand Down
10 changes: 0 additions & 10 deletions lib_cxng/src/cx_utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,7 @@ uint32_t cx_swap_uint32(uint32_t v)
void cx_swap_buffer32(uint32_t *v, size_t len)
{
while (len--) {
#ifdef ST31
unsigned int tmp;
tmp = ((unsigned char *) v)[len * 4 + 3];
((unsigned char *) v)[len * 4 + 3] = ((unsigned char *) v)[len * 4];
((unsigned char *) v)[len * 4] = tmp;
tmp = ((unsigned char *) v)[len * 4 + 2];
((unsigned char *) v)[len * 4 + 2] = ((unsigned char *) v)[len * 4 + 1];
((unsigned char *) v)[len * 4 + 1] = tmp;
#else
v[len] = cx_swap_uint32(v[len]);
#endif
}
}

Expand Down
20 changes: 0 additions & 20 deletions src/pic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,6 @@ extern void _nvram;
extern void _envram;
#endif // !defined(HAVE_BOLOS) || defined(BOLOS_OS_UPGRADER_APP)

#if defined(ST31)

void *pic(void *link_address)
{
// check if in the LINKED TEXT zone
if (link_address >= &_nvram && link_address < &_envram) {
link_address = pic_internal(link_address);
}

return link_address;
}

#elif defined(ST33) || defined(ST33K1M5)

#if !defined(HAVE_BOLOS) || defined(BOLOS_OS_UPGRADER_APP)
extern void _bss;
extern void _estack;
Expand Down Expand Up @@ -124,9 +110,3 @@ void pic_init(void *real_flash_start, void *real_ram_start)
}

#endif // !defined(HAVE_BOLOS) || defined(BOLOS_OS_UPGRADER_APP)

#else

#error "invalid architecture"

#endif
Loading