arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-06-30 20:02:34 +00:00
Code Issues Releases Wiki Activity

refactor(core/embed): move&rename display headers

Browse Source 
lib/display.h -> lib/display_draw.h (temporary change)
lib/display.c -> lib/display_draw.c (temporary change)
lib/display_interface.h -> trezorhal/display.h (final change)

[no changelog]
This commit is contained in:
cepetr 2024-01-17 15:29:49 +01:00
parent 1e3e7f808b
commit 8a6438977c
21 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/SConscript.boardloader
View File

@ -59,8 +59,8 @@ CPPPATH_MOD += [
] ]
SOURCE_MOD += [ SOURCE_MOD += [
'embed/lib/colors.c', 'embed/lib/colors.c',
'embed/lib/display_draw.c',
'embed/lib/display_utils.c', 'embed/lib/display_utils.c',
'embed/lib/display.c',
'embed/lib/fonts/font_bitmap.c', 'embed/lib/fonts/font_bitmap.c',
'embed/lib/fonts/fonts.c', 'embed/lib/fonts/fonts.c',
'embed/lib/image.c', 'embed/lib/image.c',

2
core/SConscript.bootloader
View File

@ -83,8 +83,8 @@ SOURCE_MOD += [
'embed/extmod/modtrezorcrypto/rand.c', 'embed/extmod/modtrezorcrypto/rand.c',
'embed/lib/buffers.c', 'embed/lib/buffers.c',
'embed/lib/colors.c', 'embed/lib/colors.c',
'embed/lib/display_draw.c',
'embed/lib/display_utils.c', 'embed/lib/display_utils.c',
'embed/lib/display.c',
'embed/lib/fonts/font_bitmap.c', 'embed/lib/fonts/font_bitmap.c',
'embed/lib/fonts/fonts.c', 'embed/lib/fonts/fonts.c',
'embed/lib/image.c', 'embed/lib/image.c',

2
core/SConscript.bootloader_ci
View File

@ -76,8 +76,8 @@ CPPPATH_MOD += [
SOURCE_MOD += [ SOURCE_MOD += [
'embed/extmod/modtrezorcrypto/rand.c', 'embed/extmod/modtrezorcrypto/rand.c',
'embed/lib/colors.c', 'embed/lib/colors.c',
'embed/lib/display_draw.c',
'embed/lib/display_utils.c', 'embed/lib/display_utils.c',
'embed/lib/display.c',
'embed/lib/fonts/font_bitmap.c', 'embed/lib/fonts/font_bitmap.c',
'embed/lib/fonts/fonts.c', 'embed/lib/fonts/fonts.c',
'embed/lib/image.c', 'embed/lib/image.c',

2
core/SConscript.bootloader_emu
View File

@ -80,8 +80,8 @@ SOURCE_MOD += [
'embed/extmod/modtrezorcrypto/rand.c', 'embed/extmod/modtrezorcrypto/rand.c',
'embed/lib/buffers.c', 'embed/lib/buffers.c',
'embed/lib/colors.c', 'embed/lib/colors.c',
'embed/lib/display_draw.c',
'embed/lib/display_utils.c', 'embed/lib/display_utils.c',
'embed/lib/display.c',
'embed/lib/fonts/font_bitmap.c', 'embed/lib/fonts/font_bitmap.c',
'embed/lib/fonts/fonts.c', 'embed/lib/fonts/fonts.c',
'embed/lib/image.c', 'embed/lib/image.c',

2
core/SConscript.firmware
View File

@ -190,8 +190,8 @@ SOURCE_MOD += [
'embed/extmod/modtrezorui/modtrezorui.c', 'embed/extmod/modtrezorui/modtrezorui.c',
'embed/lib/buffers.c', 'embed/lib/buffers.c',
'embed/lib/colors.c', 'embed/lib/colors.c',
'embed/lib/display_draw.c',
'embed/lib/display_utils.c', 'embed/lib/display_utils.c',
'embed/lib/display.c',
'embed/lib/fonts/font_bitmap.c', 'embed/lib/fonts/font_bitmap.c',
'embed/lib/fonts/fonts.c', 'embed/lib/fonts/fonts.c',
'embed/lib/image.c', 'embed/lib/image.c',

2
core/SConscript.prodtest
View File

@ -81,8 +81,8 @@ CPPPATH_MOD += [
SOURCE_MOD += [ SOURCE_MOD += [
'embed/lib/colors.c', 'embed/lib/colors.c',
'embed/lib/display_draw.c',
'embed/lib/display_utils.c', 'embed/lib/display_utils.c',
'embed/lib/display.c',
'embed/lib/fonts/font_bitmap.c', 'embed/lib/fonts/font_bitmap.c',
'embed/lib/fonts/fonts.c', 'embed/lib/fonts/fonts.c',
'embed/lib/image.c', 'embed/lib/image.c',

2
core/SConscript.reflash
View File

@ -55,8 +55,8 @@ CPPPATH_MOD += [
] ]
SOURCE_MOD += [ SOURCE_MOD += [
'embed/lib/colors.c', 'embed/lib/colors.c',
'embed/lib/display_draw.c',
'embed/lib/display_utils.c', 'embed/lib/display_utils.c',
'embed/lib/display.c',
'embed/lib/fonts/font_bitmap.c', 'embed/lib/fonts/font_bitmap.c',
'embed/lib/fonts/fonts.c', 'embed/lib/fonts/fonts.c',
'embed/lib/image.c', 'embed/lib/image.c',

2
core/SConscript.unix
View File

@ -192,8 +192,8 @@ SOURCE_MOD += [
'embed/extmod/modtrezorui/modtrezorui.c', 'embed/extmod/modtrezorui/modtrezorui.c',
'embed/lib/buffers.c', 'embed/lib/buffers.c',
'embed/lib/colors.c', 'embed/lib/colors.c',
'embed/lib/display_draw.c',
'embed/lib/display_utils.c', 'embed/lib/display_utils.c',
'embed/lib/display.c',
'embed/lib/fonts/font_bitmap.c', 'embed/lib/fonts/font_bitmap.c',
'embed/lib/fonts/fonts.c', 'embed/lib/fonts/fonts.c',
'embed/lib/image.c', 'embed/lib/image.c',

4
core/embed/lib/display.c → core/embed/lib/display_draw.c
View File

@ -19,7 +19,7 @@
#define _GNU_SOURCE #define _GNU_SOURCE
#include "display.h" #include "display_draw.h"
#include "buffers.h" #include "buffers.h"
#include "common.h" #include "common.h"
@ -34,7 +34,7 @@
#include "memzero.h" #include "memzero.h"
#include "display_interface.h" #include "display.h"
static struct { int x, y; } DISPLAY_OFFSET; static struct { int x, y; } DISPLAY_OFFSET;

5
core/embed/lib/display.h → core/embed/lib/display_draw.h
View File

@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef __DISPLAY_H__ #ifndef __DISPLAY_DRAW_H__
#define __DISPLAY_H__ #define __DISPLAY_DRAW_H__
#include <stdbool.h> #include <stdbool.h>
#include <stddef.h> #include <stddef.h>
@ -27,7 +27,6 @@
#include "buffers.h" #include "buffers.h"
#include "colors.h" #include "colors.h"
#include TREZOR_BOARD #include TREZOR_BOARD
#include "display_interface.h"
#include "fonts/fonts.h" #include "fonts/fonts.h"
// provided by common // provided by common

2
core/embed/lib/dma2d_emul.c
View File

@ -18,7 +18,7 @@
*/ */
#include "colors.h" #include "colors.h"
#include "display_interface.h" #include "display.h"
typedef enum { typedef enum {
DMA2D_LAYER_FG = 1, DMA2D_LAYER_FG = 1,

1
core/embed/rust/trezorhal.h
View File

@ -3,7 +3,6 @@
#include "button.h" #include "button.h"
#include "common.h" #include "common.h"
#include "display.h" #include "display.h"
#include "display_interface.h"
#include "dma2d.h" #include "dma2d.h"
#include "flash.h" #include "flash.h"
#include "fonts/fonts.h" #include "fonts/fonts.h"

7
core/embed/lib/display_interface.h → core/embed/trezorhal/display.h
View File

@ -17,11 +17,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef _DISPLAY_INTERFACE_H #ifndef TREZORHAL_DISPLAY_H
#define _DISPLAY_INTERFACE_H #define TREZORHAL_DISPLAY_H
#include <stdint.h> #include <stdint.h>
#include "common.h" #include "common.h"
#include "display_draw.h"
#include TREZOR_BOARD #include TREZOR_BOARD
#ifndef DISPLAY_FRAMEBUFFER_OFFSET_Y #ifndef DISPLAY_FRAMEBUFFER_OFFSET_Y
@ -68,4 +69,4 @@ uint8_t *display_get_wr_addr(void);
void display_shift_window(uint16_t pixels); void display_shift_window(uint16_t pixels);
uint16_t display_get_window_offset(void); uint16_t display_get_window_offset(void);
#endif //_DISPLAY_INTERFACE_H #endif // TREZORHAL_DISPLAY_H

2
core/embed/trezorhal/stm32f4/displays/ltdc.c
View File

@ -19,7 +19,7 @@
#include <stdint.h> #include <stdint.h>
#include TREZOR_BOARD #include TREZOR_BOARD
#include "display_interface.h" #include "display.h"
#include "memzero.h" #include "memzero.h"
#include STM32_HAL_H #include STM32_HAL_H

2
core/embed/trezorhal/stm32f4/displays/panels/lx154a2422.c
View File

@ -1,5 +1,5 @@
#include "display_interface.h" #include "display.h"
#include "displays/st7789v.h" #include "displays/st7789v.h"
#include "touch.h" #include "touch.h"

2
core/embed/trezorhal/stm32f4/displays/panels/tf15411a.c
View File

@ -1,4 +1,4 @@
#include "display_interface.h" #include "display.h"
#include "displays/st7789v.h" #include "displays/st7789v.h"
void tf15411a_init_seq(void) { void tf15411a_init_seq(void) {

2
core/embed/trezorhal/stm32f4/displays/st7789v.c
View File

@ -22,7 +22,7 @@
#include <string.h> #include <string.h>
#include TREZOR_BOARD #include TREZOR_BOARD
#include "backlight_pwm.h" #include "backlight_pwm.h"
#include "display_interface.h" #include "display.h"
#include "irq.h" #include "irq.h"
#include "memzero.h" #include "memzero.h"
#include "st7789v.h" #include "st7789v.h"

2
core/embed/trezorhal/stm32f4/displays/ug-2828tswig01.c
View File

@ -19,7 +19,7 @@
#include <stdint.h> #include <stdint.h>
#include TREZOR_BOARD #include TREZOR_BOARD
#include "display_interface.h" #include "display.h"
#include "memzero.h" #include "memzero.h"
#include STM32_HAL_H #include STM32_HAL_H

2
core/embed/trezorhal/stm32f4/displays/vg-2864ksweg01.c
View File

@ -20,7 +20,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#include TREZOR_BOARD #include TREZOR_BOARD
#include "display_interface.h" #include "display.h"
#include STM32_HAL_H #include STM32_HAL_H
#ifdef USE_CONSUMPTION_MASK #ifdef USE_CONSUMPTION_MASK

2
core/embed/trezorhal/stm32f4/dma2d.c
View File

@ -20,7 +20,7 @@
#include "dma2d.h" #include "dma2d.h"
#include "colors.h" #include "colors.h"
#include STM32_HAL_H #include STM32_HAL_H
#include "display_interface.h" #include "display.h"
typedef enum { typedef enum {
DMA2D_LAYER_FG = 1, DMA2D_LAYER_FG = 1,

2
core/embed/trezorhal/unix/display-unix.c
View File

@ -31,7 +31,7 @@
#include "common.h" #include "common.h"
#include "display-unix.h" #include "display-unix.h"
#include "display_interface.h" #include "display.h"
#include "profile.h" #include "profile.h"
#define EMULATOR_BORDER 16 #define EMULATOR_BORDER 16