From owner-svn-src-user@FreeBSD.ORG Wed Nov 13 12:34:25 2013 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 65F6BC7; Wed, 13 Nov 2013 12:34:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 559C22DB5; Wed, 13 Nov 2013 12:34:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rADCYPAZ021515; Wed, 13 Nov 2013 12:34:25 GMT (envelope-from ray@svn.freebsd.org) Received: (from ray@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rADCYPYk021514; Wed, 13 Nov 2013 12:34:25 GMT (envelope-from ray@svn.freebsd.org) Message-Id: <201311131234.rADCYPYk021514@svn.freebsd.org> From: Aleksandr Rybalko Date: Wed, 13 Nov 2013 12:34:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r258091 - user/ed/newcons/sys/dev/vt X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Nov 2013 12:34:25 -0000 Author: ray Date: Wed Nov 13 12:34:24 2013 New Revision: 258091 URL: http://svnweb.freebsd.org/changeset/base/258091 Log: Move vt_mouse_event out of sysmouse lock. Sponsored by: The FreeBSD Foundation Modified: user/ed/newcons/sys/dev/vt/vt_sysmouse.c Modified: user/ed/newcons/sys/dev/vt/vt_sysmouse.c ============================================================================== --- user/ed/newcons/sys/dev/vt/vt_sysmouse.c Wed Nov 13 12:32:41 2013 (r258090) +++ user/ed/newcons/sys/dev/vt/vt_sysmouse.c Wed Nov 13 12:34:24 2013 (r258091) @@ -138,7 +138,7 @@ sysmouse_process_event(mouse_info_t *mi) 0, }; unsigned char buf[MOUSE_SYS_PACKETSIZE]; - int x, y, z; + int x, y, iy, z; random_harvest(mi, sizeof *mi, 2, RANDOM_MOUSE); @@ -171,7 +171,6 @@ sysmouse_process_event(mouse_info_t *mi) if (sysmouse_status.flags == 0) goto done; - vt_mouse_event(mi->operation, x, y, mi->u.event.id, mi->u.event.value); /* The first five bytes are compatible with MouseSystems. */ buf[0] = MOUSE_MSC_SYNC | @@ -179,9 +178,9 @@ sysmouse_process_event(mouse_info_t *mi) x = imax(imin(x, 255), -256); buf[1] = x >> 1; buf[3] = x - buf[1]; - y = -imax(imin(y, 255), -256); - buf[2] = y >> 1; - buf[4] = y - buf[2]; + iy = -imax(imin(y, 255), -256); + buf[2] = iy >> 1; + buf[4] = iy - buf[2]; /* Extended part. */ z = imax(imin(z, 127), -128); buf[5] = (z >> 1) & 0x7f; @@ -190,6 +189,11 @@ sysmouse_process_event(mouse_info_t *mi) buf[7] = (~sysmouse_status.button >> 3) & 0x7f; sysmouse_buf_store(buf); + + mtx_unlock(&sysmouse_lock); + vt_mouse_event(mi->operation, x, y, mi->u.event.id, mi->u.event.value); + return; + done: mtx_unlock(&sysmouse_lock); }