From 174df62d85cf22e225189a163c59b21773e1f414 Mon Sep 17 00:00:00 2001 From: EnderIce2 Date: Sat, 10 Feb 2024 07:09:11 +0200 Subject: [PATCH] Move font declarations to display.hpp --- core/video/display.cpp | 56 ------------------------------------------ include/display.hpp | 56 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/core/video/display.cpp b/core/video/display.cpp index 60aa692..59295f4 100644 --- a/core/video/display.cpp +++ b/core/video/display.cpp @@ -20,62 +20,6 @@ #include #include -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn10x20b_psf_end; -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn10x20b_psf_size; -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn10x20b_psf_start; - -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn5x9b_psf_end; -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn5x9b_psf_size; -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn5x9b_psf_start; - -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn5x9r_psf_end; -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn5x9r_psf_size; -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn5x9r_psf_start; - -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn10x20r_psf_end; -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn10x20r_psf_size; -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn10x20r_psf_start; - -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn6x12b_psf_end; -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn6x12b_psf_size; -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn6x12b_psf_start; - -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn6x12r_psf_end; -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn6x12r_psf_size; -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn6x12r_psf_start; - -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn7x13b_psf_end; -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn7x13b_psf_size; -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn7x13b_psf_start; - -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn7x13r_psf_end; -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn7x13r_psf_size; -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn7x13r_psf_start; - -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn7x14b_psf_end; -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn7x14b_psf_size; -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn7x14b_psf_start; - -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn7x14r_psf_end; -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn7x14r_psf_size; -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn7x14r_psf_start; - -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn8x15b_psf_end; -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn8x15b_psf_size; -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn8x15b_psf_start; - -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn8x15r_psf_end; -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn8x15r_psf_size; -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn8x15r_psf_start; - -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn8x16b_psf_end; -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn8x16b_psf_size; -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn8x16b_psf_start; - -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn8x16r_psf_end; -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn8x16r_psf_size; -extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn8x16r_psf_start; - NewLock(PrintLock); namespace Video diff --git a/include/display.hpp b/include/display.hpp index 34c7c64..280aaaa 100644 --- a/include/display.hpp +++ b/include/display.hpp @@ -25,6 +25,62 @@ #include #include +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn10x20b_psf_end; +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn10x20b_psf_size; +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn10x20b_psf_start; + +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn5x9b_psf_end; +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn5x9b_psf_size; +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn5x9b_psf_start; + +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn5x9r_psf_end; +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn5x9r_psf_size; +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn5x9r_psf_start; + +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn10x20r_psf_end; +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn10x20r_psf_size; +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn10x20r_psf_start; + +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn6x12b_psf_end; +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn6x12b_psf_size; +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn6x12b_psf_start; + +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn6x12r_psf_end; +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn6x12r_psf_size; +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn6x12r_psf_start; + +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn7x13b_psf_end; +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn7x13b_psf_size; +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn7x13b_psf_start; + +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn7x13r_psf_end; +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn7x13r_psf_size; +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn7x13r_psf_start; + +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn7x14b_psf_end; +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn7x14b_psf_size; +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn7x14b_psf_start; + +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn7x14r_psf_end; +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn7x14r_psf_size; +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn7x14r_psf_start; + +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn8x15b_psf_end; +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn8x15b_psf_size; +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn8x15b_psf_start; + +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn8x15r_psf_end; +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn8x15r_psf_size; +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn8x15r_psf_start; + +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn8x16b_psf_end; +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn8x16b_psf_size; +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn8x16b_psf_start; + +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn8x16r_psf_end; +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn8x16r_psf_size; +extern uintptr_t _binary_files_tamsyn_font_1_11_Tamsyn8x16r_psf_start; + namespace Video { #define PSF1_MAGIC0 0x36