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>
@@ -19,14 +19,10 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
*/
-#ifndef lint
-#pragma ident "%Z%%M% %I% %E% SMI"
-#endif
-
/*
* Copyright (c) 1999 by Sun Microsystems, Inc.
* All rights reserved.
*/
@@ -43,25 +39,11 @@
#include <sys/kbd.h>
#include <sys/kbio.h>
#define ALL -1 /* special symbol for all tables */
-/*
- * SunOS 4.x and Solaris 2.[1234] put Type 4 key tables into
- * the keytables directory with no type qualification.
- * If we're a SPARC, we might be using an NFS server that
- * doesn't have the new type-qualified directories.
- * (loadkeys wasn't used on non-SPARCs in 2.[1234].)
- */
-#ifdef sparc
-#define COMPATIBILITY_DIR
-#endif
-
static char keytable_dir[] = "/usr/share/lib/keytables/type_%d/";
-#ifdef COMPATIBILITY_DIR
-static char keytable_dir2[] = "/usr/share/lib/keytables/";
-#endif
static char layout_prefix[] = "layout_";
struct keyentry {
struct keyentry *ke_next;
struct kiockeymap ke_entry;
@@ -130,33 +112,32 @@
static keyentry *makeentry(int tablemask, int entry);
static int loadkey(int kbdfd, keyentry *kep);
static int dupkey(int kbdfd, dupentry *dep, int shiftmask);
static int swapkey(int kbdfd, dupentry *dep, int shiftmask);
static int yylex();
+extern int yyparse(void);
static int readesc(FILE *stream, int delim, int single_char);
static int wordcmp(const void *w1, const void *w2);
static int yyerror(char *msg);
static void usage(void);
static void set_layout(char *arg);
static FILE *open_mapping_file(char *pathbuf, char *name,
boolean_t explicit_name, int type);
int
-main(argc, argv)
- int argc;
- char **argv;
+main(int argc, char **argv)
{
- register int kbdfd;
+ int kbdfd;
int type;
int layout;
/* maxint is 8 hex digits. */
char layout_filename[sizeof(layout_prefix)+8];
char pathbuf[MAXPATHLEN];
- register int shift;
+ int shift;
struct kiockeymap mapentry;
- register keyentry *kep;
- register dupentry *dep;
+ keyentry *kep;
+ dupentry *dep;
boolean_t explicit_name;
while(++argv, --argc) {
if(argv[0][0] != '-') break;
switch(argv[0][1]) {
@@ -331,16 +312,12 @@
/*
* Attempt to find the specified mapping file. Return a FILE * if found,
* else print a message on stderr and return NULL.
*/
FILE *
-open_mapping_file(
- char *pathbuf,
- char *name,
- boolean_t explicit_name,
- int type
-) {
+open_mapping_file(char *pathbuf, char *name, boolean_t explicit_name, int type)
+{
/* If the user specified the name, try it "raw". */
if (explicit_name) {
strcpy(pathbuf, name);
infile = fopen(pathbuf, "r");
if (infile) return (infile);
@@ -356,28 +333,13 @@
(void) fprintf(stderr, "loadkeys: Name %s is too long\n",
name);
return (NULL);
}
(void) strcat(pathbuf, name);
- infile = fopen(pathbuf, "r");
- if (infile) return (infile);
- if (errno != ENOENT) goto fopen_fail;
+ if ((infile = fopen(pathbuf, "r")) != NULL)
+ return (infile);
-#ifdef COMPATIBILITY_DIR
- /* If not, and either the name was specified explicitly */
- /* or this is a type 4... */
- if (explicit_name || type == KB_SUN4) {
- /* Try the compatibility name. */
- /* No need to check len here, it's shorter. */
- (void) strcpy(pathbuf, keytable_dir2);
- (void) strcat(pathbuf, infilename);
- infile = fopen(pathbuf, "r");
- if (infile) return (infile);
- if (errno != ENOENT) goto fopen_fail;
- }
-#endif
-
fopen_fail:
(void) fprintf(stderr, "loadkeys: ");
perror(name);
return (NULL);
}
@@ -423,11 +385,11 @@
if ((kep = (keyentry *) malloc((unsigned)sizeof (keyentry))) == NULL)
yyerror("out of memory for entries");
kep->ke_next = NULL;
kep->ke_entry.kio_tablemask = tablemask;
kep->ke_entry.kio_station = 0;
- kep->ke_entry.kio_entry = (u_short)entry;
+ kep->ke_entry.kio_entry = entry;
index = entry - STRING;
if (index >= 0 && index <= 15)
(void) strncpy(kep->ke_entry.kio_string, strings[index],
KTAB_STRLEN);
return (kep);
@@ -622,10 +584,14 @@
}
| CHAR
{
$$ = $1;
}
+| INT
+ {
+ $$ = $1;
+ }
| '('
{
$$ = '(';
}
| ')'
@@ -705,13 +671,22 @@
{ "compose", CONSTANT, COMPOSE },
{ "ctrl", TABLENAME, CTRLMASK },
{ "downarrow", CONSTANT, DOWNARROW },
{ "error", CONSTANT, ERROR },
{ "fa_acute", CONSTANT, FA_ACUTE },
+ { "fa_apostrophe", CONSTANT, FA_APOSTROPHE },
+ { "fa_breve", CONSTANT, FA_BREVE },
+ { "fa_caron", CONSTANT, FA_CARON },
{ "fa_cedilla", CONSTANT, FA_CEDILLA },
{ "fa_cflex", CONSTANT, FA_CFLEX },
+ { "fa_dacute", CONSTANT, FA_DACUTE },
+ { "fa_dot", CONSTANT, FA_DOT },
{ "fa_grave", CONSTANT, FA_GRAVE },
+ { "fa_macron", CONSTANT, FA_MACRON },
+ { "fa_ogonek", CONSTANT, FA_OGONEK },
+ { "fa_ring", CONSTANT, FA_RING },
+ { "fa_slash", CONSTANT, FA_SLASH },
{ "fa_tilde", CONSTANT, FA_TILDE },
{ "fa_umlaut", CONSTANT, FA_UMLAUT },
{ "hole", CONSTANT, HOLE },
{ "homearrow", CONSTANT, HOMEARROW },
{ "idle", CONSTANT, IDLE },
@@ -908,11 +883,11 @@
wordcmp);
if (wptr != NULL) {
yylval.number = wptr->w_lval;
tokentype = wptr->w_type;
} else {
- yylval.number = strtol(tokbuf, &ptr, 10);
+ yylval.number = strtol(tokbuf, &ptr, 0);
if (ptr == tokbuf)
yyerror("syntax error");
else
tokentype = INT;
}