mirror of
https://github.com/trezor/trezor-firmware.git
synced 2024-11-26 17:38:39 +00:00
vendor: Update Nanopb to 0.3.9
This commit is contained in:
parent
045ef22d98
commit
bab8db9191
@ -75,9 +75,10 @@ OBJS += ../vendor/trezor-crypto/nem.o
|
|||||||
|
|
||||||
OBJS += ../vendor/trezor-qrenc/qr_encode.o
|
OBJS += ../vendor/trezor-qrenc/qr_encode.o
|
||||||
|
|
||||||
# OBJS += protob/pb_common.o
|
OBJS += ../vendor/nanopb/pb_common.o
|
||||||
OBJS += protob/pb_decode.o
|
OBJS += ../vendor/nanopb/pb_decode.o
|
||||||
OBJS += protob/pb_encode.o
|
OBJS += ../vendor/nanopb/pb_encode.o
|
||||||
|
|
||||||
OBJS += protob/messages.pb.o
|
OBJS += protob/messages.pb.o
|
||||||
OBJS += protob/types.pb.o
|
OBJS += protob/types.pb.o
|
||||||
|
|
||||||
@ -93,7 +94,7 @@ DEBUG_LINK ?= 0
|
|||||||
DEBUG_LOG ?= 0
|
DEBUG_LOG ?= 0
|
||||||
|
|
||||||
CFLAGS += -Wno-sequence-point
|
CFLAGS += -Wno-sequence-point
|
||||||
CFLAGS += -Iprotob -DPB_FIELD_16BIT=1
|
CFLAGS += -I../vendor/nanopb -Iprotob -DPB_FIELD_16BIT=1
|
||||||
CFLAGS += -DQR_MAX_VERSION=0
|
CFLAGS += -DQR_MAX_VERSION=0
|
||||||
CFLAGS += -DDEBUG_LINK=$(DEBUG_LINK)
|
CFLAGS += -DDEBUG_LINK=$(DEBUG_LINK)
|
||||||
CFLAGS += -DDEBUG_LOG=$(DEBUG_LOG)
|
CFLAGS += -DDEBUG_LOG=$(DEBUG_LOG)
|
||||||
|
@ -1 +0,0 @@
|
|||||||
../../vendor/nanopb/pb.h
|
|
@ -1 +0,0 @@
|
|||||||
../../vendor/nanopb/pb_decode.c
|
|
@ -1 +0,0 @@
|
|||||||
../../vendor/nanopb/pb_decode.h
|
|
@ -1 +0,0 @@
|
|||||||
../../vendor/nanopb/pb_encode.c
|
|
@ -1 +0,0 @@
|
|||||||
../../vendor/nanopb/pb_encode.h
|
|
@ -56,8 +56,18 @@
|
|||||||
|
|
||||||
static const uint8_t segwit_header[2] = {0,1};
|
static const uint8_t segwit_header[2] = {0,1};
|
||||||
|
|
||||||
#define op_push_size(len) ((len) < 0x4c ? 1 : (len) < 0x100 ? 2 : \
|
static inline uint32_t op_push_size(uint32_t i) {
|
||||||
(len) < 0x10000 ? 3 : 5)
|
if (i < 0x4C) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
if (i < 0x100) {
|
||||||
|
return 2;
|
||||||
|
}
|
||||||
|
if (i < 0x10000) {
|
||||||
|
return 3;
|
||||||
|
}
|
||||||
|
return 5;
|
||||||
|
}
|
||||||
|
|
||||||
uint32_t op_push(uint32_t i, uint8_t *out) {
|
uint32_t op_push(uint32_t i, uint8_t *out) {
|
||||||
if (i < 0x4C) {
|
if (i < 0x4C) {
|
||||||
|
2
vendor/nanopb
vendored
2
vendor/nanopb
vendored
@ -1 +1 @@
|
|||||||
Subproject commit 54c34a9fda152937d4cd0c7fd85c067fca23af75
|
Subproject commit 71ba4e68da4b3c986d454e34c4666a82fbdf4176
|
Loading…
Reference in New Issue
Block a user