# HG changeset patch # User Paul Boddie # Date 1541720022 -3600 # Node ID 1d5ca38cab46156f0977d204259fa22015ecfe74 # Parent 309b07bc17b8b43a56b25c1d951f753289b3cae2 Moved font structure initialisation into a function. diff -r 309b07bc17b8 -r 1d5ca38cab46 examples/vga/main.c --- a/examples/vga/main.c Thu Nov 08 23:49:36 2018 +0100 +++ b/examples/vga/main.c Fri Nov 09 00:33:42 2018 +0100 @@ -343,10 +343,7 @@ int x = 0, y = 0; char c; - font_config.chars = (char_definition_t *) fontchars; - font_config.table = fonttable; - font_config.base = fontbase; - font_config.limit = fontlimit; + init_font(&font_config, fontchars, fonttable, fontbase, fontlimit); while (y + line_height < display_config.line_count) { diff -r 309b07bc17b8 -r 1d5ca38cab46 include/font.h --- a/include/font.h Thu Nov 08 23:49:36 2018 +0100 +++ b/include/font.h Fri Nov 09 00:33:42 2018 +0100 @@ -49,6 +49,9 @@ /* Access functions. */ +void init_font(font_config_t *cfg, uint8_t *chars, uint32_t *table, + uint32_t base, uint32_t limit); + char_definition_t *get_char_definition(font_config_t *cfg, char c); int write_char(display_config_t *cfg, font_config_t *fcfg, char c, diff -r 309b07bc17b8 -r 1d5ca38cab46 lib/font.c --- a/lib/font.c Thu Nov 08 23:49:36 2018 +0100 +++ b/lib/font.c Fri Nov 09 00:33:42 2018 +0100 @@ -24,6 +24,19 @@ +/* Initialise a font configuration. */ + +void init_font(font_config_t *cfg, uint8_t *chars, uint32_t *table, + uint32_t base, uint32_t limit) +{ + cfg->chars = (char_definition_t *) chars; + cfg->table = table; + cfg->base = base; + cfg->limit = limit; +} + + + /* Return the character definition for the given character. */ char_definition_t *get_char_definition(font_config_t *fcfg, char c)