d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Oops, the position of the savefont code was wrong, cur_console

Browse Source 
wasn't set yet.
This commit is contained in:
Søren Schmidt 1997-01-19 17:34:14 +00:00
parent 9efdc393bc
commit cf35b775cb
3 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sys/dev/syscons/syscons.c
View File

@ -2418,13 +2418,6 @@ scinit(void)
bcopyw(Crtat, sc_buffer,
console[0]->xsize * console[0]->ysize * sizeof(u_short));
/* Save font and palette if VGA */
if (crtc_vga) {
copy_font(SAVE, FONT_16, font_16);
fonts_loaded = FONT_16;
save_palette();
}
console[0]->scr_buf = console[0]->mouse_pos = sc_buffer;
console[0]->cursor_pos = console[0]->cursor_oldpos = sc_buffer + hw_cursor;
console[0]->xpos = hw_cursor % COL;
@ -2443,6 +2436,13 @@ scinit(void)
scr_map[i] = scr_rmap[i] = i;
}
/* Save font and palette if VGA */
if (crtc_vga) {
copy_font(SAVE, FONT_16, font_16);
fonts_loaded = FONT_16;
save_palette();
}
#ifdef SC_SPLASH_SCREEN
/*
* Now put up a graphics image, and maybe cycle a
@ -3454,10 +3454,9 @@ set_destructive_cursor(scr_stat *scp)
if ((i >= scp->cursor_start && i <= scp->cursor_end) ||
(scp->cursor_start >= scp->font_size && i == scp->font_size - 1))
cursor[i] |= 0xff;
/* wait for vertical retrace to avoid jitter on some videocards */
while (!(inb(crtc_addr+6) & 0x08)) /* idle */ ;
#if 1
while (!(inb(crtc_addr+6) & 0x08)) /* wait for vertical retrace */ ;
#endif
set_font_mode();
bcopy(cursor, (char *)pa_to_va(address) + DEAD_CHAR * 32, 32);
set_normal_mode();
@ -3615,8 +3614,9 @@ draw_mouse_image(scr_stat *scp)
scp->mouse_oldpos = scp->mouse_pos;
/* wait for vertical retrace to avoid jitter on some videocards */
#if 1
while (!(inb(crtc_addr+6) & 0x08)) /* idle */ ;
#endif
set_font_mode();
bcopy(scp->mouse_cursor, (char *)pa_to_va(address) + 0xd0 * 32, 128);
set_normal_mode();

24
sys/i386/isa/syscons.c
View File

@ -2418,13 +2418,6 @@ scinit(void)
bcopyw(Crtat, sc_buffer,
console[0]->xsize * console[0]->ysize * sizeof(u_short));
/* Save font and palette if VGA */
if (crtc_vga) {
copy_font(SAVE, FONT_16, font_16);
fonts_loaded = FONT_16;
save_palette();
}
console[0]->scr_buf = console[0]->mouse_pos = sc_buffer;
console[0]->cursor_pos = console[0]->cursor_oldpos = sc_buffer + hw_cursor;
console[0]->xpos = hw_cursor % COL;
@ -2443,6 +2436,13 @@ scinit(void)
scr_map[i] = scr_rmap[i] = i;
}
/* Save font and palette if VGA */
if (crtc_vga) {
copy_font(SAVE, FONT_16, font_16);
fonts_loaded = FONT_16;
save_palette();
}
#ifdef SC_SPLASH_SCREEN
/*
* Now put up a graphics image, and maybe cycle a
@ -3454,10 +3454,9 @@ set_destructive_cursor(scr_stat *scp)
if ((i >= scp->cursor_start && i <= scp->cursor_end) ||
(scp->cursor_start >= scp->font_size && i == scp->font_size - 1))
cursor[i] |= 0xff;
/* wait for vertical retrace to avoid jitter on some videocards */
while (!(inb(crtc_addr+6) & 0x08)) /* idle */ ;
#if 1
while (!(inb(crtc_addr+6) & 0x08)) /* wait for vertical retrace */ ;
#endif
set_font_mode();
bcopy(cursor, (char *)pa_to_va(address) + DEAD_CHAR * 32, 32);
set_normal_mode();
@ -3615,8 +3614,9 @@ draw_mouse_image(scr_stat *scp)
scp->mouse_oldpos = scp->mouse_pos;
/* wait for vertical retrace to avoid jitter on some videocards */
#if 1
while (!(inb(crtc_addr+6) & 0x08)) /* idle */ ;
#endif
set_font_mode();
bcopy(scp->mouse_cursor, (char *)pa_to_va(address) + 0xd0 * 32, 128);
set_normal_mode();

24
sys/isa/syscons.c
View File

@ -2418,13 +2418,6 @@ scinit(void)
bcopyw(Crtat, sc_buffer,
console[0]->xsize * console[0]->ysize * sizeof(u_short));
/* Save font and palette if VGA */
if (crtc_vga) {
copy_font(SAVE, FONT_16, font_16);
fonts_loaded = FONT_16;
save_palette();
}
console[0]->scr_buf = console[0]->mouse_pos = sc_buffer;
console[0]->cursor_pos = console[0]->cursor_oldpos = sc_buffer + hw_cursor;
console[0]->xpos = hw_cursor % COL;
@ -2443,6 +2436,13 @@ scinit(void)
scr_map[i] = scr_rmap[i] = i;
}
/* Save font and palette if VGA */
if (crtc_vga) {
copy_font(SAVE, FONT_16, font_16);
fonts_loaded = FONT_16;
save_palette();
}
#ifdef SC_SPLASH_SCREEN
/*
* Now put up a graphics image, and maybe cycle a
@ -3454,10 +3454,9 @@ set_destructive_cursor(scr_stat *scp)
if ((i >= scp->cursor_start && i <= scp->cursor_end) ||
(scp->cursor_start >= scp->font_size && i == scp->font_size - 1))
cursor[i] |= 0xff;
/* wait for vertical retrace to avoid jitter on some videocards */
while (!(inb(crtc_addr+6) & 0x08)) /* idle */ ;
#if 1
while (!(inb(crtc_addr+6) & 0x08)) /* wait for vertical retrace */ ;
#endif
set_font_mode();
bcopy(cursor, (char *)pa_to_va(address) + DEAD_CHAR * 32, 32);
set_normal_mode();
@ -3615,8 +3614,9 @@ draw_mouse_image(scr_stat *scp)
scp->mouse_oldpos = scp->mouse_pos;
/* wait for vertical retrace to avoid jitter on some videocards */
#if 1
while (!(inb(crtc_addr+6) & 0x08)) /* idle */ ;
#endif
set_font_mode();
bcopy(scp->mouse_cursor, (char *)pa_to_va(address) + 0xd0 * 32, 128);
set_normal_mode();