From 4ff68e7494c359d5c47b5f0eb38ac660bfdb21f9 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 11 Apr 2016 17:55:10 +0200 Subject: [PATCH] add static to mp_define_const --- Makefile | 8 ++++++++ .../modTrezorCrypto/modTrezorCrypto-base58.h | 4 ++-- .../modTrezorCrypto/modTrezorCrypto-sha256.h | 2 +- extmod/modTrezorCrypto/modTrezorCrypto.c | 1 - extmod/modTrezorMsg/modTrezorMsg.c | 4 ++-- extmod/modTrezorProtobuf/modTrezorProtobuf.c | 4 ++-- extmod/modTrezorUi/modTrezorUi-display.h | 18 +++++++++--------- extmod/modTrezorUi/modTrezorUi-touch.h | 6 +++--- 8 files changed, 27 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index 68d28edcc..85619b568 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,14 @@ build_unix: ## build unix port run_unix: ## run unix port cd src ; ../vendor/micropython/unix/micropython +clean: clean_stmhal clean_unix ## clean all builds + +clean_stmhal: ## clean stmhal build + make -C vendor/micropython/stmhal clean + +clean_unix: ## clean unix build + make -C vendor/micropython/unix clean + flash: ## flash firmware using st-flash st-flash write $(STMHAL_BUILD_DIR)/firmware0.bin 0x8000000 sleep 0.1 diff --git a/extmod/modTrezorCrypto/modTrezorCrypto-base58.h b/extmod/modTrezorCrypto/modTrezorCrypto-base58.h index f78f15d3c..763824250 100644 --- a/extmod/modTrezorCrypto/modTrezorCrypto-base58.h +++ b/extmod/modTrezorCrypto/modTrezorCrypto-base58.h @@ -29,7 +29,7 @@ STATIC mp_obj_t mod_TrezorCrypto_Base58_encode(mp_obj_t self, mp_obj_t data) { vstr.len--; // b58enc returns length including the trailing zero return mp_obj_new_str_from_vstr(&mp_type_str, &vstr); } -MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorCrypto_Base58_encode_obj, mod_TrezorCrypto_Base58_encode); +STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorCrypto_Base58_encode_obj, mod_TrezorCrypto_Base58_encode); // def Base58.decode(self, string: str) -> bytes STATIC mp_obj_t mod_TrezorCrypto_Base58_decode(mp_obj_t self, mp_obj_t string) { @@ -40,7 +40,7 @@ STATIC mp_obj_t mod_TrezorCrypto_Base58_decode(mp_obj_t self, mp_obj_t string) { b58tobin(vstr.buf, &vstr.len, stringbuf.buf); return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr); } -MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorCrypto_Base58_decode_obj, mod_TrezorCrypto_Base58_decode); +STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorCrypto_Base58_decode_obj, mod_TrezorCrypto_Base58_decode); // Base58 stuff diff --git a/extmod/modTrezorCrypto/modTrezorCrypto-sha256.h b/extmod/modTrezorCrypto/modTrezorCrypto-sha256.h index ef4734bbe..5060dbb86 100644 --- a/extmod/modTrezorCrypto/modTrezorCrypto-sha256.h +++ b/extmod/modTrezorCrypto/modTrezorCrypto-sha256.h @@ -28,7 +28,7 @@ STATIC mp_obj_t mod_TrezorCrypto_Sha256_hash(mp_obj_t self, mp_obj_t data) { sha256_Raw(databuf.buf, databuf.len, (uint8_t *)vstr.buf); return mp_obj_new_str_from_vstr(&mp_type_bytes, &vstr); } -MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorCrypto_Sha256_hash_obj, mod_TrezorCrypto_Sha256_hash); +STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorCrypto_Sha256_hash_obj, mod_TrezorCrypto_Sha256_hash); // Sha256 stuff diff --git a/extmod/modTrezorCrypto/modTrezorCrypto.c b/extmod/modTrezorCrypto/modTrezorCrypto.c index 75f67c616..e5ab0f821 100644 --- a/extmod/modTrezorCrypto/modTrezorCrypto.c +++ b/extmod/modTrezorCrypto/modTrezorCrypto.c @@ -25,7 +25,6 @@ STATIC const mp_rom_map_elem_t mp_module_TrezorCrypto_globals_table[] = { { MP_ROM_QSTR(MP_QSTR_Base58), MP_ROM_PTR(&mod_TrezorCrypto_Base58_type) }, { MP_ROM_QSTR(MP_QSTR_Sha256), MP_ROM_PTR(&mod_TrezorCrypto_Sha256_type) }, }; - STATIC MP_DEFINE_CONST_DICT(mp_module_TrezorCrypto_globals, mp_module_TrezorCrypto_globals_table); const mp_obj_module_t mp_module_TrezorCrypto = { diff --git a/extmod/modTrezorMsg/modTrezorMsg.c b/extmod/modTrezorMsg/modTrezorMsg.c index b6e279323..f6270e2be 100644 --- a/extmod/modTrezorMsg/modTrezorMsg.c +++ b/extmod/modTrezorMsg/modTrezorMsg.c @@ -44,14 +44,14 @@ STATIC mp_obj_t mod_TrezorMsg_Msg_receive(mp_obj_t self, mp_obj_t callback) { msg_receive_callback = callback; return mp_const_none; } -MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorMsg_Msg_receive_obj, mod_TrezorMsg_Msg_receive); +STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorMsg_Msg_receive_obj, mod_TrezorMsg_Msg_receive); // def Msg.send(self, message) -> None STATIC mp_obj_t mod_TrezorMsg_Msg_send(mp_obj_t self, mp_obj_t message) { // TODO return mp_const_none; } -MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorMsg_Msg_send_obj, mod_TrezorMsg_Msg_send); +STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorMsg_Msg_send_obj, mod_TrezorMsg_Msg_send); // Msg stuff diff --git a/extmod/modTrezorProtobuf/modTrezorProtobuf.c b/extmod/modTrezorProtobuf/modTrezorProtobuf.c index 356cac10c..e0b193fce 100644 --- a/extmod/modTrezorProtobuf/modTrezorProtobuf.c +++ b/extmod/modTrezorProtobuf/modTrezorProtobuf.c @@ -32,14 +32,14 @@ STATIC mp_obj_t mod_TrezorProtobuf_Protobuf_encode(mp_obj_t self, mp_obj_t callb // TODO return mp_const_none; } -MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorProtobuf_Protobuf_encode_obj, mod_TrezorProtobuf_Protobuf_encode); +STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorProtobuf_Protobuf_encode_obj, mod_TrezorProtobuf_Protobuf_encode); // def Protobuf.decode(self, data: bytes) -> object STATIC mp_obj_t mod_TrezorProtobuf_Protobuf_decode(mp_obj_t self, mp_obj_t data) { // TODO return mp_const_none; } -MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorProtobuf_Protobuf_decode_obj, mod_TrezorProtobuf_Protobuf_decode); +STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorProtobuf_Protobuf_decode_obj, mod_TrezorProtobuf_Protobuf_decode); // Protobuf stuff diff --git a/extmod/modTrezorUi/modTrezorUi-display.h b/extmod/modTrezorUi/modTrezorUi-display.h index a7252ffb8..c97dd9943 100644 --- a/extmod/modTrezorUi/modTrezorUi-display.h +++ b/extmod/modTrezorUi/modTrezorUi-display.h @@ -177,7 +177,7 @@ STATIC mp_obj_t mod_TrezorUi_Display_bar(size_t n_args, const mp_obj_t *args) { display_bar(x, y, w, h, c); return mp_const_none; } -MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_TrezorUi_Display_bar_obj, 6, 6, mod_TrezorUi_Display_bar); +STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_TrezorUi_Display_bar_obj, 6, 6, mod_TrezorUi_Display_bar); // def Display.blit(self, x: int, y: int, w: int, h: int, data: bytes) -> None STATIC mp_obj_t mod_TrezorUi_Display_blit(size_t n_args, const mp_obj_t *args) { @@ -193,7 +193,7 @@ STATIC mp_obj_t mod_TrezorUi_Display_blit(size_t n_args, const mp_obj_t *args) { display_blit(x, y, w, h, bufinfo.buf, bufinfo.len); return mp_const_none; } -MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_TrezorUi_Display_blit_obj, 6, 6, mod_TrezorUi_Display_blit); +STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_TrezorUi_Display_blit_obj, 6, 6, mod_TrezorUi_Display_blit); // def Display.image(self, x: int, y: int, image: bytes) -> None STATIC mp_obj_t mod_TrezorUi_Display_image(size_t n_args, const mp_obj_t *args) { @@ -213,7 +213,7 @@ STATIC mp_obj_t mod_TrezorUi_Display_image(size_t n_args, const mp_obj_t *args) display_image(x, y, w, h, data + 8, bufinfo.len - 8); return mp_const_none; } -MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_TrezorUi_Display_image_obj, 4, 4, mod_TrezorUi_Display_image); +STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_TrezorUi_Display_image_obj, 4, 4, mod_TrezorUi_Display_image); // def Display.icon(self, x: int, y: int, icon: bytes, fgcolor: int, bgcolor: int) -> None STATIC mp_obj_t mod_TrezorUi_Display_icon(size_t n_args, const mp_obj_t *args) { @@ -235,7 +235,7 @@ STATIC mp_obj_t mod_TrezorUi_Display_icon(size_t n_args, const mp_obj_t *args) { display_icon(x, y, w, h, data + 8, bufinfo.len - 8, fgcolor, bgcolor); return mp_const_none; } -MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_TrezorUi_Display_icon_obj, 6, 6, mod_TrezorUi_Display_icon); +STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_TrezorUi_Display_icon_obj, 6, 6, mod_TrezorUi_Display_icon); // def Display.text(self, x: int, y: int, text: bytes, font: int, fgcolor: int, bgcolor: int) -> None STATIC mp_obj_t mod_TrezorUi_Display_text(size_t n_args, const mp_obj_t *args) { @@ -249,7 +249,7 @@ STATIC mp_obj_t mod_TrezorUi_Display_text(size_t n_args, const mp_obj_t *args) { display_text(x, y, bufinfo.buf, bufinfo.len, font, fgcolor, bgcolor); return mp_const_none; } -MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_TrezorUi_Display_text_obj, 7, 7, mod_TrezorUi_Display_text); +STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_TrezorUi_Display_text_obj, 7, 7, mod_TrezorUi_Display_text); // def Display.qrcode(self, x: int, y: int, data: bytes, scale: int) -> None STATIC mp_obj_t mod_TrezorUi_Display_qrcode(size_t n_args, const mp_obj_t *args) { @@ -264,7 +264,7 @@ STATIC mp_obj_t mod_TrezorUi_Display_qrcode(size_t n_args, const mp_obj_t *args) display_qrcode(x, y, bufinfo.buf, bufinfo.len, scale); return mp_const_none; } -MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_TrezorUi_Display_qrcode_obj, 5, 5, mod_TrezorUi_Display_qrcode); +STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mod_TrezorUi_Display_qrcode_obj, 5, 5, mod_TrezorUi_Display_qrcode); // def Display.orientation(self, degrees: int) -> None STATIC mp_obj_t mod_TrezorUi_Display_orientation(mp_obj_t self, mp_obj_t degrees) { @@ -275,7 +275,7 @@ STATIC mp_obj_t mod_TrezorUi_Display_orientation(mp_obj_t self, mp_obj_t degrees display_orientation(deg); return mp_const_none; } -MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorUi_Display_orientation_obj, mod_TrezorUi_Display_orientation); +STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorUi_Display_orientation_obj, mod_TrezorUi_Display_orientation); // def Display.raw(self, reg: int, data: bytes) -> None STATIC mp_obj_t mod_TrezorUi_Display_raw(mp_obj_t self, mp_obj_t reg, mp_obj_t data) { @@ -285,14 +285,14 @@ STATIC mp_obj_t mod_TrezorUi_Display_raw(mp_obj_t self, mp_obj_t reg, mp_obj_t d display_raw(r, bufinfo.buf, bufinfo.len); return mp_const_none; } -MP_DEFINE_CONST_FUN_OBJ_3(mod_TrezorUi_Display_raw_obj, mod_TrezorUi_Display_raw); +STATIC MP_DEFINE_CONST_FUN_OBJ_3(mod_TrezorUi_Display_raw_obj, mod_TrezorUi_Display_raw); // def Display.backlight(self, val: int) -> None STATIC mp_obj_t mod_TrezorUi_Display_backlight(mp_obj_t self, mp_obj_t reg) { display_backlight(mp_obj_get_int(reg)); return mp_const_none; } -MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorUi_Display_backlight_obj, mod_TrezorUi_Display_backlight); +STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorUi_Display_backlight_obj, mod_TrezorUi_Display_backlight); // Display stuff diff --git a/extmod/modTrezorUi/modTrezorUi-touch.h b/extmod/modTrezorUi/modTrezorUi-touch.h index 0c730cf57..439099ba2 100644 --- a/extmod/modTrezorUi/modTrezorUi-touch.h +++ b/extmod/modTrezorUi/modTrezorUi-touch.h @@ -48,21 +48,21 @@ STATIC mp_obj_t mod_TrezorUi_Touch_start(mp_obj_t self, mp_obj_t callback) { touch_start_callback = callback; return mp_const_none; } -MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorUi_Touch_start_obj, mod_TrezorUi_Touch_start); +STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorUi_Touch_start_obj, mod_TrezorUi_Touch_start); // def Touch.move(self, callback) -> None STATIC mp_obj_t mod_TrezorUi_Touch_move(mp_obj_t self, mp_obj_t callback) { touch_move_callback = callback; return mp_const_none; } -MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorUi_Touch_move_obj, mod_TrezorUi_Touch_move); +STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorUi_Touch_move_obj, mod_TrezorUi_Touch_move); // def Touch.end(self, callback) -> None STATIC mp_obj_t mod_TrezorUi_Touch_end(mp_obj_t self, mp_obj_t callback) { touch_end_callback = callback; return mp_const_none; } -MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorUi_Touch_end_obj, mod_TrezorUi_Touch_end); +STATIC MP_DEFINE_CONST_FUN_OBJ_2(mod_TrezorUi_Touch_end_obj, mod_TrezorUi_Touch_end); // Touch stuff