diff options
Diffstat (limited to 'usr/src/uts/common')
| -rw-r--r-- | usr/src/uts/common/disp/sysclass.c | 14 | ||||
| -rw-r--r-- | usr/src/uts/common/io/tem_safe.c | 40 | ||||
| -rw-r--r-- | usr/src/uts/common/os/pcifm.c | 6 |
3 files changed, 34 insertions, 26 deletions
diff --git a/usr/src/uts/common/disp/sysclass.c b/usr/src/uts/common/disp/sysclass.c index 7323a0fc17..825c6337d2 100644 --- a/usr/src/uts/common/disp/sysclass.c +++ b/usr/src/uts/common/disp/sysclass.c @@ -25,9 +25,7 @@ */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ -/* All Rights Reserved */ - -#pragma ident "%Z%%M% %I% %E% SMI" /* from SVr4.0 1.12 */ +/* All Rights Reserved */ #include <sys/types.h> #include <sys/param.h> @@ -67,6 +65,7 @@ static int sys_doprio(kthread_t *, cred_t *, int, int *); static void sys_forkret(kthread_t *, kthread_t *); static void sys_nullsys(); static pri_t sys_swappri(kthread_t *, int); +static pri_t sys_globpri(kthread_t *); static int sys_alloc(void **, int); struct classfuncs sys_classfuncs = { @@ -104,7 +103,7 @@ struct classfuncs sys_classfuncs = { sys_nullsys, /* tick */ setbackdq, /* wakeup */ sys_donice, - (pri_t (*)())sys_nosys, /* globpri */ + sys_globpri, /* globpri */ sys_nullsys, /* set_process_group */ sys_nullsys, /* yield */ sys_doprio, @@ -203,6 +202,13 @@ sys_swappri(t, flags) return (-1); } +/* ARGSUSED */ +static pri_t +sys_globpri(kthread_t *t __unused) +{ + return (-1); +} + static int sys_nosys() { 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 diff --git a/usr/src/uts/common/os/pcifm.c b/usr/src/uts/common/os/pcifm.c index fa6e819a5b..a95686fc54 100644 --- a/usr/src/uts/common/os/pcifm.c +++ b/usr/src/uts/common/os/pcifm.c @@ -1440,8 +1440,10 @@ pci_check_ranges(dev_info_t *dip, void *arg) */ /*ARGSUSED*/ static void -pci_target_drain(void *private_p, pci_target_err_t *tgt_err) +pci_target_drain(void *private_p, const void *err, + const errorq_elem_t *arg __unused) { + pci_target_err_t *tgt_err = (pci_target_err_t *)err; char buf[FM_MAX_CLASS]; /* @@ -1492,7 +1494,7 @@ pci_targetq_init(void) */ if (pci_target_queue == NULL) { pci_target_queue = errorq_create("pci_target_queue", - (errorq_func_t)pci_target_drain, (void *)NULL, + pci_target_drain, (void *)NULL, TARGET_MAX_ERRS, sizeof (pci_target_err_t), FM_ERR_PIL, ERRORQ_VITAL); if (pci_target_queue == NULL) |