qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Hans de Goede <hdegoede@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH 03/14] usb-ehci: drop unused isoch_pause variable
Date: Tue, 13 Mar 2012 13:20:00 +0100	[thread overview]
Message-ID: <1331641211-20077-4-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1331641211-20077-1-git-send-email-kraxel@redhat.com>

From: Hans de Goede <hdegoede@redhat.com>

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/usb/hcd-ehci.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
index 58811d3..60f9f5b 100644
--- a/hw/usb/hcd-ehci.c
+++ b/hw/usb/hcd-ehci.c
@@ -419,7 +419,6 @@ struct EHCIState {
 
     USBPacket ipacket;
     QEMUSGList isgl;
-    int isoch_pause;
 
     uint64_t last_run_ns;
 };
@@ -907,7 +906,6 @@ static void ehci_reset(void *opaque)
 
     s->astate = EST_INACTIVE;
     s->pstate = EST_INACTIVE;
-    s->isoch_pause = -1;
     s->attach_poll_counter = 0;
 
     for(i = 0; i < NB_PORTS; i++) {
@@ -2150,9 +2148,7 @@ static void ehci_frame_timer(void *opaque)
 
     for (i = 0; i < frames; i++) {
         if ( !(ehci->usbsts & USBSTS_HALT)) {
-            if (ehci->isoch_pause <= 0) {
-                ehci->frindex += 8;
-            }
+            ehci->frindex += 8;
 
             if (ehci->frindex > 0x00001fff) {
                 ehci->frindex = 0;
-- 
1.7.1

  parent reply	other threads:[~2012-03-13 12:20 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-03-13 12:19 [Qemu-devel] [PULL 00/14] usb patch queue Gerd Hoffmann
2012-03-13 12:19 ` [Qemu-devel] [PATCH 01/14] usb: the big rename Gerd Hoffmann
2012-03-13 13:29   ` Hans de Goede
2012-03-13 12:19 ` [Qemu-devel] [PATCH 02/14] usb: zap hw/ush-{ohic, uhci}.h + init wrappers Gerd Hoffmann
2012-03-13 12:20 ` Gerd Hoffmann [this message]
2012-03-13 12:20 ` [Qemu-devel] [PATCH 04/14] usb-ohci: DMA writeback bug fixes Gerd Hoffmann
2012-03-13 12:20 ` [Qemu-devel] [PATCH 05/14] usb: improve packet state sanity checks Gerd Hoffmann
2012-03-13 12:20 ` [Qemu-devel] [PATCH 06/14] uhci: pass addr to uhci_async_alloc Gerd Hoffmann
2012-03-13 12:20 ` [Qemu-devel] [PATCH 07/14] uhci: fix uhci_async_cancel_all Gerd Hoffmann
2012-03-13 12:20 ` [Qemu-devel] [PATCH 08/14] uhci: cancel on schedule stop Gerd Hoffmann
2012-03-13 12:20 ` [Qemu-devel] [PATCH 09/14] uhci: tracing support Gerd Hoffmann
2012-03-13 12:20 ` [Qemu-devel] [PATCH 10/14] uhci: use enum for uhci_handle_td return codes Gerd Hoffmann
2012-03-13 12:20 ` [Qemu-devel] [PATCH 11/14] uhci: renumber " Gerd Hoffmann
2012-03-13 12:20 ` [Qemu-devel] [PATCH 12/14] uhci: new uhci_handle_td return code for tds still in flight Gerd Hoffmann
2012-03-13 12:20 ` [Qemu-devel] [PATCH 13/14] uhci: alloc can't fail, drop check Gerd Hoffmann
2012-03-13 12:20 ` [Qemu-devel] [PATCH 14/14] Endian fix an assertion in usb-msd Gerd Hoffmann
2012-03-13 19:55 ` [Qemu-devel] [PULL 00/14] usb patch queue Anthony Liguori

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1331641211-20077-4-git-send-email-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=hdegoede@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).