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/kbio.h
+++ new/usr/src/uts/common/sys/kbio.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 *
|
↓ open down ↓ |
18 lines elided |
↑ open up ↑ |
19 19 * CDDL HEADER END
20 20 */
21 21 /*
22 22 * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
23 23 * Use is subject to license terms.
24 24 */
25 25
26 26 #ifndef _SYS_KBIO_H
27 27 #define _SYS_KBIO_H
28 28
29 -#pragma ident "%Z%%M% %I% %E% SMI" /* SunOS4.0 1.23 */
30 -
31 29 #ifdef __cplusplus
32 30 extern "C" {
33 31 #endif
34 32
35 33 /*
36 34 * Keyboard related ioctls
37 35 */
38 36
39 37 /*
40 38 * See sys/kbd.h for TR_NONE (don't translate) and TR_ASCII
41 39 * (translate to ASCII) TR_EVENT (translate to virtual input
42 40 * device codes)
43 41 */
44 42 #define KIOC ('k'<<8)
45 43
46 44 #if defined(__i386) || defined(__i386_COMPAT)
47 45
48 46 /*
49 47 * For x86, these numbers conflict with KD "Xenix" ioctl numbers, so each
50 48 * conflicting command has been offset by 30.
51 49 */
52 50 #define KIOCTRANS (KIOC|30) /* set keyboard translation */
53 51 #define KIOCGTRANS (KIOC|35) /* get keyboard translation */
54 52 #define KIOCTRANSABLE (KIOC|36) /* set keyboard translatability */
55 53 #define KIOCGTRANSABLE (KIOC|37) /* get keyboard translatability */
56 54
57 55 #else /* __i386 || __i386_COMPAT */
58 56
59 57 #define KIOCTRANS (KIOC|0) /* set keyboard translation */
60 58 #define KIOCGTRANS (KIOC|5) /* get keyboard translation */
61 59 #define KIOCTRANSABLE (KIOC|6) /* set keyboard translatability */
62 60 #define KIOCGTRANSABLE (KIOC|7) /* get keyboard translatability */
63 61
64 62 #endif /* __i386 || __i386_COMPAT */
65 63
66 64
67 65 #define TR_CANNOT 0 /* Cannot translate keyboard using tables */
68 66 #define TR_CAN 1 /* Can translate keyboard using tables */
69 67
70 68 /*
71 69 * Old-style keymap entry, for backwards compatibility only.
72 70 */
73 71 struct kiockey {
74 72 int kio_tablemask; /* Translation table (one of: 0, CAPSMASK, */
75 73 /* SHIFTMASK, CTRLMASK, UPMASK, */
76 74 /* ALTGRAPHMASK, NUMLOCKMASK) */
77 75 #define KIOCABORT1 -1 /* Special "mask": abort1 keystation */
78 76 #define KIOCABORT2 -2 /* Special "mask": abort2 keystation */
79 77 #define KIOCABORT1A -3 /* Special "mask": alt abort1 keystation */
80 78 uchar_t kio_station; /* Physical keyboard key station (0-127) */
81 79 uchar_t kio_entry; /* Translation table station's entry */
82 80 char kio_string[10]; /* Value for STRING entries (null terminated) */
83 81 };
84 82
85 83 /*
86 84 * Set kio_tablemask table's kio_station to kio_entry.
87 85 * Copy kio_string to string table if kio_entry is between STRING and
88 86 * STRING+15. EINVAL is possible if there are invalid arguments.
89 87 */
90 88 #if defined(__i386) || defined(__i386_COMPAT)
91 89 #define KIOCSETKEY (KIOC|31) /* avoid conflict with "SETFKEY" */
92 90 #else
93 91 #define KIOCSETKEY (KIOC|1)
94 92 #endif
95 93
96 94 /*
97 95 * Get kio_tablemask table's kio_station to kio_entry.
98 96 * Get kio_string from string table if kio_entry is between STRING and
99 97 * STRING+15. EINVAL is possible if there are invalid arguments.
100 98 */
101 99 #if defined(__i386) || defined(__i386_COMPAT)
102 100 #define KIOCGETKEY (KIOC|32) /* avoid conflict with "GIO_SCRNMAP" */
103 101 #else
104 102 #define KIOCGETKEY (KIOC|2)
105 103 #endif
106 104
107 105 /*
108 106 * Send the keyboard device a control command. sys/kbd.h contains
109 107 * the constants that define the commands. Normal values are:
110 108 * KBD_CMD_BELL, KBD_CMD_NOBELL, KBD_CMD_CLICK, KBD_CMD_NOCLICK.
111 109 * Inappropriate commands for particular keyboard types are ignored.
112 110 *
113 111 * Since there is no reliable way to get the state of the bell or click
114 112 * or LED (because we can't query the kdb, and also one could do writes
115 113 * to the appropriate serial driver--thus going around this ioctl)
116 114 * we don't provide an equivalent state querying ioctl.
117 115 */
118 116 #define KIOCCMD (KIOC|8)
119 117
120 118 /*
121 119 * Get keyboard type. Return values are one of KB_* from sys/kbd.h,
122 120 * e.g., KB_KLUNK, KB_VT100, KB_SUN2, KB_SUN3, KB_SUN4, KB_ASCII.
123 121 * -1 means that the type is not known.
124 122 */
125 123 #define KIOCTYPE (KIOC|9) /* get keyboard type */
126 124
127 125 /*
128 126 * Set flag indicating whether keystrokes get routed to /dev/console.
129 127 */
130 128 #define KIOCSDIRECT (KIOC|10)
131 129
132 130 /*
133 131 * Get flag indicating whether keystrokes get routed to /dev/console.
134 132 */
135 133 #if defined(__i386) || defined(__i386_COMPAT)
136 134 #define KIOCGDIRECT (KIOC|41) /* avoid conflict with "GIO_STRMAP" */
137 135 #else
138 136 #define KIOCGDIRECT (KIOC|11)
|
↓ open down ↓ |
98 lines elided |
↑ open up ↑ |
139 137 #endif
140 138
141 139 /*
142 140 * New-style key map entry.
143 141 */
144 142 struct kiockeymap {
145 143 int kio_tablemask; /* Translation table (one of: 0, CAPSMASK, */
146 144 /* SHIFTMASK, CTRLMASK, UPMASK, */
147 145 /* ALTGRAPHMASK) */
148 146 uchar_t kio_station; /* Physical keyboard key station (0-127) */
149 - ushort_t kio_entry; /* Translation table station's entry */
147 + unsigned kio_entry; /* Translation table station's entry */
150 148 char kio_string[10]; /* Value for STRING entries (null terminated) */
151 149 };
152 150
153 151 /*
154 152 * Set kio_tablemask table's kio_station to kio_entry.
155 153 * Copy kio_string to string table if kio_entry is between STRING and
156 154 * STRING+15. EINVAL is possible if there are invalid arguments.
157 155 */
158 156 #if defined(__i386) || defined(__i386_COMPAT)
159 157 #define KIOCSKEY (KIOC|42) /* avoid conflict with "PIO_STRMAP" */
160 158 #else
161 159 #define KIOCSKEY (KIOC|12)
162 160 #endif
163 161
164 162 /*
165 163 * Get kio_tablemask table's kio_station to kio_entry.
166 164 * Get kio_string from string table if kio_entry is between STRING and
167 165 * STRING+15. EINVAL is possible if there are invalid arguments.
168 166 */
169 167 #define KIOCGKEY (KIOC|13)
170 168
171 169 /*
172 170 * Set and get LED state.
173 171 */
174 172 #define KIOCSLED (KIOC|14)
175 173 #define KIOCGLED (KIOC|15)
176 174
177 175 /*
178 176 * Set and get compatibility mode.
179 177 */
180 178 #define KIOCSCOMPAT (KIOC|16)
181 179 #define KIOCGCOMPAT (KIOC|17)
182 180
183 181 /*
184 182 * Set and get keyboard layout.
185 183 */
186 184 #define KIOCSLAYOUT (KIOC|19)
187 185 #define KIOCLAYOUT (KIOC|20)
188 186
189 187 /*
190 188 * KIOCSKABORTEN:
191 189 *
192 190 * Enable/Disable/Alternate Keyboard abort effect (Stop/A, Break or other seq).
193 191 * The argument is a pointer to an integer. If the integer is zero,
194 192 * keyboard abort is disabled, one will enable keyboard abort (hardware BREAK
195 193 * signal), two will revert to the Alternative Break Sequence. NB: This ioctl
196 194 * requires root credentials and applies to serial input devices and keyboards.
197 195 * When the Alternative Break Sequence is enabled it applies to serial input
198 196 * devices ONLY.
199 197 */
200 198 #define KIOCSKABORTEN (KIOC|21)
201 199
202 200 #define KIOCABORTDISABLE 0 /* Disable Aborts */
203 201 #define KIOCABORTENABLE 1 /* Enable BREAK Signal Aborts */
204 202 #define KIOCABORTALTERNATE 2 /* Enable Alternative Aborts */
205 203
206 204 /*
207 205 * Get/Set Keyboard autorepeat delay/rate.
208 206 * Use millisecond as unit used by the user-level application
209 207 */
210 208 #define KIOCGRPTDELAY (KIOC|22)
211 209 #define KIOCSRPTDELAY (KIOC|23)
212 210 #define KIOCGRPTRATE (KIOC|24)
213 211 #define KIOCSRPTRATE (KIOC|25)
214 212
215 213 /* Set keyboard and console beeper frequencies */
216 214 #define KIOCSETFREQ (KIOC|26)
217 215
218 216 /* Beeper type for struct freq_request */
219 217 enum fr_beep_type {CONSOLE_BEEP = 1, KBD_BEEP = 2};
220 218
221 219 /* Frequency request structure */
222 220 struct freq_request {
223 221 enum fr_beep_type type; /* Beeper type */
224 222 int16_t freq; /* Frequency */
225 223 };
226 224
227 225 #define KIOCMKTONE (KIOC|27)
228 226
229 227 /*
230 228 * For historical reasons, the frequency argument to KIOCMKTONE is
231 229 * in i8254 clock cycles.
232 230 */
233 231
234 232 #define PIT_HZ 1193182 /* 8254's cycles per second */
235 233
236 234 #define KDMKTONE KIOCMKTONE
237 235
238 236 /* Used to control the AutoRepeat Min-delay and Min-Rate */
239 237 #define KIOCRPTDELAY_MIN (100)
240 238 #define KIOCRPTRATE_MIN (1)
241 239
242 240 #ifdef __cplusplus
243 241 }
244 242 #endif
245 243
246 244 #endif /* _SYS_KBIO_H */
|
↓ open down ↓ |
87 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX