diff options
Diffstat (limited to 'usr/src/uts/common')
| -rw-r--r-- | usr/src/uts/common/io/aggr/aggr_grp.c | 12 | ||||
| -rw-r--r-- | usr/src/uts/common/io/tem.c | 53 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/usb/hcd/xhci/xhcireg.h | 2 |
3 files changed, 36 insertions, 31 deletions
diff --git a/usr/src/uts/common/io/aggr/aggr_grp.c b/usr/src/uts/common/io/aggr/aggr_grp.c index 47840951d3..c5d6f09b0c 100644 --- a/usr/src/uts/common/io/aggr/aggr_grp.c +++ b/usr/src/uts/common/io/aggr/aggr_grp.c @@ -3049,7 +3049,7 @@ static int aggr_set_port_sdu(aggr_grp_t *grp, aggr_port_t *port, uint32_t sdu, uint32_t *old_mtu) { - boolean_t removed = B_FALSE; + boolean_t removed = B_FALSE; mac_perim_handle_t mph; mac_diag_t diag; int err, rv, retry = 0; @@ -3138,12 +3138,12 @@ static int aggr_m_setprop(void *m_driver, const char *pr_name, mac_prop_id_t pr_num, uint_t pr_valsize, const void *pr_val) { - int err = ENOTSUP; - aggr_grp_t *grp = m_driver; + int err = ENOTSUP; + aggr_grp_t *grp = m_driver; switch (pr_num) { case MAC_PROP_MTU: { - uint32_t mtu; + uint32_t mtu; if (pr_valsize < sizeof (mtu)) { err = EINVAL; @@ -3276,8 +3276,8 @@ aggr_grp_possible_mtu_range(aggr_grp_t *grp, mac_propval_uint32_range_t **prval, mac_propval_range_t **vals; aggr_port_t *port; mac_perim_handle_t mph; - uint_t i, numr; - int err = 0; + uint_t i, numr; + int err = 0; size_t sz_propval, sz_range32; size_t size; diff --git a/usr/src/uts/common/io/tem.c b/usr/src/uts/common/io/tem.c index c452d66723..29bd71e95c 100644 --- a/usr/src/uts/common/io/tem.c +++ b/usr/src/uts/common/io/tem.c @@ -914,31 +914,36 @@ tems_get_initial_color(tem_color_t *pcolor) pcolor->fg_color = DEFAULT_ANSI_FOREGROUND; pcolor->bg_color = DEFAULT_ANSI_BACKGROUND; +#ifndef _HAVE_TEM_FIRMWARE + /* + * _HAVE_TEM_FIRMWARE is defined on SPARC, at this time, the + * plat_tem_get_colors() is implemented only on x86. + */ + plat_tem_get_colors(&pcolor->fg_color, &pcolor->bg_color); +#endif - if (plat_stdout_is_framebuffer()) { - tems_get_inverses(&inverse, &inverse_screen); - if (inverse) - flags |= TEM_ATTR_REVERSE; - if (inverse_screen) - flags |= TEM_ATTR_SCREEN_REVERSE; - - if (flags != 0) { - /* - * If either reverse flag is set, the screen is in - * white-on-black mode. We set the bold flag to - * improve readability. - */ - flags |= TEM_ATTR_BOLD; - } else { - /* - * Otherwise, the screen is in black-on-white mode. - * The SPARC PROM console, which starts in this mode, - * uses the bright white background colour so we - * match it here. - */ - if (pcolor->bg_color == ANSI_COLOR_WHITE) - flags |= TEM_ATTR_BRIGHT_BG; - } + tems_get_inverses(&inverse, &inverse_screen); + if (inverse) + flags |= TEM_ATTR_REVERSE; + if (inverse_screen) + flags |= TEM_ATTR_SCREEN_REVERSE; + + if (flags != 0) { + /* + * If either reverse flag is set, the screen is in + * white-on-black mode. We set the bold flag to + * improve readability. + */ + flags |= TEM_ATTR_BOLD; + } else { + /* + * Otherwise, the screen is in black-on-white mode. + * The SPARC PROM console, which starts in this mode, + * uses the bright white background colour so we + * match it here. + */ + if (pcolor->bg_color == ANSI_COLOR_WHITE) + flags |= TEM_ATTR_BRIGHT_BG; } pcolor->a_flags = flags; diff --git a/usr/src/uts/common/sys/usb/hcd/xhci/xhcireg.h b/usr/src/uts/common/sys/usb/hcd/xhci/xhcireg.h index 384705d481..e8d2b44ac4 100644 --- a/usr/src/uts/common/sys/usb/hcd/xhci/xhcireg.h +++ b/usr/src/uts/common/sys/usb/hcd/xhci/xhcireg.h @@ -509,7 +509,7 @@ extern "C" { #define XHCI_CODE_CMD_ABORTED 25 /* Command Abort (CA) operation */ #define XHCI_CODE_XFER_STOPPED 26 /* xfer terminated by a stop endpoint */ #define XHCI_CODE_XFER_STOPINV 27 /* TRB transfer length invalid */ -#define XHCI_CODE_XFER_STOPSHORT 28 /* Stopped before end of TD */ +#define XHCI_CODE_XFER_STOPSHORT 28 /* Stopped before end of TD */ #define XHCI_CODE_MELAT 29 /* Max Exit Latency too large */ #define XHCI_CODE_RESERVED 30 #define XHCI_CODE_ISOC_OVERRUN 31 /* IN data buffer < Max ESIT Payload */ |