diff options
author | sos <sos@FreeBSD.org> | 1997-11-25 12:44:44 +0000 |
---|---|---|
committer | sos <sos@FreeBSD.org> | 1997-11-25 12:44:44 +0000 |
commit | 494f67f706a79c7454dbeabe549081cd66c161aa (patch) | |
tree | e2bd0a1d44c8bdd910a25ab132384df438350b23 | |
parent | 2c74c3d3edc5cf0199c2b8a203a9c4c61b0e50dc (diff) | |
download | FreeBSD-src-494f67f706a79c7454dbeabe549081cd66c161aa.zip FreeBSD-src-494f67f706a79c7454dbeabe549081cd66c161aa.tar.gz |
Move the hardware currsor off screen when getting back from an
unknown mode.
Fix warning on uninitialized var.
-rw-r--r-- | sys/dev/syscons/syscons.c | 11 | ||||
-rw-r--r-- | sys/i386/isa/syscons.c | 11 | ||||
-rw-r--r-- | sys/isa/syscons.c | 11 |
3 files changed, 27 insertions, 6 deletions
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index 55c38f6..43c62ad 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons.c,v 1.238 1997/11/07 09:20:32 phk Exp $ + * $Id: syscons.c,v 1.239 1997/11/21 11:37:05 yokota Exp $ */ #include "sc.h" @@ -925,7 +925,7 @@ int scioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p) { int error; - u_int i; + u_int i = 0; struct tty *tp; scr_stat *scp; u_short *usp; @@ -1450,6 +1450,13 @@ scioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p) copy_font(LOAD, FONT_16, font_16); load_palette(palette); } + + /* move hardware cursor out of the way */ + outb(crtc_addr, 14); + outb(crtc_addr + 1, 0xff); + outb(crtc_addr, 15); + outb(crtc_addr + 1, 0xff); + /* FALL THROUGH */ case KD_TEXT1: /* switch to TEXT (known) mode */ diff --git a/sys/i386/isa/syscons.c b/sys/i386/isa/syscons.c index 55c38f6..43c62ad 100644 --- a/sys/i386/isa/syscons.c +++ b/sys/i386/isa/syscons.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons.c,v 1.238 1997/11/07 09:20:32 phk Exp $ + * $Id: syscons.c,v 1.239 1997/11/21 11:37:05 yokota Exp $ */ #include "sc.h" @@ -925,7 +925,7 @@ int scioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p) { int error; - u_int i; + u_int i = 0; struct tty *tp; scr_stat *scp; u_short *usp; @@ -1450,6 +1450,13 @@ scioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p) copy_font(LOAD, FONT_16, font_16); load_palette(palette); } + + /* move hardware cursor out of the way */ + outb(crtc_addr, 14); + outb(crtc_addr + 1, 0xff); + outb(crtc_addr, 15); + outb(crtc_addr + 1, 0xff); + /* FALL THROUGH */ case KD_TEXT1: /* switch to TEXT (known) mode */ diff --git a/sys/isa/syscons.c b/sys/isa/syscons.c index 55c38f6..43c62ad 100644 --- a/sys/isa/syscons.c +++ b/sys/isa/syscons.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons.c,v 1.238 1997/11/07 09:20:32 phk Exp $ + * $Id: syscons.c,v 1.239 1997/11/21 11:37:05 yokota Exp $ */ #include "sc.h" @@ -925,7 +925,7 @@ int scioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p) { int error; - u_int i; + u_int i = 0; struct tty *tp; scr_stat *scp; u_short *usp; @@ -1450,6 +1450,13 @@ scioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p) copy_font(LOAD, FONT_16, font_16); load_palette(palette); } + + /* move hardware cursor out of the way */ + outb(crtc_addr, 14); + outb(crtc_addr + 1, 0xff); + outb(crtc_addr, 15); + outb(crtc_addr + 1, 0xff); + /* FALL THROUGH */ case KD_TEXT1: /* switch to TEXT (known) mode */ |