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/common/ficl/ficlplatform/pager.c
+++ new/usr/src/common/ficl/ficlplatform/pager.c
1 1 /*
2 2 * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
3 3 * All rights reserved.
4 4 *
5 5 * Redistribution and use in source and binary forms, with or without
6 6 * modification, are permitted provided that the following conditions
7 7 * are met:
8 8 * 1. Redistributions of source code must retain the above copyright
9 9 * notice, this list of conditions and the following disclaimer.
10 10 * 2. Redistributions in binary form must reproduce the above copyright
11 11 * notice, this list of conditions and the following disclaimer in the
12 12 * documentation and/or other materials provided with the distribution.
13 13 *
14 14 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
15 15 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
16 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
17 17 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
18 18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 24 * SUCH DAMAGE.
25 25 */
26 26 /*
27 27 * Simple paged-output and paged-viewing functions
28 28 */
29 29
30 30 #include <stdio.h>
31 31 #include <stdlib.h>
32 32 #include <string.h>
33 33 #include <sys/types.h>
34 34 #include <sys/stat.h>
35 35 #include <fcntl.h>
36 36 #include <errno.h>
37 37 #include <termios.h>
38 38 #include <unistd.h>
39 39 #include <stropts.h>
40 40
41 41 static int p_maxlines = -1;
42 42 static int p_freelines;
43 43
44 44 static struct termios orig_termios;
45 45 static char *pager_prompt1 = \
46 46 " --more-- <space> page down <enter> line down <q> quit ";
47 47 static char *pager_blank = \
48 48 " ";
49 49
50 50 /*
51 51 * 'open' the pager
52 52 */
53 53 void
54 54 pager_open(void)
55 55 {
56 56 int nlines;
57 57 char *cp, *lp;
58 58 struct termios raw;
59 59 struct winsize ws;
|
↓ open down ↓ |
59 lines elided |
↑ open up ↑ |
60 60
61 61 tcgetattr(0, &orig_termios);
62 62 raw = orig_termios;
63 63 raw.c_lflag &= ~(ICANON | ECHO);
64 64 raw.c_cc[VMIN] = 1;
65 65 raw.c_cc[VTIME] = 0;
66 66 (void) tcsetattr(0, TCSAFLUSH, &raw);
67 67
68 68 nlines = 24; /* sensible default */
69 69 if (ioctl(1, TIOCGWINSZ, &ws) == -1 || ws.ws_row == 0) {
70 - if ((cp = getenv("LINES")) != NULL) {
70 + if ((cp = getenv("screen-#rows")) != NULL) {
71 71 nlines = strtol(cp, &lp, 0);
72 72 }
73 73 } else
74 74 nlines = ws.ws_row;
75 75
76 76 p_maxlines = nlines - 1;
77 77 if (p_maxlines < 1)
78 78 p_maxlines = 1;
79 79 p_freelines = p_maxlines;
80 80 }
81 81
82 82 /*
83 83 * 'close' the pager
84 84 */
85 85 void
86 86 pager_close(void)
87 87 {
88 88 (void) fflush(stdout);
89 89 p_maxlines = -1;
90 90 (void) tcsetattr(0, TCSAFLUSH, &orig_termios);
91 91 }
92 92
93 93 /*
94 94 * Emit lines to the pager; may not return until the user
95 95 * has responded to the prompt.
96 96 *
97 97 * Will return nonzero if the user enters 'q' or 'Q' at the prompt.
98 98 *
99 99 * XXX note that this watches outgoing newlines (and eats them), but
100 100 * does not handle wrap detection (req. count of columns).
101 101 */
102 102 int
103 103 pager_output(const char *cp)
104 104 {
105 105 int action;
106 106
107 107 if (cp == NULL)
108 108 return (0);
109 109
110 110 for (;;) {
111 111 if (*cp == 0)
112 112 return (0);
113 113
114 114 putchar(*cp); /* always emit character */
115 115
116 116 if (*(cp++) == '\n') { /* got a newline? */
117 117 p_freelines--;
118 118 if (p_freelines <= 0) {
119 119 printf("%s", pager_prompt1);
120 120 action = 0;
121 121 while (action == 0) {
122 122 switch (getchar()) {
123 123 case '\r':
124 124 case '\n':
125 125 p_freelines = 1;
126 126 action = 1;
127 127 break;
128 128 case ' ':
129 129 p_freelines = p_maxlines;
130 130 action = 1;
131 131 break;
132 132 case 'q':
133 133 case 'Q':
134 134 action = 2;
135 135 break;
136 136 default:
137 137 break;
138 138 }
139 139 }
140 140 printf("\r%s\r", pager_blank);
141 141 if (action == 2)
142 142 return (1);
143 143 }
144 144 }
145 145 }
146 146 }
147 147
148 148 /*
149 149 * Display from (fd).
150 150 */
151 151 int
152 152 pager_file(const char *fname)
153 153 {
154 154 char buf[80];
155 155 size_t hmuch;
156 156 int fd;
157 157 int result;
158 158
159 159 if ((fd = open(fname, O_RDONLY)) == -1) {
160 160 printf("can't open '%s': %s\n", fname, strerror(errno));
161 161 return (-1);
162 162 }
163 163
164 164 for (;;) {
165 165 hmuch = read(fd, buf, sizeof (buf) - 1);
166 166 if (hmuch == -1) {
167 167 result = -1;
168 168 break;
169 169 }
170 170 if (hmuch == 0) {
171 171 result = 0;
172 172 break;
173 173 }
174 174 buf[hmuch] = 0;
175 175 if (pager_output(buf)) {
176 176 result = 1;
177 177 break;
178 178 }
179 179 }
180 180 close(fd);
181 181 return (result);
182 182 }
|
↓ open down ↓ |
102 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX