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

Synchronize with sys/i386/isa/syscons.c up to revision 1.204.

Browse Source
This commit is contained in:
KATO Takenori 1997-03-01 10:53:07 +00:00
parent 8a709f7876
commit 070c946661
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/pc98/pc98/syscons.c
View File

@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id$ * $Id: syscons.c,v 1.28 1997/02/22 09:43:47 peter Exp $
*/ */
#include "sc.h" #include "sc.h"
@ -1051,12 +1051,10 @@ scioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
return EINVAL; return EINVAL;
} }
/* make screensaver happy */ /* make screensaver happy */
if (scp == cur_console) { scrn_time_stamp = time.tv_sec;
scrn_time_stamp = time.tv_sec; if (scrn_blanked) {
if (scrn_blanked) { (*current_saver)(FALSE);
(*current_saver)(FALSE); mark_all(cur_console);
mark_all(scp);
}
} }
return 0; return 0;
} }
@ -4342,6 +4340,7 @@ set_normal_mode()
case M_CG640x350: case M_ENH_CG640: case M_CG640x350: case M_ENH_CG640:
case M_BG640x480: case M_CG640x480: case M_VGA_CG320: case M_BG640x480: case M_CG640x480: case M_VGA_CG320:
modetable = video_mode_ptr + (cur_console->mode * 64); modetable = video_mode_ptr + (cur_console->mode * 64);
break;
default: default:
modetable = video_mode_ptr + (64*M_VGA_C80x25); modetable = video_mode_ptr + (64*M_VGA_C80x25);