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

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]
pull/3662/head
cepetr 3 months ago
parent 1e3e7f808b
commit 8a6438977c

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Loading…
Cancel
Save