mirror of
https://github.com/freebsd/freebsd-src
synced 2024-11-05 18:22:52 +00:00
Sync with sys/dev/syscons/syscons.c revision 1.294.
This commit is contained in:
parent
5d5c8f3b7b
commit
524d2ab047
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=43537
1 changed files with 2 additions and 8 deletions
|
@ -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.110 1999/01/27 08:22:08 kato Exp $
|
||||
* $Id: syscons.c,v 1.111 1999/01/30 12:17:38 phk Exp $
|
||||
*/
|
||||
|
||||
#include "sc.h"
|
||||
|
@ -721,7 +721,6 @@ scopen(dev_t dev, int flag, int mode, struct proc *p)
|
|||
{
|
||||
struct tty *tp = scdevtotty(dev);
|
||||
keyarg_t key;
|
||||
int s;
|
||||
|
||||
if (!tp)
|
||||
return(ENXIO);
|
||||
|
@ -745,12 +744,6 @@ scopen(dev_t dev, int flag, int mode, struct proc *p)
|
|||
(*linesw[tp->t_line].l_modem)(tp, 1);
|
||||
if (minor(dev) == SC_MOUSE)
|
||||
mouse_level = 0; /* XXX */
|
||||
if (minor(dev) < MAXCONS && console[minor(dev)] && scrn_blanked) {
|
||||
s = spltty();
|
||||
sc_touch_scrn_saver();
|
||||
sc_clean_up(console[minor(dev)]);
|
||||
splx(s);
|
||||
}
|
||||
}
|
||||
else
|
||||
if (tp->t_state & TS_XCLUDE && suser(p->p_ucred, &p->p_acflag))
|
||||
|
@ -822,6 +815,7 @@ scread(dev_t dev, struct uio *uio, int flag)
|
|||
|
||||
if (!tp)
|
||||
return(ENXIO);
|
||||
sc_touch_scrn_saver();
|
||||
return((*linesw[tp->t_line].l_read)(tp, uio, flag));
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue