18389bf646
Fix crash in lsi_soft_reset (bz #1000947) Fix crash in scsi_dma_complete (bz #1001617) Fix initial /dev/kvm permissions (bz #993491)
48 lines
1.9 KiB
Diff
48 lines
1.9 KiB
Diff
From 4a70750aabe57e3a24d16fd1c82acc7f1c6f66f0 Mon Sep 17 00:00:00 2001
|
|
From: Alon Levy <alevy@redhat.com>
|
|
Date: Wed, 27 Mar 2013 10:14:15 +0200
|
|
Subject: [PATCH] dev-smartcard-reader: change default protocol to T=0
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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 <alevy@redhat.com>
|
|
Reviewed-by: Marc-André Lureau <mlureau@redhat.com>
|
|
(cherry picked from commit d7d218ef02d87c637d20d64da8f575d434ff6f78)
|
|
---
|
|
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 f2cab09..e97dfcb 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;
|
|
}
|
|
|