From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:49769) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rn50I-0007is-QV for qemu-devel@nongnu.org; Tue, 17 Jan 2012 04:07:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rn50C-0005j1-BS for qemu-devel@nongnu.org; Tue, 17 Jan 2012 04:06:54 -0500 Received: from mx1.redhat.com ([209.132.183.28]:22290) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rn50B-0005is-UL for qemu-devel@nongnu.org; Tue, 17 Jan 2012 04:06:48 -0500 Message-ID: <4F153A19.3080209@redhat.com> Date: Tue, 17 Jan 2012 10:06:33 +0100 From: Gerd Hoffmann MIME-Version: 1.0 References: <1326449914-8591-1-git-send-email-kraxel@redhat.com> <4F104B96.1020707@codemonkey.ws> In-Reply-To: <4F104B96.1020707@codemonkey.ws> Content-Type: multipart/mixed; boundary="------------080604000305090407090403" Subject: Re: [Qemu-devel] [PULL 00/17] usb patch queue: audio, xhci, usbredir List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu-devel@nongnu.org This is a multi-part message in MIME format. --------------080604000305090407090403 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by mx1.redhat.com id q0H96jYC026770 On 01/13/12 16:19, Anthony Liguori wrote: > On 01/13/2012 04:18 AM, Gerd Hoffmann wrote: >> Hi, >> >> Here comes the usb patch queue. It features the patches posted a week >> ago for review with some minor tweaks according to the review comments= : >> The comment in usb-audio was fixed and xhci got a codestyle cleanup. = No >> actual code changes. I've also included the usb-redir patches posted = by >> Hans earlier this week. >> >=20 > cc1: warnings being treated as errors > /home/anthony/git/qemu/hw/usb-xhci.c: In function =91xhci_process_comma= nds=92: > /home/anthony/git/qemu/hw/usb-xhci.c:2143:9: error: case value =9148=92= not > in enumerated type =91TRBType=92 > /home/anthony/git/qemu/hw/usb-xhci.c:2147:9: error: case value =9149=92= not > in enumerated type =91TRBType=92 > /home/anthony/git/qemu/hw/usb-xhci.c:2152:9: error: case value =9150=92= not > in enumerated type =91TRBType=92 > make[1]: *** [usb-xhci.o] Error 1 Fixed & pushed to git://git.kraxel.org/qemu usb.37 diff between usb.36 and usb.37 attached for reference. cheers, Gerd --------------080604000305090407090403 Content-Type: text/plain; name="xhci-warnfix.diff" Content-Disposition: attachment; filename="xhci-warnfix.diff" Content-Transfer-Encoding: 7bit diff --git a/hw/usb-xhci.c b/hw/usb-xhci.c index 0c5007b..28fe9de 100644 --- a/hw/usb-xhci.c +++ b/hw/usb-xhci.c @@ -177,7 +177,11 @@ typedef enum TRBType { ER_DOORBELL, ER_HOST_CONTROLLER, ER_DEVICE_NOTIFICATION, - ER_MFINDEX_WRAP + ER_MFINDEX_WRAP, + /* vendor specific bits */ + CR_VENDOR_VIA_CHALLENGE_RESPONSE = 48, + CR_VENDOR_NEC_FIRMWARE_REVISION = 49, + CR_VENDOR_NEC_CHALLENGE_RESPONSE = 50, } TRBType; #define CR_LINK TR_LINK @@ -2140,18 +2144,15 @@ static void xhci_process_commands(XHCIState *xhci) case CR_GET_PORT_BANDWIDTH: event.ccode = xhci_get_port_bandwidth(xhci, trb.parameter); break; - case 48: - /* VIA challenge response */ + case CR_VENDOR_VIA_CHALLENGE_RESPONSE: xhci_via_challenge(trb.parameter); break; - case 49: - /* NEC get FW revision */ + case CR_VENDOR_NEC_FIRMWARE_REVISION: event.type = 48; /* NEC reply */ event.length = 0x3025; break; - case 50: + case CR_VENDOR_NEC_CHALLENGE_RESPONSE: { - /* NEC challenge response */ uint32_t chi = trb.parameter >> 32; uint32_t clo = trb.parameter; uint32_t val = xhci_nec_challenge(chi, clo); --------------080604000305090407090403--