Print this page
NEX-16819 loader UEFI support
Includes work by Toomas Soome <tsoome@me.com>
Upstream commits:
loader: pxe receive cleanup
9475 libefi: Do not return only if ReceiveFilter
installboot: should support efi system partition
8931 boot1.efi: scan all display modes rather than
loader: spinconsole updates
loader: gfx experiment to try GOP Blt() function.
sha1 build test
loader: add sha1 hash calculation
common/sha1: update for loader build
loader: biosdisk rework
uts: 32-bit kernel FB needs mapping in low memory
uts: add diag-device
uts: boot console mirror with diag-device
uts: enable very early console on ttya
kmdb: add diag-device as input/output device
uts: test VGA memory exclusion from mapping
uts: clear boot mapping and protect boot pages test
uts: add dboot map debug printf
uts: need to release FB pages in release_bootstrap()
uts: add screenmap ioctl
uts: update sys/queue.h
loader: add illumos uts/common to include path
loader: tem/gfx font cleanup
loader: vbe checks
uts: gfx_private set KD_TEXT when KD_RESETTEXT is
uts: gfx 8-bit update
loader: gfx 8-bit fix
loader: always set media size from partition.
uts: MB2 support for 32-bit kernel
loader: x86 should have tem 80x25
uts: x86 should have tem 80x25
uts: font update
loader: font update
uts: tem attributes
loader: tem.c comment added
uts: use font module
loader: add font module
loader: build rules for new font setup
uts: gfx_private update for new font structure
uts: early boot update for new font structure
uts: font update
uts: font build rules update for new fonts
uts: tem update to new font structure
loader: module.c needs to include tem_impl.h
uts: gfx_private 8x16 font rework
uts: make font_lookup public
loader: font rework
uts: font rework
9259 libefi: efi_alloc_and_read should check for PMBR
uts: tem utf-8 support
loader: implement tem utf-8 support
loader: tem should be able to display UTF-8
7784 uts: console input should support utf-8
7796 uts: ldterm default to utf-8
uts: do not reset serial console
uts: set up colors even if tem is not console
uts: add type for early boot properties
uts: gfx_private experiment with drm and vga
uts: gfx_private should use setmode drm callback.
uts: identify FB types and set up gfx_private based
loader: replace gop and vesa with framebuffer
uts: boot needs simple tem to support mdb
uts: boot_keyboard should emit esc sequences for
uts: gfx_private FB showuld be written by line
kmdb: set terminal window size
uts: gfx_private needs to keep track of early boot FB
pnglite: move pnglite to usr/src/common
loader: gfx_fb
ficl-sys: add gfx primitives
loader: add illumos.png logo
ficl: add fb-putimage
loader: add png support
loader: add alpha blending for gfx_fb
loader: use term-drawrect for menu frame
ficl: add simple gfx words
uts: provide fb_info via fbgattr dev_specific array.
uts: gfx_private add alpha blending
uts: update sys/ascii.h
uts: tem OSC support (incomplete)
uts: implement env module support and use data from
uts: tem get colors from early boot data
loader: use crc32 from libstand (libz)
loader: optimize for size
loader: pass tem info to the environment
loader: import tem for loader console
loader: UEFI loader needs to set ISADIR based on
loader: need UEFI32 support
8918 loader.efi: add vesa edid support
uts: tem_safe_pix_clear_prom_output() should only
uts: tem_safe_pix_clear_entire_screen() should use
uts: tem_safe_check_first_time() should query cursor
uts: tem implement cls callback & visual_io v4
uts: gfx_vgatext use block cursor for vgatext
uts: gfx_private implement cls callback & visual_io
uts: gfx_private bitmap framebuffer implementation
uts: early start frame buffer console support
uts: font functions should check the input char
uts: font rendering should support 16/24/32bit depths
uts: use smallest font as fallback default.
uts: update terminal dimensions based on selected
7834 uts: vgatext should use gfx_private
uts: add spacing property to 8859-1.bdf
terminfo: add underline for sun-color
terminfo: sun-color has 16 colors
uts: add font load callback type
loader: do not repeat int13 calls with error 0x20 and
8905 loader: add skein/edonr support
8904 common/crypto: make skein and edonr loader
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Sanjay Nadkarni <sanjay.nadkarni@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
Revert "NEX-16819 loader UEFI support"
This reverts commit ec06b9fc617b99234e538bf2e7e4d02a24993e0c.
Reverting due to failures in the zfs-tests and the sharefs-tests
NEX-16819 loader UEFI support
Includes work by Toomas Soome <tsoome@me.com>
Upstream commits:
loader: pxe receive cleanup
9475 libefi: Do not return only if ReceiveFilter
installboot: should support efi system partition
8931 boot1.efi: scan all display modes rather than
loader: spinconsole updates
loader: gfx experiment to try GOP Blt() function.
sha1 build test
loader: add sha1 hash calculation
common/sha1: update for loader build
loader: biosdisk rework
uts: 32-bit kernel FB needs mapping in low memory
uts: add diag-device
uts: boot console mirror with diag-device
uts: enable very early console on ttya
kmdb: add diag-device as input/output device
uts: test VGA memory exclusion from mapping
uts: clear boot mapping and protect boot pages test
uts: add dboot map debug printf
uts: need to release FB pages in release_bootstrap()
uts: add screenmap ioctl
uts: update sys/queue.h
loader: add illumos uts/common to include path
loader: tem/gfx font cleanup
loader: vbe checks
uts: gfx_private set KD_TEXT when KD_RESETTEXT is
uts: gfx 8-bit update
loader: gfx 8-bit fix
loader: always set media size from partition.
uts: MB2 support for 32-bit kernel
loader: x86 should have tem 80x25
uts: x86 should have tem 80x25
uts: font update
loader: font update
uts: tem attributes
loader: tem.c comment added
uts: use font module
loader: add font module
loader: build rules for new font setup
uts: gfx_private update for new font structure
uts: early boot update for new font structure
uts: font update
uts: font build rules update for new fonts
uts: tem update to new font structure
loader: module.c needs to include tem_impl.h
uts: gfx_private 8x16 font rework
uts: make font_lookup public
loader: font rework
uts: font rework
libefi: efi_alloc_and_read should check for PMBR
uts: tem utf-8 support
loader: implement tem utf-8 support
loader: tem should be able to display UTF-8
7784 uts: console input should support utf-8
7796 uts: ldterm default to utf-8
uts: do not reset serial console
uts: set up colors even if tem is not console
uts: add type for early boot properties
uts: gfx_private experiment with drm and vga
uts: gfx_private should use setmode drm callback.
uts: identify FB types and set up gfx_private based
loader: replace gop and vesa with framebuffer
uts: boot needs simple tem to support mdb
uts: boot_keyboard should emit esc sequences for
uts: gfx_private FB showuld be written by line
kmdb: set terminal window size
uts: gfx_private needs to keep track of early boot FB
pnglite: move pnglite to usr/src/common
loader: gfx_fb
ficl-sys: add gfx primitives
loader: add illumos.png logo
ficl: add fb-putimage
loader: add png support
loader: add alpha blending for gfx_fb
loader: use term-drawrect for menu frame
ficl: add simple gfx words
uts: provide fb_info via fbgattr dev_specific array.
uts: gfx_private add alpha blending
uts: update sys/ascii.h
uts: tem OSC support (incomplete)
uts: implement env module support and use data from
uts: tem get colors from early boot data
loader: use crc32 from libstand (libz)
loader: optimize for size
loader: pass tem info to the environment
loader: import tem for loader console
loader: UEFI loader needs to set ISADIR based on
loader: need UEFI32 support
8918 loader.efi: add vesa edid support
uts: tem_safe_pix_clear_prom_output() should only
uts: tem_safe_pix_clear_entire_screen() should use
uts: tem_safe_check_first_time() should query cursor
uts: tem implement cls callback & visual_io v4
uts: gfx_vgatext use block cursor for vgatext
uts: gfx_private implement cls callback & visual_io
uts: gfx_private bitmap framebuffer implementation
uts: early start frame buffer console support
uts: font functions should check the input char
uts: font rendering should support 16/24/32bit depths
uts: use smallest font as fallback default.
uts: update terminal dimensions based on selected
7834 uts: vgatext should use gfx_private
uts: add spacing property to 8859-1.bdf
terminfo: add underline for sun-color
terminfo: sun-color has 16 colors
uts: add font load callback type
loader: do not repeat int13 calls with error 0x20 and
8905 loader: add skein/edonr support
8904 common/crypto: make skein and edonr loader
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Sanjay Nadkarni <sanjay.nadkarni@nexenta.com>
Reviewed by: Evan Layton <evan.layton@nexenta.com>
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/uts/common/sys/font.h
+++ new/usr/src/uts/common/sys/font.h
1 1 /*
2 2 * CDDL HEADER START
3 3 *
4 4 * The contents of this file are subject to the terms of the
5 5 * Common Development and Distribution License (the "License").
6 6 * You may not use this file except in compliance with the License.
7 7 *
8 8 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
9 9 * or http://www.opensolaris.org/os/licensing.
10 10 * See the License for the specific language governing permissions
11 11 * and limitations under the License.
12 12 *
13 13 * When distributing Covered Code, include this CDDL HEADER in each
14 14 * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
15 15 * If applicable, add the following below this CDDL HEADER, with the
16 16 * fields enclosed by brackets "[]" replaced with your own identifying
17 17 * information: Portions Copyright [yyyy] [name of copyright owner]
18 18 *
19 19 * CDDL HEADER END
|
↓ open down ↓ |
19 lines elided |
↑ open up ↑ |
20 20 */
21 21
22 22 /*
23 23 * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
24 24 * Use is subject to license terms.
25 25 */
26 26
27 27 #ifndef _SYS_FONT_H
28 28 #define _SYS_FONT_H
29 29
30 +#include <sys/queue.h>
31 +
30 32 #ifdef __cplusplus
31 33 extern "C" {
32 34 #endif
33 35
34 -/*
35 - * Number of chars encoded in font data. Bundled fonts are generated
36 - * from bdf files and this constant depends on the data in the bdf file.
37 - * If more entries are added to the bdf files, then this number must be
38 - * increased.
39 - */
40 -#define ENCODED_CHARS 256
36 +enum vfnt_map {
37 + VFNT_MAP_NORMAL = 0, /* Normal font. */
38 + VFNT_MAP_NORMAL_RH, /* Normal font right hand. */
39 + VFNT_MAP_BOLD, /* Bold font. */
40 + VFNT_MAP_BOLD_RH, /* Bold font right hand. */
41 + VFNT_MAPS /* Number of maps. */
42 +};
41 43
44 +struct font_map {
45 + uint32_t font_src; /* Source glyph. */
46 + uint16_t font_dst; /* Target glyph. */
47 + uint16_t font_len; /* The number of glyphs in sequence. */
48 +};
49 +
50 +/* Any unknown glyph is mapped as first (offset 0) glyph in bitmap. */
42 51 struct font {
43 - short width;
44 - short height;
45 - uchar_t *char_ptr[ENCODED_CHARS];
46 - void *image_data;
52 + struct font_map *vf_map[VFNT_MAPS]; /* Mapping tables. */
53 + uint8_t *vf_bytes; /* Font bitmap data. */
54 + uint32_t vf_width; /* Glyph width. */
55 + uint32_t vf_height; /* Glyph height. */
56 + uint32_t vf_map_count[VFNT_MAPS]; /* Entries in map */
47 57 };
48 58
49 59 typedef struct bitmap_data {
50 60 short width;
51 61 short height;
52 - unsigned char *image;
53 - unsigned char **encoding;
62 + uint32_t compressed_size;
63 + uint32_t uncompressed_size;
64 + uint8_t *compressed_data;
65 + struct font *font;
54 66 } bitmap_data_t;
55 67
68 +typedef bitmap_data_t *font_load_cb_t(char *);
69 +typedef enum {
70 + FONT_AUTO,
71 + FONT_MANUAL,
72 + FONT_BOOT
73 +} FONT_FLAGS;
74 +
56 75 struct fontlist {
57 - bitmap_data_t *data;
58 - bitmap_data_t *(*fontload)(char *);
76 + char *font_name;
77 + FONT_FLAGS font_flags;
78 + bitmap_data_t *font_data;
79 + font_load_cb_t *font_load;
80 + STAILQ_ENTRY(fontlist) font_next;
59 81 };
60 82
61 -extern struct fontlist fonts[];
83 +#define FONT_HEADER_MAGIC "VFNT0002"
84 +struct font_header {
85 + uint8_t fh_magic[8];
86 + uint8_t fh_width;
87 + uint8_t fh_height;
88 + uint16_t fh_pad;
89 + uint32_t fh_glyph_count;
90 + uint32_t fh_map_count[4];
91 +} __attribute__((__packed__));
62 92
63 -#define DEFAULT_FONT_DATA font_data_12x22
64 -#define BORDER_PIXELS 10 /* space from screen border */
93 +typedef STAILQ_HEAD(font_list, fontlist) font_list_t;
94 +extern font_list_t fonts;
95 +
65 96 /*
66 - * Built in fonts.
97 + * Built in fonts. We are using Gallant as default on sparc to keep
98 + * smooth transition from prom and 8x16 on x86, for vga text mode.
67 99 */
100 +#ifdef sparc
101 +#define DEFAULT_FONT_DATA font_data_12x22
68 102 extern bitmap_data_t font_data_12x22;
103 +#else
104 +#define DEFAULT_FONT_DATA font_data_8x16
69 105 extern bitmap_data_t font_data_8x16;
70 -extern bitmap_data_t font_data_7x14;
71 -extern bitmap_data_t font_data_6x10;
106 +#endif
107 +#define BORDER_PIXELS 10 /* space from screen border */
72 108
73 -void set_font(struct font *, short *, short *, short, short);
74 -void font_bit_to_pix4(struct font *, uint8_t *, uchar_t, uint8_t, uint8_t);
75 -void font_bit_to_pix8(struct font *, uint8_t *, uchar_t, uint8_t, uint8_t);
76 -void font_bit_to_pix24(struct font *, uint32_t *, uchar_t, uint32_t, uint32_t);
109 +bitmap_data_t *set_font(short *, short *, short, short);
110 +const uint8_t *font_lookup(const struct font *, uint32_t);
111 +void font_bit_to_pix4(struct font *, uint8_t *, uint32_t, uint8_t, uint8_t);
112 +void font_bit_to_pix8(struct font *, uint8_t *, uint32_t, uint8_t, uint8_t);
113 +void font_bit_to_pix16(struct font *, uint16_t *, uint32_t, uint16_t, uint16_t);
114 +void font_bit_to_pix24(struct font *, uint8_t *, uint32_t, uint32_t, uint32_t);
115 +void font_bit_to_pix32(struct font *, uint32_t *, uint32_t, uint32_t, uint32_t);
77 116
78 117 #ifdef __cplusplus
79 118 }
80 119 #endif
81 120
82 121 #endif /* !_SYS_FONT_H */
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX