diff options
| author | mav <mav@FreeBSD.org> | 2014-02-07 04:09:15 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2014-02-07 04:09:15 +0000 |
| commit | 9cc9d2e8b5e7e6f05cbcc4279797d6a2d57aaded (patch) | |
| tree | dc9e3b144d25346a2294b8e7e4b52844d1e3b5f7 /sys/boot | |
| parent | 46b5a69e31837bee2c445cc2832e51e2af281e8f (diff) | |
| download | FreeBSD-src-9cc9d2e8b5e7e6f05cbcc4279797d6a2d57aaded.zip FreeBSD-src-9cc9d2e8b5e7e6f05cbcc4279797d6a2d57aaded.tar.gz | |
MFC r260949:
Make comconsole options set before its activation to be remembered.
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/i386/libi386/comconsole.c | 8 | ||||
| -rw-r--r-- | sys/boot/pc98/libpc98/comconsole.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/boot/i386/libi386/comconsole.c b/sys/boot/i386/libi386/comconsole.c index e2710c1..76a6240 100644 --- a/sys/boot/i386/libi386/comconsole.c +++ b/sys/boot/i386/libi386/comconsole.c @@ -181,8 +181,7 @@ comc_speed_set(struct env_var *ev, int flags, const void *value) return (CMD_ERROR); } - if ((comconsole.c_flags & (C_ACTIVEIN | C_ACTIVEOUT)) != 0 && - comc_curspeed != speed) + if (comc_curspeed != speed) comc_setup(speed, comc_port); env_setenv(ev->ev_name, flags | EV_NOHOOK, value, NULL, NULL); @@ -200,8 +199,7 @@ comc_port_set(struct env_var *ev, int flags, const void *value) return (CMD_ERROR); } - if ((comconsole.c_flags & (C_ACTIVEIN | C_ACTIVEOUT)) != 0 && - comc_port != port) + if (comc_port != port) comc_setup(comc_curspeed, port); env_setenv(ev->ev_name, flags | EV_NOHOOK, value, NULL, NULL); @@ -309,6 +307,8 @@ comc_setup(int speed, int port) unsetenv("hw.uart.console"); comc_curspeed = speed; comc_port = port; + if ((comconsole.c_flags & (C_ACTIVEIN | C_ACTIVEOUT)) == 0) + return; outb(comc_port + com_cfcr, CFCR_DLAB | COMC_FMT); outb(comc_port + com_dlbl, COMC_BPS(speed) & 0xff); diff --git a/sys/boot/pc98/libpc98/comconsole.c b/sys/boot/pc98/libpc98/comconsole.c index e2128a2..1bf2d6a 100644 --- a/sys/boot/pc98/libpc98/comconsole.c +++ b/sys/boot/pc98/libpc98/comconsole.c @@ -181,8 +181,7 @@ comc_speed_set(struct env_var *ev, int flags, const void *value) return (CMD_ERROR); } - if ((comconsole.c_flags & (C_ACTIVEIN | C_ACTIVEOUT)) != 0 && - comc_curspeed != speed) + if (comc_curspeed != speed) comc_setup(speed, comc_port); env_setenv(ev->ev_name, flags | EV_NOHOOK, value, NULL, NULL); @@ -200,8 +199,7 @@ comc_port_set(struct env_var *ev, int flags, const void *value) return (CMD_ERROR); } - if ((comconsole.c_flags & (C_ACTIVEIN | C_ACTIVEOUT)) != 0 && - comc_port != port) + if (comc_port != port) comc_setup(comc_curspeed, port); env_setenv(ev->ev_name, flags | EV_NOHOOK, value, NULL, NULL); @@ -309,6 +307,8 @@ comc_setup(int speed, int port) unsetenv("hw.uart.console"); comc_curspeed = speed; comc_port = port; + if ((comconsole.c_flags & (C_ACTIVEIN | C_ACTIVEOUT)) == 0) + return; outb(comc_port + com_cfcr, CFCR_DLAB | COMC_FMT); outb(comc_port + com_dlbl, COMC_BPS(speed) & 0xff); |
