summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/io/tem_safe.c
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2019-02-05 12:55:26 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2019-02-05 12:55:26 +0000
commitfc7d1728f1b98070dfbbebfbb53b62279b33cfe2 (patch)
treeb241cde02240844b32b3c2b84b1b5bdd5f117448 /usr/src/uts/common/io/tem_safe.c
parentb156585baf970b2e42dc1e9dc920784b85983ab1 (diff)
parenta6f5e66afa6ed3ba58a8adebd9096d051e369784 (diff)
downloadillumos-joyent-fc7d1728f1b98070dfbbebfbb53b62279b33cfe2.tar.gz
[illumos-gate merge]
commit a6f5e66afa6ed3ba58a8adebd9096d051e369784 10341 uts: boot_fb_eraseline_impl() may use uninitialized variable commit a27563ebf538498a498f296db05c6cde1cd3e782 10332 uts: tem_safe_pix_clear_entire_screen() should use window offset commit 6eda379352cafb14ed1d54166fe88b67fbefac4d 10315 acpi: NULL pointer errors commit f642269fe771b10890afea92038f4531cd50cfd9 10313 iconv_modules: NULL pointer errors commit 8d44205c2de6047b3104694e998664b7a1c527ab 10311 addbadsec: NULL pointer errors commit de4cec4850ed6a4d4ee96e179e79e02a3d872ea3 10310 auditconfig: NULL pointer errors commit 332e84f52cdee3d0232bd5ac5306c42177959c96 10309 mkstr: NULL pointer errors commit 632cbd96e544a0a21f1a1f7ca071b145f379215d 10308 tset: NULL pointer errors commit edd4c52697927997fb1ce3c2c4c425e5ca3a56d6 10307 chown: NULL pointer errors commit 5243e3342f14ea9f300eadae1c8524571a933a1b 10305 print: NULL pointer errors commit 4f6502b6d39d77ac4bfb06b65b8ef1bb89b010ba 10304 sysclass: cast between incompatible function types commit 2325c4ff7eacda26747f8eb679e86fdaf23a7ff8 10303 audioconvert: ISO C++ forbids declaration of 'main' with no type commit 941b7e9c849240e1a04a25b32722d30dae557dc3 10302 sed: this statement may fall through commit b6e3994c8d3dda9030c4b653901b7d478245d3cb 10301 pcifm: cast between incompatible function types
Diffstat (limited to 'usr/src/uts/common/io/tem_safe.c')
-rw-r--r--usr/src/uts/common/io/tem_safe.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/usr/src/uts/common/io/tem_safe.c b/usr/src/uts/common/io/tem_safe.c
index 60ff789fb3..6e01da8ffb 100644
--- a/usr/src/uts/common/io/tem_safe.c
+++ b/usr/src/uts/common/io/tem_safe.c
@@ -579,14 +579,14 @@ tem_safe_selgraph(struct tem_vt_state *tem)
}
break;
- case 30: /* black (grey) foreground */
- case 31: /* red (light red) foreground */
- case 32: /* green (light green) foreground */
- case 33: /* brown (yellow) foreground */
- case 34: /* blue (light blue) foreground */
- case 35: /* magenta (light magenta) foreground */
- case 36: /* cyan (light cyan) foreground */
- case 37: /* white (bright white) foreground */
+ case 30: /* black (grey) foreground */
+ case 31: /* red (light red) foreground */
+ case 32: /* green (light green) foreground */
+ case 33: /* brown (yellow) foreground */
+ case 34: /* blue (light blue) foreground */
+ case 35: /* magenta (light magenta) foreground */
+ case 36: /* cyan (light cyan) foreground */
+ case 37: /* white (bright white) foreground */
tem->tvs_fg_color = param - 30;
tem->tvs_flags &= ~TEM_ATTR_BRIGHT_FG;
break;
@@ -602,14 +602,14 @@ tem_safe_selgraph(struct tem_vt_state *tem)
tem->tvs_flags &= ~TEM_ATTR_BRIGHT_FG;
break;
- case 40: /* black (grey) background */
- case 41: /* red (light red) background */
- case 42: /* green (light green) background */
- case 43: /* brown (yellow) background */
- case 44: /* blue (light blue) background */
- case 45: /* magenta (light magenta) background */
- case 46: /* cyan (light cyan) background */
- case 47: /* white (bright white) background */
+ case 40: /* black (grey) background */
+ case 41: /* red (light red) background */
+ case 42: /* green (light green) background */
+ case 43: /* brown (yellow) background */
+ case 44: /* blue (light blue) background */
+ case 45: /* magenta (light magenta) background */
+ case 46: /* cyan (light cyan) background */
+ case 47: /* white (bright white) background */
tem->tvs_bg_color = param - 40;
tem->tvs_flags &= ~TEM_ATTR_BRIGHT_BG;
break;
@@ -1170,7 +1170,7 @@ tem_safe_parse(struct tem_vt_state *tem, uchar_t ch,
tem->tvs_r_cursor.col, credp, called_from);
tem->tvs_state = A_STATE_START;
return;
- case 'p': /* sunbow */
+ case 'p': /* sunbow */
tem_safe_send_data(tem, credp, called_from);
/*
* Don't set anything if we are
@@ -1191,7 +1191,7 @@ tem_safe_parse(struct tem_vt_state *tem, uchar_t ch,
tem_safe_cls(tem, credp, called_from);
tem->tvs_state = A_STATE_START;
return;
- case 'q': /* sunwob */
+ case 'q': /* sunwob */
tem_safe_send_data(tem, credp, called_from);
/*
* Don't set anything if we are
@@ -1692,8 +1692,8 @@ tem_safe_pix_clear_entire_screen(struct tem_vt_state *tem, cred_t *credp,
nrows = (tems.ts_p_dimension.height + (height - 1))/ height;
ncols = (tems.ts_p_dimension.width + (width - 1))/ width;
- tem_safe_pix_cls_range(tem, 0, nrows, 0, 0, ncols, 0,
- B_FALSE, credp, called_from);
+ tem_safe_pix_cls_range(tem, 0, nrows, tems.ts_p_offset.y, 0, ncols,
+ tems.ts_p_offset.x, B_FALSE, credp, called_from);
/*
* Since the whole screen is cleared, we don't need