From patchwork Tue Mar 13 12:20:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 146410 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0257FB6EEC for ; Wed, 14 Mar 2012 00:42:30 +1100 (EST) Received: from localhost ([::1]:54120 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7Qjf-0001js-Ta for incoming@patchwork.ozlabs.org; Tue, 13 Mar 2012 08:21:51 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40320) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7Qij-0007vl-1b for qemu-devel@nongnu.org; Tue, 13 Mar 2012 08:20:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S7QiC-0000x7-K3 for qemu-devel@nongnu.org; Tue, 13 Mar 2012 08:20:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39293) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7QiC-0000wl-CA for qemu-devel@nongnu.org; Tue, 13 Mar 2012 08:20:20 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q2DCKJee007969 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 13 Mar 2012 08:20:19 -0400 Received: from rincewind.home.kraxel.org (ovpn-116-19.ams2.redhat.com [10.36.116.19]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q2DCKEmm019159; Tue, 13 Mar 2012 08:20:18 -0400 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id D0D5F42890; Tue, 13 Mar 2012 13:20:12 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2012 13:20:09 +0100 Message-Id: <1331641211-20077-13-git-send-email-kraxel@redhat.com> In-Reply-To: <1331641211-20077-1-git-send-email-kraxel@redhat.com> References: <1331641211-20077-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 12/14] uhci: new uhci_handle_td return code for tds still in flight X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Gerd Hoffmann --- hw/usb/hcd-uhci.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c index fd50be1..8e34961 100644 --- a/hw/usb/hcd-uhci.c +++ b/hw/usb/hcd-uhci.c @@ -81,7 +81,8 @@ enum { TD_RESULT_STOP_FRAME = 10, TD_RESULT_COMPLETE, TD_RESULT_NEXT_QH, - TD_RESULT_ASYNC, + TD_RESULT_ASYNC_START, + TD_RESULT_ASYNC_CONT, }; typedef struct UHCIState UHCIState; @@ -812,7 +813,7 @@ static int uhci_handle_td(UHCIState *s, uint32_t addr, UHCI_TD *td, uint32_t *in async->queue->valid = 32; if (!async->done) - return TD_RESULT_NEXT_QH; + return TD_RESULT_ASYNC_CONT; uhci_async_unlink(async); goto done; @@ -860,7 +861,7 @@ static int uhci_handle_td(UHCIState *s, uint32_t addr, UHCI_TD *td, uint32_t *in if (len == USB_RET_ASYNC) { uhci_async_link(async); - return TD_RESULT_ASYNC; + return TD_RESULT_ASYNC_START; } async->packet.result = len; @@ -966,7 +967,7 @@ static void uhci_fill_queue(UHCIState *s, UHCI_TD *td) } trace_usb_uhci_td_queue(plink & ~0xf, ptd.ctrl, ptd.token); ret = uhci_handle_td(s, plink, &ptd, &int_mask); - assert(ret == TD_RESULT_ASYNC); + assert(ret == TD_RESULT_ASYNC_START); assert(int_mask == 0); plink = ptd.link; } @@ -1058,11 +1059,12 @@ static void uhci_process_frame(UHCIState *s) goto out; case TD_RESULT_NEXT_QH: + case TD_RESULT_ASYNC_CONT: trace_usb_uhci_td_nextqh(curr_qh & ~0xf, link & ~0xf); link = curr_qh ? qh.link : td.link; continue; - case TD_RESULT_ASYNC: + case TD_RESULT_ASYNC_START: trace_usb_uhci_td_async(curr_qh & ~0xf, link & ~0xf); if (is_valid(td.link)) { uhci_fill_queue(s, &td);