From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O5DhZ-00025p-EK for qemu-devel@nongnu.org; Fri, 23 Apr 2010 03:53:29 -0400 Received: from [140.186.70.92] (port=35030 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O5DhP-00023O-Ui for qemu-devel@nongnu.org; Fri, 23 Apr 2010 03:53:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O5DhN-0001u0-7f for qemu-devel@nongnu.org; Fri, 23 Apr 2010 03:53:19 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:59670) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O5DhM-0001tU-No for qemu-devel@nongnu.org; Fri, 23 Apr 2010 03:53:17 -0400 Message-ID: <4BD151E8.9010502@web.de> Date: Fri, 23 Apr 2010 09:53:12 +0200 From: Jan Kiszka MIME-Version: 1.0 References: <1271822008-22337-1-git-send-email-daahern@cisco.com> In-Reply-To: <1271822008-22337-1-git-send-email-daahern@cisco.com> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig59627EF7FAB0E494ED31F437" Sender: jan.kiszka@web.de Subject: [Qemu-devel] Re: [PATCH] ehci: minor updates/bugfixes to debug statements List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Ahern Cc: qemu-devel@nongnu.org This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig59627EF7FAB0E494ED31F437 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable David Ahern wrote: > Minor updates/bugfixes to debug statements. >=20 > Signed-off-by: David Ahern Thanks, applied to 'ehci'. Jan >=20 > --- > hw/usb-ehci.c | 24 ++++++++++++------------ > 1 files changed, 12 insertions(+), 12 deletions(-) >=20 > diff --git a/hw/usb-ehci.c b/hw/usb-ehci.c > index 218d590..c91a6b5 100644 > --- a/hw/usb-ehci.c > +++ b/hw/usb-ehci.c > @@ -899,7 +899,7 @@ static int ehci_buffer_rw(uint8_t *buffer, EHCIqh *= qh, int bytes, int rw) > } > =20 > offset =3D qh->bufptr[0] & ~QTD_BUFPTR_MASK; > - DPRINTF("ehci_buffer_rw: %sing %d bytes %08x cpage %d offset\n", > + DPRINTF("ehci_buffer_rw: %sing %d bytes %08x cpage %d offset %d\n"= , > rw ? "writ" : "read", bytes, qh->bufptr[0], cpage, offset);= > =20 > do { > @@ -962,8 +962,8 @@ static int ehci_execute_complete(EHCIState *ehci, > i =3D ehci->async_port_in_progress; > ehci->async_port_in_progress =3D -1; > =20 > - DPRINTF("execute_complete: qhaddr 0x%x, qtdaddr 0x%x, status %d\n"= , > - ehci->qhaddr, ehci->qtdaddr, ret); > + DPRINTF("execute_complete: qhaddr 0x%x, next %x, qtdaddr 0x%x, sta= tus %d\n", > + ehci->qhaddr, qh->next, ehci->qtdaddr, ret); > =20 > if (ret < 0) { > err: > @@ -1139,8 +1139,8 @@ static int ehci_execute(EHCIState *ehci, EHCIqh *= qh) > =20 > ret =3D dev->info->handle_packet(dev, &ehci->usb_packet); > =20 > - DPRINTF("submit: qh %x qtd %x pid %x len %d (total %d) endp %x= ret %d\n", > - ehci->qhaddr, ehci->qtdaddr, ehci->pid, > + DPRINTF("submit: qh %x next %x qtd %x pid %x len %d (total %d)= endp %x ret %d\n", > + ehci->qhaddr, qh->next, ehci->qtdaddr, ehci->pid, > ehci->usb_packet.len, ehci->tbytes, endp, ret); > =20 > if (ret !=3D USB_RET_NODEV) > @@ -1372,14 +1372,14 @@ static int ehci_state_fetchentry(EHCIState *ehc= i, int async, int *state) > =20 > switch (NLPTR_TYPE_GET(entry)) { > case NLPTR_TYPE_QH: > - DPRINTF_ST("FETCHENTRY: entry %X is a Queue Head\n", *entry); > + DPRINTF_ST("FETCHENTRY: entry %X is a Queue Head\n", entry); > *state =3D EST_FETCHQH; > ehci->qhaddr =3D entry; > again =3D 1; > break; > =20 > case NLPTR_TYPE_ITD: > - DPRINTF_ST("FETCHENTRY: entry %X is an ITD\n", *entry); > + DPRINTF_ST("FETCHENTRY: entry %X is an ITD\n", entry); > *state =3D EST_FETCHITD; > ehci->itdaddr =3D entry; > again =3D 1; > @@ -1416,7 +1416,7 @@ static int ehci_state_fetchqh(EHCIState *ehci, in= t async, int *state) > } > } > =20 > -#if 0 > +#if EHCI_DEBUG > if (ehci->qhaddr !=3D qh->next) { > DPRINTF("FETCHQH: QH 0x%08x (h %x halt %x active %x) next 0x%08x\= n", > ehci->qhaddr,=20 > @@ -1495,9 +1495,9 @@ static int ehci_state_advqueue(EHCIState *ehci, i= nt async, int *state) > if (((ehci->qh.token & QTD_TOKEN_TBYTES_MASK) !=3D 0) && > (NLPTR_TBIT(ehci->qh.altnext_qtd) =3D=3D 0)) { > DPRINTF_ST("ADVQUEUE: goto alt next qTD. " > - "curr 0x%08x next 0x%08x alt 0x%08x\n", > + "curr 0x%08x next 0x%08x alt 0x%08x (next qh %x)\n"= , > ehci->qh.current_qtd, ehci->qh.altnext_qtd, > - ehci->qh.next_qtd); > + ehci->qh.next_qtd, ehci->qh.next); > ehci->qtdaddr =3D ehci->qh.altnext_qtd; > *state =3D EST_FETCHQTD; > =20 > @@ -1505,9 +1505,9 @@ static int ehci_state_advqueue(EHCIState *ehci, i= nt async, int *state) > * next qTD is valid > */ > } else if (NLPTR_TBIT(ehci->qh.next_qtd) =3D=3D 0) { > - DPRINTF_ST("ADVQUEUE: next qTD. curr 0x%08x next 0x%08x alt 0x= %08x\n", > + DPRINTF_ST("ADVQUEUE: next qTD. curr 0x%08x next 0x%08x alt 0x= %08x (next qh %x)\n", > ehci->qh.current_qtd, ehci->qh.altnext_qtd,=20 > - ehci->qh.next_qtd); > + ehci->qh.next_qtd, ehci->qh.next); > ehci->qtdaddr =3D ehci->qh.next_qtd; > *state =3D EST_FETCHQTD; > =20 --------------enig59627EF7FAB0E494ED31F437 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org iEYEARECAAYFAkvRUegACgkQitSsb3rl5xRcmQCgzbpAg/6/3pIj4KG0Udkop8U7 WWwAnA6x6NNOwfZr8JO6vT3+pk4tm8gM =TX4W -----END PGP SIGNATURE----- --------------enig59627EF7FAB0E494ED31F437--