diff options
Diffstat (limited to 'firmware/font.h')
-rw-r--r-- | firmware/font.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/firmware/font.h b/firmware/font.h index 8535ab216b..645848ee18 100644 --- a/firmware/font.h +++ b/firmware/font.h | |||
@@ -46,7 +46,7 @@ | |||
46 | /* | 46 | /* |
47 | * .fnt (.rbf) loadable font file format definition | 47 | * .fnt (.rbf) loadable font file format definition |
48 | * | 48 | * |
49 | * format len description | 49 | * format len description |
50 | * ------------------------- ---- ------------------------------ | 50 | * ------------------------- ---- ------------------------------ |
51 | * UCHAR version[4] 4 magic number and version bytes | 51 | * UCHAR version[4] 4 magic number and version bytes |
52 | * UCHAR name[64] 64 font name, space padded | 52 | * UCHAR name[64] 64 font name, space padded |
@@ -54,6 +54,7 @@ | |||
54 | * USHORT maxwidth 2 font max width in pixels | 54 | * USHORT maxwidth 2 font max width in pixels |
55 | * USHORT height 2 font height in pixels | 55 | * USHORT height 2 font height in pixels |
56 | * USHORT ascent 2 font ascent (baseline) in pixels | 56 | * USHORT ascent 2 font ascent (baseline) in pixels |
57 | * USHORT pad 2 unused, pad to 32-bit boundary | ||
57 | * ULONG firstchar 4 first character code in font | 58 | * ULONG firstchar 4 first character code in font |
58 | * ULONG defaultchar 4 default character code in font | 59 | * ULONG defaultchar 4 default character code in font |
59 | * ULONG size 4 # characters in font | 60 | * ULONG size 4 # characters in font |
@@ -61,12 +62,13 @@ | |||
61 | * ULONG noffset 4 # longs offset data in file | 62 | * ULONG noffset 4 # longs offset data in file |
62 | * ULONG nwidth 4 # bytes width data in file | 63 | * ULONG nwidth 4 # bytes width data in file |
63 | * MWIMAGEBITS bits nbits*2 image bits variable data | 64 | * MWIMAGEBITS bits nbits*2 image bits variable data |
65 | * [MWIMAGEBITS padded to 32-bit boundary] | ||
64 | * ULONG offset noffset*4 offset variable data | 66 | * ULONG offset noffset*4 offset variable data |
65 | * UCHAR width nwidth*1 width variable data | 67 | * UCHAR width nwidth*1 width variable data |
66 | */ | 68 | */ |
67 | 69 | ||
68 | /* loadable font magic and version #*/ | 70 | /* loadable font magic and version #*/ |
69 | #define VERSION "RB10" | 71 | #define VERSION "RB11" |
70 | 72 | ||
71 | /* MWIMAGEBITS helper macros*/ | 73 | /* MWIMAGEBITS helper macros*/ |
72 | #define MWIMAGE_WORDS(x) (((x)+15)/16) /* image size in words*/ | 74 | #define MWIMAGE_WORDS(x) (((x)+15)/16) /* image size in words*/ |
@@ -122,5 +124,6 @@ void font_init(void); | |||
122 | /* ----------------------------------------------------------------- | 124 | /* ----------------------------------------------------------------- |
123 | * local variables: | 125 | * local variables: |
124 | * eval: (load-file "rockbox-mode.el") | 126 | * eval: (load-file "rockbox-mode.el") |
127 | * vim: et sw=4 ts=8 sts=4 tw=78 | ||
125 | * end: | 128 | * end: |
126 | */ | 129 | */ |