CommonPIC32

Changeset

110:1d5ca38cab46
2018-11-09 Paul Boddie raw files shortlog changelog graph Moved font structure initialisation into a function.
examples/vga/main.c (file) include/font.h (file) lib/font.c (file)
     1.1 --- a/examples/vga/main.c	Thu Nov 08 23:49:36 2018 +0100
     1.2 +++ b/examples/vga/main.c	Fri Nov 09 00:33:42 2018 +0100
     1.3 @@ -343,10 +343,7 @@
     1.4      int x = 0, y = 0;
     1.5      char c;
     1.6  
     1.7 -    font_config.chars = (char_definition_t *) fontchars;
     1.8 -    font_config.table = fonttable;
     1.9 -    font_config.base = fontbase;
    1.10 -    font_config.limit = fontlimit;
    1.11 +    init_font(&font_config, fontchars, fonttable, fontbase, fontlimit);
    1.12  
    1.13      while (y + line_height < display_config.line_count)
    1.14      {
     2.1 --- a/include/font.h	Thu Nov 08 23:49:36 2018 +0100
     2.2 +++ b/include/font.h	Fri Nov 09 00:33:42 2018 +0100
     2.3 @@ -49,6 +49,9 @@
     2.4  
     2.5  /* Access functions. */
     2.6  
     2.7 +void init_font(font_config_t *cfg, uint8_t *chars, uint32_t *table,
     2.8 +                                   uint32_t base, uint32_t limit);
     2.9 +
    2.10  char_definition_t *get_char_definition(font_config_t *cfg, char c);
    2.11  
    2.12  int write_char(display_config_t *cfg, font_config_t *fcfg, char c,
     3.1 --- a/lib/font.c	Thu Nov 08 23:49:36 2018 +0100
     3.2 +++ b/lib/font.c	Fri Nov 09 00:33:42 2018 +0100
     3.3 @@ -24,6 +24,19 @@
     3.4  
     3.5  
     3.6  
     3.7 +/* Initialise a font configuration. */
     3.8 +
     3.9 +void init_font(font_config_t *cfg, uint8_t *chars, uint32_t *table,
    3.10 +                                   uint32_t base, uint32_t limit)
    3.11 +{
    3.12 +    cfg->chars = (char_definition_t *) chars;
    3.13 +    cfg->table = table;
    3.14 +    cfg->base = base;
    3.15 +    cfg->limit = limit;
    3.16 +}
    3.17 +
    3.18 +
    3.19 +
    3.20  /* Return the character definition for the given character. */
    3.21  
    3.22  char_definition_t *get_char_definition(font_config_t *fcfg, char c)