arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-13 02:58:57 +00:00
Code Issues Releases Wiki Activity

embed: refactor MIN/MAX macros in common.h

Browse Source
This commit is contained in:
Pavol Rusnak 2018-02-22 20:35:32 +01:00
parent d8ac07e455
commit 3eab20e278
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
embed/bootloader/messages.c
View File

@ -140,8 +140,6 @@ static secbool _send_msg(uint8_t iface_num, uint16_t msg_id, const pb_field_t fi
return sectrue;
}
#define MIN(a, b) (((a) < (b)) ? (a) : (b))
#define MSG_SEND_INIT(TYPE) TYPE msg_send = TYPE##_init_default
#define MSG_SEND_ASSIGN_VALUE(FIELD, VALUE) { msg_send.has_##FIELD = true; msg_send.FIELD = VALUE; }
#define MSG_SEND_ASSIGN_STRING(FIELD, VALUE) { msg_send.has_##FIELD = true; memset(msg_send.FIELD, 0, sizeof(msg_send.FIELD)); strncpy(msg_send.FIELD, VALUE, sizeof(msg_send.FIELD) - 1); }

3
embed/extmod/modtrezorui/display.c
View File

@ -40,9 +40,6 @@ static struct {
#error Unsupported TREZOR port. Only STM32 and UNIX ports are supported.
#endif
#define MIN(a,b) (((a)<(b))?(a):(b))
#define MAX(a,b) (((a)>(b))?(a):(b))
// common display functions
static inline uint16_t interpolate_color(uint16_t color0, uint16_t color1, uint8_t step)

7
embed/trezorhal/common.h
View File

@ -4,6 +4,13 @@
#include <stdint.h>
#include "secbool.h"
#ifndef MIN
#define MIN(a, b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
#define MAX(a, b) (((a) > (b)) ? (a) : (b))
#endif
void __attribute__((noreturn)) __fatal_error(const char *expr, const char *msg, const char *file, int line, const char *func);
#define ensure(expr, msg) (((expr) == sectrue) ? (void)0 : __fatal_error(#expr, msg, __FILE__, __LINE__, __func__))

2
embed/trezorhal/image.c
View File

@ -153,8 +153,6 @@ secbool check_single_hash(const uint8_t * const hash, const uint8_t * const data
return sectrue * (0 == memcmp(h, hash, BLAKE2S_DIGEST_LENGTH));
}
#define MIN(a,b) ((a) < (b) ? (a) : (b))
secbool check_image_contents(const image_header * const hdr, uint32_t firstskip, const uint8_t *sectors, int blocks)
{
if (0 == sectors || blocks < 1) {

7
embed/unix/common.h
View File

@ -4,6 +4,13 @@
#include <stdint.h>
#include "secbool.h"
#ifndef MIN
#define MIN(a, b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
#define MAX(a, b) (((a) > (b)) ? (a) : (b))
#endif
void __attribute__((noreturn)) __fatal_error(const char *expr, const char *msg, const char *file, int line, const char *func);
#define ensure(expr, msg) (((expr) == sectrue) ? (void)0 : __fatal_error(#expr, msg, __FILE__, __LINE__, __func__))