Since those values are related to the VGA font, it make sense to move them here.
Signed-off-by: Marc-André Lureau <[email protected]> --- ui/console-priv.h | 5 ----- ui/vgafont.h | 6 +++++- ui/console-vc.c | 1 + ui/console.c | 1 + 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ui/console-priv.h b/ui/console-priv.h index 8bcdb79d914..39798c3e9d7 100644 --- a/ui/console-priv.h +++ b/ui/console-priv.h @@ -9,11 +9,6 @@ #include "qemu/coroutine.h" #include "qemu/timer.h" -#include "vgafont.h" - -#define FONT_HEIGHT 16 -#define FONT_WIDTH 8 - struct QemuConsole { Object parent; diff --git a/ui/vgafont.h b/ui/vgafont.h index 54aeeb7d192..d24b5d47a95 100644 --- a/ui/vgafont.h +++ b/ui/vgafont.h @@ -6,6 +6,10 @@ #include <stdint.h> -extern const uint8_t vgafont16[256 * 16]; +/* supports only vga 8x16 */ +#define FONT_WIDTH 8 +#define FONT_HEIGHT 16 + +extern const uint8_t vgafont16[256 * FONT_HEIGHT]; #endif diff --git a/ui/console-vc.c b/ui/console-vc.c index ba440c50744..8e785cde94c 100644 --- a/ui/console-vc.c +++ b/ui/console-vc.c @@ -11,6 +11,7 @@ #include "qemu/queue.h" #include "ui/console.h" #include "ui/cp437.h" +#include "ui/vgafont.h" #include "pixman.h" #include "trace.h" diff --git a/ui/console.c b/ui/console.c index b2b879e8533..c997e8df572 100644 --- a/ui/console.c +++ b/ui/console.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "ui/console.h" +#include "ui/vgafont.h" #include "hw/core/qdev.h" #include "qapi/error.h" #include "qapi/qapi-commands-ui.h" -- 2.53.0
