diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-12-08 08:27:29 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-12-08 08:27:29 +0100 |
| commit | a59ae014e14cecaef5e6ead8083f3dfc16dc7280 (patch) | |
| tree | a3e70bf7bff88d426fedd3f7cce4808fd6b5bc02 /include | |
| parent | 5e79364a66e2fdfa2ebfd659dbc3ba47a0ebc680 (diff) | |
| parent | 42c797b091a153762c9a49738db46e8e84f64ad6 (diff) | |
| download | barebox-a59ae014e14cecaef5e6ead8083f3dfc16dc7280.tar.gz barebox-a59ae014e14cecaef5e6ead8083f3dfc16dc7280.tar.xz | |
Merge branch 'for-next/fb'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/font.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/include/linux/font.h b/include/linux/font.h index 62b1879da6..feeab97191 100644 --- a/include/linux/font.h +++ b/include/linux/font.h @@ -12,24 +12,31 @@ #define _VIDEO_FONT_H #include <param.h> +#include <wchar.h> +struct font_index { + wchar_t wc; /* code of the char. */ + short index; /* offset of the char in the bitmap. */ +}; struct font_desc { const char *name; int width, height; + struct font_index *index; const void *data; + int num_chars; + struct list_head list; }; -extern const struct font_desc font_vga_8x16, - font_7x14, - font_mini_4x6; - /* Max. length for the name of a predefined font */ #define MAX_FONT_NAME 32 +extern int find_font_index(const struct font_desc *font, int ch); extern const struct font_desc *find_font_enum(int n); extern struct param_d *add_param_font(struct device_d *dev, int (*set)(struct param_d *p, void *priv), int (*get)(struct param_d *p, void *priv), int *value, void *priv); +int font_register(struct font_desc *font); + #endif /* _VIDEO_FONT_H */ |