From 34cc76a76456bf7fa59e6127c853e1397c417bef Mon Sep 17 00:00:00 2001 From: Brett Gordon Date: Mon, 10 Aug 2015 09:25:14 -0400 Subject: [PATCH] change name of vtmode to defmode --- Kernel/platform-coco3/devtty.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Kernel/platform-coco3/devtty.c b/Kernel/platform-coco3/devtty.c index 38d558ce..bfea58a4 100644 --- a/Kernel/platform-coco3/devtty.c +++ b/Kernel/platform-coco3/devtty.c @@ -135,10 +135,12 @@ ttyready_t tty_writeready(uint8_t minor) void tty_putc(uint8_t minor, unsigned char c) { + int irq; if (minor > 2 ) { dw_putc(minor, c); return; } + irq=di(); struct pty *t = curpty; vt_save(&curpty->vt); curpty = &ptytab[minor - 1]; @@ -147,6 +149,7 @@ void tty_putc(uint8_t minor, unsigned char c) vt_save(&curpty->vt); curpty = t; vt_load(&curpty->vt); + irqrestore(irq); } void tty_sleeping(uint8_t minor) @@ -437,12 +440,12 @@ unsigned char vt_map(unsigned char c) void devtty_init() { int i; - int vtmode=0; + int defmode=0; /* scan cmdline for params for vt */ /* apply default/cmdline mode to terminal structs */ for( i=0; i<2; i++){ - memcpy( &(ptytab[i].gime), &(mode[vtmode]), 5 ); + memcpy( &(ptytab[i].gime), &(mode[defmode]), 5 ); } /* apply terminal to registers */ *(unsigned int *) 0xff9d = ptytab[0].scrloc; -- 2.34.1