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/io/kbtrans/kbtrans_lower.h
+++ new/usr/src/uts/common/io/kbtrans/kbtrans_lower.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, Version 1.0 only
6 6 * (the "License"). You may not use this file except in compliance
7 7 * with the License.
8 8 *
9 9 * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
10 10 * or http://www.opensolaris.org/os/licensing.
11 11 * See the License for the specific language governing permissions
12 12 * and limitations under the License.
13 13 *
14 14 * When distributing Covered Code, include this CDDL HEADER in each
15 15 * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
16 16 * If applicable, add the following below this CDDL HEADER, with the
17 17 * fields enclosed by brackets "[]" replaced with your own identifying
18 18 * information: Portions Copyright [yyyy] [name of copyright owner]
19 19 *
|
↓ open down ↓ |
19 lines elided |
↑ open up ↑ |
20 20 * CDDL HEADER END
21 21 */
22 22 /*
23 23 * Copyright (c) 1999 by Sun Microsystems, Inc.
24 24 * All rights reserved.
25 25 */
26 26
27 27 #ifndef _KBTRANS_LOWER_H
28 28 #define _KBTRANS_LOWER_H
29 29
30 -#pragma ident "%Z%%M% %I% %E% SMI"
31 -
32 30 #ifdef __cplusplus
33 31 extern "C" {
34 32 #endif
35 33
36 34 /*
37 35 * This structure describes the state of the keyboard.
38 36 * and also specifies the keytables.
39 37 */
40 38 struct kbtrans_lower {
41 39 /* Generating pre-4.1 events? */
42 40 int kbtrans_compat;
43 41
44 42 /* key to repeat in TR_ASCII mode */
45 43 kbtrans_key_t kbtrans_repeatkey;
46 44
47 45 /* Current state of the LED's */
48 46 uchar_t kbtrans_led_state;
|
↓ open down ↓ |
7 lines elided |
↑ open up ↑ |
49 47
50 48 /* Pointer to keyboard maps */
51 49 struct keyboard *kbtrans_keyboard;
52 50
53 51 /* Current shift state */
54 52 uint_t kbtrans_shiftmask;
55 53
56 54 uchar_t kbtrans_state; /* compose state */
57 55 uint_t kbtrans_buckybits; /* current buckybits */
58 56 uint_t kbtrans_togglemask; /* Toggle shifts state */
59 - ushort_t kbtrans_compose_key; /* first compose key */
60 - ushort_t kbtrans_fltaccent_entry; /* floating accent keymap entry */
57 + kbtrans_key_t kbtrans_compose_key; /* first compose key */
58 + kbtrans_key_t kbtrans_fltaccent_entry; /* floating accent entry */
61 59
62 60 /*
63 61 * Various mapping tables.
64 62 */
65 63 signed char *kbtrans_compose_map;
66 64 struct compose_sequence_t *kbtrans_compose_table;
67 65 struct fltaccent_sequence_t *kbtrans_fltaccent_table;
68 66
69 67 /* Strings sent by various keys */
70 68 char (*kbtrans_keystringtab)[KTAB_STRLEN];
71 69
72 70 /* Num lock table */
73 71 unsigned char *kbtrans_numlock_table;
74 72
75 73 /*
76 74 * The kbtrans structure specifies the state of the
77 75 * stream.
78 76 */
79 77 struct kbtrans *kbtrans_upper;
80 78 };
81 79
82 80
83 81 /*
84 82 * Different functions must be called based upon the type of translation
85 83 * mode. Each translation mode such as TR_ASCII, TR_EVENT, TR_NONE, etc.
86 84 * has an instance of this structure.
87 85 */
88 86 struct keyboard_callback {
89 87
90 88 /*
91 89 * Raw (untranslated) keypress
92 90 */
93 91 void (*kc_keypressed_raw)(struct kbtrans *, kbtrans_key_t);
94 92
95 93 /*
96 94 * Raw (untranslated) keyrelease
97 95 */
98 96 void (*kc_keyreleased_raw)(struct kbtrans *, kbtrans_key_t);
99 97
100 98 /*
101 99 * Keypress
102 100 */
103 101 void (*kc_keypressed)(struct kbtrans *, uint_t, kbtrans_key_t, uint_t);
104 102
105 103 /*
106 104 * Keyrelease
107 105 */
108 106 void (*kc_keyreleased)(struct kbtrans *, kbtrans_key_t);
109 107
110 108 /*
111 109 * Initialize a repeat character
112 110 */
113 111 void (*kc_setup_repeat)(struct kbtrans *, uint_t, kbtrans_key_t);
114 112
115 113 /*
116 114 * Cancel a repeat character
117 115 */
118 116 void (*kc_cancel_repeat)(struct kbtrans *);
119 117
|
↓ open down ↓ |
49 lines elided |
↑ open up ↑ |
120 118 /*
121 119 * Process the led state change
122 120 */
123 121 void (*kc_setled)(struct kbtrans *);
124 122 };
125 123
126 124 /*
127 125 * Process a scancode. This routine will call the functions in
128 126 * keyboard_callback to handle the translated key.
129 127 */
130 -void
131 -kbtrans_processkey(
132 - struct kbtrans_lower *lower,
133 - struct keyboard_callback *cb,
134 - kbtrans_key_t key,
135 - enum keystate state
136 -);
128 +void kbtrans_processkey(struct kbtrans_lower *, struct keyboard_callback *,
129 + kbtrans_key_t, enum keystate);
137 130
138 131 /*
139 132 * This routine finds the entry for the specified keycode based on the
140 133 * specified shift mask.
141 134 */
142 -unsigned short *
143 -kbtrans_find_entry(
144 - struct kbtrans_lower *lower,
145 - uint_t mask,
146 - kbtrans_key_t
147 -);
135 +keymap_entry_t *kbtrans_find_entry(struct kbtrans_lower *, uint_t,
136 + kbtrans_key_t);
148 137
149 138 /*
150 139 * Debug printing
151 140 */
152 141 #ifndef DPRINTF
153 142 #ifdef DEBUG
154 143 #define DPRINTF(l, m, args) \
155 144 (((l) >= kbtrans_errlevel) && ((m) & kbtrans_errmask) ? \
156 145 kbtrans_dprintf args : \
157 146 (void) 0)
158 147 #else
159 148 #define DPRINTF(l, m, args)
160 149 #endif
161 150 #endif
162 151
163 152 /*
164 153 * Severity levels for printing
165 154 */
166 155 #define PRINT_L0 0 /* print every message */
167 156 #define PRINT_L1 1 /* debug */
168 157 #define PRINT_L2 2 /* minor errors */
169 158 #define PRINT_L3 3 /* major errors */
170 159 #define PRINT_L4 4 /* catastophic errors */
171 160
172 161 /*
173 162 * Masks
174 163 */
175 164
176 165 #define PRINT_MASK_ALL 0xFFFFFFFF
177 166 #define PRINT_MASK_OPEN 0x00000002
178 167 #define PRINT_MASK_PACKET 0x00000008
179 168 #define PRINT_MASK_CLOSE 0x00000004
180 169
181 170 #ifdef DEBUG
182 171 extern int kbtrans_errmask;
183 172 extern int kbtrans_errlevel;
184 173 extern void kbtrans_dprintf(void *, const char *fmt, ...);
185 174 #endif
186 175
187 176 #ifdef __cplusplus
188 177 }
189 178 #endif
190 179
191 180 #endif /* _KBTRANS_LOWER_H */
|
↓ open down ↓ |
34 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX