From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:53553) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUIJQ-0001C6-6T for qemu-devel@nongnu.org; Mon, 22 Apr 2013 11:05:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UUIJL-0001ec-6D for qemu-devel@nongnu.org; Mon, 22 Apr 2013 11:05:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:16357) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UUIJK-0001eK-Dx for qemu-devel@nongnu.org; Mon, 22 Apr 2013 11:05:42 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r3MF5fSc017412 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 22 Apr 2013 11:05:41 -0400 From: Alon Levy Date: Mon, 22 Apr 2013 18:04:53 +0300 Message-Id: <1366643098-2566-24-git-send-email-alevy@redhat.com> In-Reply-To: <1366643098-2566-1-git-send-email-alevy@redhat.com> References: <1366643098-2566-1-git-send-email-alevy@redhat.com> Subject: [Qemu-devel] [PATCH v3 23/28] dev-smartcard-reader: change default protocol to T=0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mlureau@redhat.com We don't support T=1 so we shouldn't advertise it by default. Two independent changes: * Default ATR sets T=0. This gets overwritten by the client provided ATR later. * Class descriptor changes dwAdvertise dwProtocols.PPPP to 0x1 and dwProtocols.RRRR=0 per spec. Signed-off-by: Alon Levy --- hw/usb/dev-smartcard-reader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c index 0d482a9..8022f9f 100644 --- a/hw/usb/dev-smartcard-reader.c +++ b/hw/usb/dev-smartcard-reader.c @@ -335,8 +335,8 @@ static const uint8_t qemu_ccid_descriptor[] = { */ 0x07, /* u8 bVoltageSupport; 01h - 5.0v, 02h - 3.0, 03 - 1.8 */ - 0x03, 0x00, /* u32 dwProtocols; RRRR PPPP. RRRR = 0000h.*/ - 0x00, 0x00, /* PPPP: 0001h = Protocol T=0, 0002h = Protocol T=1 */ + 0x00, 0x00, /* u32 dwProtocols; RRRR PPPP. RRRR = 0000h.*/ + 0x01, 0x00, /* PPPP: 0001h = Protocol T=0, 0002h = Protocol T=1 */ /* u32 dwDefaultClock; in kHZ (0x0fa0 is 4 MHz) */ 0xa0, 0x0f, 0x00, 0x00, /* u32 dwMaximumClock; */ @@ -875,7 +875,7 @@ static const CCID_ProtocolDataStructure defaultProtocolDataStructure = { static void ccid_reset_parameters(USBCCIDState *s) { - s->bProtocolNum = 1; /* T=1 */ + s->bProtocolNum = 0; /* T=0 */ s->abProtocolDataStructure = defaultProtocolDataStructure; } -- 1.8.2