diff options
| author | Dan McDonald <danmcd@joyent.com> | 2021-01-27 10:08:32 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2021-01-27 10:08:34 -0500 |
| commit | c203af42e9e7d0f82694cadf8cf2473863df5b2b (patch) | |
| tree | 742053671ed177b7a404fce5dc85199c1fd24133 /usr/src/common/font/font.c | |
| parent | a930493fb800d3a82f5482ec0915801c26205ef3 (diff) | |
| parent | beed421eff10640141fe8f9da29a5c8033a97f52 (diff) | |
| download | illumos-joyent-release-20210128.tar.gz | |
[illumos-gate merge]release-20210128
commit beed421eff10640141fe8f9da29a5c8033a97f52
13383 generalize check for serializing LFENCE
13384 tsc_read() should use lfence when prudent
13387 bhyve should expose lfence serialize in DE_CFG MSR
commit 78801af7286cd73dbc996d470f789e75993cf15d
13365 Add option to testrunner to re-run just failed tests
commit 2d84dc94714fa18a51c85173f806acbc2d1b4257
13360 loader: use BGRA RBG data in gfx functions
commit a98e9e2e16f7c0305e8538246f8f8464517b3884
13432 idm: symbol 'idm' is multiply-defined
commit a35d0bb9919a1ab99b0305e759552bef6a8bd053
13431 rdsib: multiply-defined symbols
commit 245cbc655bd26e8de57809bc109b82105a30693d
13430 scsi_vhci: multiply-defined symbols
commit 9868091de5a69073a55e3b8cc1a378cac9220edf
13429 nge: multiply-defined symbols
commit 6626685934fc28e358a8038d599be9e53aa0715e
13428 rdsv3: symbol 'rdsv3_one_sec_in_hz' is multiply-defined
commit 734e1f66c3254ea498ea4ce3fe6dc7e6f9f293ff
13473 svccfg: dirs for manifests are manifest not manifests
commit 4f1c2d80debdaa7ad92b0677c6c86fb6b782e811
13425 i86xpv: multiply-defined symbols
Conflicts:
usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh
Diffstat (limited to 'usr/src/common/font/font.c')
| -rw-r--r-- | usr/src/common/font/font.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/usr/src/common/font/font.c b/usr/src/common/font/font.c index 81d5b4ae53..35e2e12eca 100644 --- a/usr/src/common/font/font.c +++ b/usr/src/common/font/font.c @@ -62,7 +62,7 @@ const uint8_t solaris_color_to_pc_color[16] = { pc_magenta, /* 6 - magenta */ pc_brown, /* 7 - brown */ pc_white, /* 8 - white */ - pc_grey, /* 9 - gery */ + pc_grey, /* 9 - grey */ pc_brt_blue, /* 10 - brt_blue */ pc_brt_green, /* 11 - brt_green */ pc_brt_cyan, /* 12 - brt_cyan */ @@ -71,6 +71,25 @@ const uint8_t solaris_color_to_pc_color[16] = { pc_yellow /* 15 - yellow */ }; +const uint8_t pc_color_to_solaris_color[16] = { + sun_black, /* 0 - black */ + sun_blue, /* 1 - blue */ + sun_green, /* 2 - green */ + sun_cyan, /* 3 - cyan */ + sun_red, /* 4 - red */ + sun_magenta, /* 5 - magenta */ + sun_brown, /* 6 - brown */ + sun_white, /* 7 - white */ + sun_grey, /* 8 - grey */ + sun_brt_blue, /* 9 - brt_blue */ + sun_brt_green, /* 10 - brt_green */ + sun_brt_cyan, /* 11 - brt_cyan */ + sun_brt_red, /* 12 - brt_red */ + sun_brt_magenta, /* 13 - brt_magenta */ + sun_yellow, /* 14 - yellow */ + sun_brt_white /* 15 - brt_white */ +}; + /* 4-bit to 24-bit color translation. */ const text_cmap_t cmap4_to_24 = { /* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 |