From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34420) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dOM0F-0002ni-RY for qemu-devel@nongnu.org; Fri, 23 Jun 2017 06:39:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dOM0D-00055x-AT for qemu-devel@nongnu.org; Fri, 23 Jun 2017 06:39:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57004) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dOM0D-00055a-4c for qemu-devel@nongnu.org; Fri, 23 Jun 2017 06:39:49 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 141E243A29 for ; Fri, 23 Jun 2017 10:39:48 +0000 (UTC) From: Gerd Hoffmann Date: Fri, 23 Jun 2017 12:39:44 +0200 Message-Id: <20170623103945.7014-7-kraxel@redhat.com> In-Reply-To: <20170623103945.7014-1-kraxel@redhat.com> References: <20170623103945.7014-1-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 6/7] ps2: add ps2_reset_queue List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Factor out ps2 queue reset to a separate function. No functional change. Signed-off-by: Gerd Hoffmann Message-id: 20170606112105.13331-3-kraxel@redhat.com --- hw/input/ps2.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/hw/input/ps2.c b/hw/input/ps2.c index 37f8cb842e..2416b58cc0 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -551,6 +551,15 @@ static uint8_t translate_table[256] = { 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff, }; +static void ps2_reset_queue(PS2State *s) +{ + PS2Queue *q = &s->queue; + + q->rptr = 0; + q->wptr = 0; + q->count = 0; +} + void ps2_queue(PS2State *s, int b) { PS2Queue *q = &s->queue; @@ -1079,12 +1088,8 @@ void ps2_write_mouse(void *opaque, int val) static void ps2_common_reset(PS2State *s) { - PS2Queue *q; s->write_cmd = -1; - q = &s->queue; - q->rptr = 0; - q->wptr = 0; - q->count = 0; + ps2_reset_queue(s); s->update_irq(s->update_arg, 0); } -- 2.9.3