Synchronize with sys/i386/isa/syscons.c up to revision 1.204.
This commit is contained in:
parent
8d873edbf7
commit
078e8031ca
@ -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$
|
||||
* $Id: syscons.c,v 1.28 1997/02/22 09:43:47 peter Exp $
|
||||
*/
|
||||
|
||||
#include "sc.h"
|
||||
@ -1051,12 +1051,10 @@ scioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p)
|
||||
return EINVAL;
|
||||
}
|
||||
/* make screensaver happy */
|
||||
if (scp == cur_console) {
|
||||
scrn_time_stamp = time.tv_sec;
|
||||
if (scrn_blanked) {
|
||||
(*current_saver)(FALSE);
|
||||
mark_all(scp);
|
||||
}
|
||||
scrn_time_stamp = time.tv_sec;
|
||||
if (scrn_blanked) {
|
||||
(*current_saver)(FALSE);
|
||||
mark_all(cur_console);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
@ -4342,6 +4340,7 @@ set_normal_mode()
|
||||
case M_CG640x350: case M_ENH_CG640:
|
||||
case M_BG640x480: case M_CG640x480: case M_VGA_CG320:
|
||||
modetable = video_mode_ptr + (cur_console->mode * 64);
|
||||
break;
|
||||
|
||||
default:
|
||||
modetable = video_mode_ptr + (64*M_VGA_C80x25);
|
||||
|
Loading…
Reference in New Issue
Block a user