[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 05/10] dev-smartcard-reader: change default proto
From: |
Alon Levy |
Subject: |
[Qemu-devel] [PATCH v2 05/10] dev-smartcard-reader: change default protocol to T=0 |
Date: |
Wed, 27 Mar 2013 22:36:30 +0200 |
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 <address@hidden>
---
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 014c0b1..bb96f02 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.1.4
- [Qemu-devel] [PATCH v2 00/10] ccid and libcacard fixes for windows/mingw, Alon Levy, 2013/03/27
- [Qemu-devel] [PATCH v2 01/10] libcacard: change default ATR, Alon Levy, 2013/03/27
- [Qemu-devel] [PATCH v2 02/10] ccid-card-passthru: add atr check, Alon Levy, 2013/03/27
- [Qemu-devel] [PATCH v2 03/10] ccid-card-passthru, dev-smartcard-reader: add debug environment variables, Alon Levy, 2013/03/27
- [Qemu-devel] [PATCH v2 04/10] dev-smartcard-reader: define structs for CCID_Parameter internals, Alon Levy, 2013/03/27
- [Qemu-devel] [PATCH v2 05/10] dev-smartcard-reader: change default protocol to T=0,
Alon Levy <=
- [Qemu-devel] [PATCH v2 06/10] dev-smartcard-reader: copy atr protocol to ccid parameters, Alon Levy, 2013/03/27
- [Qemu-devel] [PATCH v2 07/10] libcacard/vreader: add debugging messages for apdu, Alon Levy, 2013/03/27
- [Qemu-devel] [PATCH v2 08/10] libcacard: move atr setting from macro to function, Alon Levy, 2013/03/27
- [Qemu-devel] [PATCH v2 10/10] libcacard/cac: change big switch functions to single return point, Alon Levy, 2013/03/27
- [Qemu-devel] [PATCH v2 09/10] dev-smartcard-reader: empty implementation for Mechanical (fail correctly), Alon Levy, 2013/03/27