diff options
| author | Alon Levy <alevy@redhat.com> | 2013-03-27 10:14:15 +0200 |
|---|---|---|
| committer | Alon Levy <alevy@redhat.com> | 2013-04-24 11:47:59 +0300 |
| commit | d7d218ef02d87c637d20d64da8f575d434ff6f78 (patch) | |
| tree | e91b5145407838288e6b9b6f67ec83b872ecd2f0 | |
| parent | 4942d6c39477f441a106430ab11f85806b4532f5 (diff) | |
dev-smartcard-reader: change default protocol to T=0
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>
| -rw-r--r-- | hw/usb/dev-smartcard-reader.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c index 0d482a972..8022f9f77 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; } |