diff options
| author | Toomas Soome <tsoome@me.com> | 2017-01-27 01:17:44 +0200 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2019-02-08 17:13:50 +0000 |
| commit | 0e3b7565e6fd42aa8b3cf5b0c25be52203b47fb1 (patch) | |
| tree | ed2d78d025fc8b08cb71a815b5a2dbf53c525023 /usr/src/uts/common/io/tem.c | |
| parent | 007d65bc4ff2f2e56cc6fae2335af27bf16d373f (diff) | |
| download | illumos-joyent-0e3b7565e6fd42aa8b3cf5b0c25be52203b47fb1.tar.gz | |
10340 uts: tem should upport unicode
Reviewed by: Gergő Mihály Doma <domag02@gmail.com>
Reviewed by: John Levon <john.levon@joyent.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Diffstat (limited to 'usr/src/uts/common/io/tem.c')
| -rw-r--r-- | usr/src/uts/common/io/tem.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/usr/src/uts/common/io/tem.c b/usr/src/uts/common/io/tem.c index e6a3e2edd6..d4a23c47d3 100644 --- a/usr/src/uts/common/io/tem.c +++ b/usr/src/uts/common/io/tem.c @@ -224,15 +224,15 @@ tem_internal_init(struct tem_vt_state *ptem, cred_t *credp, kmem_alloc(ptem->tvs_pix_data_size, KM_SLEEP); } - ptem->tvs_outbuf_size = tems.ts_c_dimension.width; - ptem->tvs_outbuf = - (unsigned char *)kmem_alloc(ptem->tvs_outbuf_size, KM_SLEEP); + ptem->tvs_outbuf_size = tems.ts_c_dimension.width * + sizeof (*ptem->tvs_outbuf); + ptem->tvs_outbuf = kmem_alloc(ptem->tvs_outbuf_size, KM_SLEEP); width = tems.ts_c_dimension.width; height = tems.ts_c_dimension.height; - ptem->tvs_screen_buf_size = width * height; - ptem->tvs_screen_buf = - (unsigned char *)kmem_alloc(width * height, KM_SLEEP); + ptem->tvs_screen_buf_size = width * height * + sizeof (*ptem->tvs_screen_buf); + ptem->tvs_screen_buf = kmem_alloc(ptem->tvs_screen_buf_size, KM_SLEEP); total = width * height * tc_size; ptem->tvs_fg_buf = (text_color_t *)kmem_alloc(total, KM_SLEEP); @@ -254,7 +254,7 @@ tem_internal_init(struct tem_vt_state *ptem, cred_t *credp, } - ptem->tvs_initialized = 1; + ptem->tvs_initialized = 1; } int @@ -527,7 +527,8 @@ static void tems_setup_terminal(struct vis_devinit *tp, size_t height, size_t width) { int i; - int old_blank_buf_size = tems.ts_c_dimension.width; + int old_blank_buf_size = tems.ts_c_dimension.width * + sizeof (*tems.ts_blank_line); ASSERT(MUTEX_HELD(&tems.ts_lock)); @@ -595,8 +596,9 @@ tems_setup_terminal(struct vis_devinit *tp, size_t height, size_t width) if (tems.ts_blank_line) kmem_free(tems.ts_blank_line, old_blank_buf_size); - tems.ts_blank_line = (unsigned char *) - kmem_alloc(tems.ts_c_dimension.width, KM_SLEEP); + tems.ts_blank_line = + kmem_alloc(tems.ts_c_dimension.width * sizeof (*tems.ts_blank_line), + KM_SLEEP); for (i = 0; i < tems.ts_c_dimension.width; i++) tems.ts_blank_line[i] = ' '; } |