From nobody Thu May  2 20:07:44 2024
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
	spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
 permitted sender)
  smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
 mx.zohomail.com
	with SMTPS id 1679325873499938.265609096032;
 Mon, 20 Mar 2023 08:24:33 -0700 (PDT)
Received: from localhost ([::1] helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <qemu-devel-bounces@nongnu.org>)
	id 1peHMq-0004BB-OT; Mon, 20 Mar 2023 11:24:12 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <klaus.ripke@secunet.com>)
 id 1peHMl-00049T-MK; Mon, 20 Mar 2023 11:24:07 -0400
Received: from a.mx.secunet.com ([62.96.220.36])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <klaus.ripke@secunet.com>)
 id 1peHMh-0005ng-Gd; Mon, 20 Mar 2023 11:24:07 -0400
Received: from localhost (localhost [127.0.0.1])
 by a.mx.secunet.com (Postfix) with ESMTP id 2A14F200A3;
 Mon, 20 Mar 2023 16:23:57 +0100 (CET)
Received: from a.mx.secunet.com ([127.0.0.1])
 by localhost (a.mx.secunet.com [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id KD9popSaMhtN; Mon, 20 Mar 2023 16:23:56 +0100 (CET)
Received: from mailout1.secunet.com (mailout1.secunet.com [62.96.220.44])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by a.mx.secunet.com (Postfix) with ESMTPS id 615C32007F;
 Mon, 20 Mar 2023 16:23:56 +0100 (CET)
Received: from cas-essen-01.secunet.de (unknown [10.53.40.201])
 by mailout1.secunet.com (Postfix) with ESMTP id 5288980004A;
 Mon, 20 Mar 2023 16:23:56 +0100 (CET)
Received: from mbx-essen-01.secunet.de (10.53.40.197) by
 cas-essen-01.secunet.de (10.53.40.201) with Microsoft SMTP Server
 (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id
 15.1.2507.17; Mon, 20 Mar 2023 16:23:56 +0100
Received: from mbx-essen-01.secunet.de (10.53.40.197) by
 mbx-essen-01.secunet.de (10.53.40.197) with Microsoft SMTP Server
 (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id
 15.1.2507.17; Mon, 20 Mar 2023 16:23:55 +0100
Received: from mbx-essen-01.secunet.de ([fe80::1522:bd4f:78cd:ce75]) by
 mbx-essen-01.secunet.de ([fe80::1522:bd4f:78cd:ce75%6]) with mapi id
 15.01.2507.017; Mon, 20 Mar 2023 16:23:55 +0100
X-Virus-Scanned: by secunet
From: "Ripke, Klaus" <klaus.ripke@secunet.com>
To: "qemu-devel@nongnu.org" <qemu-devel@nongnu.org>
CC: "kraxel@redhat.com" <kraxel@redhat.com>, "qemu-trivial@nongnu.org"
 <qemu-trivial@nongnu.org>, "marcandre.lureau@gmail.com"
 <marcandre.lureau@gmail.com>
Subject: [PATCH v2] add option for a multislot usb ccid device
Thread-Topic: [PATCH v2] add option for a multislot usb ccid device
Thread-Index: AQHZWz/8wBBg4+O45E2yb5rRaBpvVg==
Date: Mon, 20 Mar 2023 15:23:55 +0000
Message-ID: <7f321e2fc335be07f44db3b539ee172dbdc4ed2d.camel@secunet.com>
Accept-Language: de-DE, en-US
Content-Language: en-US
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Content-Type: text/plain; charset="utf-8"
Content-ID: <3D0A4B9C6650C14EA566454CEDAA136B@secunet.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-EXCLAIMER-MD-CONFIG: 2c86f778-e09b-4440-8b15-867914633a10
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
 as permitted sender) client-ip=209.51.188.17;
 envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
 helo=lists.gnu.org;
Received-SPF: pass client-ip=62.96.220.36;
 envelope-from=klaus.ripke@secunet.com; helo=a.mx.secunet.com
X-Spam_score_int: -18
X-Spam_score: -1.9
X-Spam_bar: -
X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
 <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
 <mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZM-MESSAGEID: 1679325876204100003

Signed-off-by: Klaus Ripke <klaus.ripke@secunet.com>

hw/usb/dev-smartcard-reader.c:
add option for a multislot usb ccid device, similar to audio multi.

(v2 with slight formatting fix on " + ")

---
=C2=A0hw/usb/dev-smartcard-reader.c | 106 +++++++++++++++++++++++++++++++++-
=C2=A01 file changed, 103 insertions(+), 3 deletions(-)

diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-
reader.c
index be0a4fc3bc..30d8892b4e 100644
--- a/hw/usb/dev-smartcard-reader.c
+++ b/hw/usb/dev-smartcard-reader.c
@@ -90,10 +90,13 @@ OBJECT_DECLARE_SIMPLE_TYPE(USBCCIDState,
USB_CCID_DEV)
=C2=A0 *=C2=A0 usbccid.sys (winxp, others untested) is a class driver so it
doesn't care.
=C2=A0 *=C2=A0 linux has a number of class drivers, but openct filters base=
d on
=C2=A0 *=C2=A0=C2=A0 vendor/product (/etc/openct.conf under fedora), hence =
Gemplus.
+ * Use a Omnikey/HID 3121 with multislot for distinction.
=C2=A0 */
=C2=A0#define CCID_VENDOR_ID=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 0x08e6
=C2=A0#define CCID_PRODUCT_ID=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 0x4433
=C2=A0#define CCID_DEVICE_VERSION=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 0x0000
+#define CCID_VENDOR_ID_MULTI=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0 0x076b
+#define CCID_PRODUCT_ID_MULTI=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0 0x3021
=C2=A0
=C2=A0/*
=C2=A0 * BULK_OUT messages from PC to Reader
@@ -312,7 +315,9 @@ struct USBCCIDState {
=C2=A0=C2=A0=C2=A0=C2=A0 uint8_t=C2=A0 bmSlotICCState;
=C2=A0=C2=A0=C2=A0=C2=A0 uint8_t=C2=A0 powered;
=C2=A0=C2=A0=C2=A0=C2=A0 uint8_t=C2=A0 notify_slot_change;
+=C2=A0=C2=A0=C2=A0 /* properties */
=C2=A0=C2=A0=C2=A0=C2=A0 uint8_t=C2=A0 debug;
+=C2=A0=C2=A0=C2=A0 bool=C2=A0=C2=A0=C2=A0=C2=A0 multi;
=C2=A0};
=C2=A0
=C2=A0/*
@@ -411,6 +416,34 @@ static const uint8_t qemu_ccid_descriptor[] =3D {
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 0x01,=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0 /* u8=C2=A0 bMaxCCIDBusySlots; */
=C2=A0};
=C2=A0
+static const uint8_t qemu_ccid_descriptor_multi[] =3D {
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 /* Smart Card Device Class Desc=
riptor */
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 0x36,=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0 /* u8=C2=A0 bLength; */
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 0x21,=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0 /* u8=C2=A0 bDescriptorType; Functional */
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 0x10, 0x01, /* u16 bcdCCID; CCI=
D Specification Release Number.
*/
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 0x0e,=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0 /* u8=C2=A0 bMaxSlotIndex; 14, as 16 slots can cause
trouble. */
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 0x07,=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0 /* u8=C2=A0 bVoltageSupport; 01h - 5.0v, 02h - 3.0, 03
- 1.8 */
+
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 0x01, 0x00, /* u32 dwProtocols;=
 RRRR PPPP. RRRR =3D 0000h.*/
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 0x00, 0x00, /* PPPP: see above =
*/
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 0xa0, 0x0f, 0x00, 0x00, /* u32 =
dwMaximumClock; */
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 0x00, 0x00, 0x01, 0x00,
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 0x00, /* u8 bNumClockSupported;=
 see above */
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 0x80, 0x25, 0x00, 0x00, /* u32 =
dwMaxDataRate ; see above */
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 0x00, 0xC2, 0x01, 0x00,
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 0x00,=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0 /* u8=C2=A0 bNumDataRatesSupported; see above */
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 0xfe, 0x00, 0x00, 0x00, /* u32 =
dwMaxIFSD; see above */
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 0x00, 0x00, 0x00, 0x00, /* u32 =
dwSyncProtocols; see above */
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 0x00, 0x00, 0x00, 0x00, /* u32 =
dwMechanical; see above */
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 0xfe, 0x04, 0x04, 0x00, /* u32 =
dwFeatures; 400 for better
compat. */
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 0x12, 0x00, 0x01, 0x00, /* u32 =
dwMaxCCIDMessageLength; see
above */
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 0xFF,=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0 /* u8=C2=A0 bClassGetResponse; see above */
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 0xFF,=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0 /* u8=C2=A0 bClassEnvelope; see above */
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 0x00, 0x00, /* u16 wLcdLayout; =
see above */
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 0x01,=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0 /* u8=C2=A0 bPINSupport; see above */
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 0x0f,=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0 /* u8=C2=A0 bMaxCCIDBusySlots; modified from 1 */
+};
+
=C2=A0enum {
=C2=A0=C2=A0=C2=A0=C2=A0 STR_MANUFACTURER =3D 1,
=C2=A0=C2=A0=C2=A0=C2=A0 STR_PRODUCT,
@@ -457,6 +490,38 @@ static const USBDescIface desc_iface0 =3D {
=C2=A0=C2=A0=C2=A0=C2=A0 }
=C2=A0};
=C2=A0
+static const USBDescIface desc_iface0_multi =3D {
+=C2=A0=C2=A0=C2=A0 .bInterfaceNumber=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D 0,
+=C2=A0=C2=A0=C2=A0 .bNumEndpoints=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D 3,
+=C2=A0=C2=A0=C2=A0 .bInterfaceClass=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D USB_CLASS_CSCID,
+=C2=A0=C2=A0=C2=A0 .bInterfaceSubClass=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D USB_SUBCLASS_UNDEFINED,
+=C2=A0=C2=A0=C2=A0 .bInterfaceProtocol=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D 0x00,
+=C2=A0=C2=A0=C2=A0 .iInterface=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =
=3D STR_INTERFACE,
+=C2=A0=C2=A0=C2=A0 .ndesc=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0 =3D 1,
+=C2=A0=C2=A0=C2=A0 .descs =3D (USBDescOther[]) {
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 {
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 /* smar=
tcard descriptor */
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .data =
=3D qemu_ccid_descriptor_multi,
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 },
+=C2=A0=C2=A0=C2=A0 },
+=C2=A0=C2=A0=C2=A0 .eps =3D (USBDescEndpoint[]) {
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 {
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .bEndpo=
intAddress=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D USB_DIR_IN | CCID_INT_IN_EP,
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .bmAttr=
ibutes=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D USB_ENDPOI=
NT_XFER_INT,
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .bInter=
val=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
 =3D 255,
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .wMaxPa=
cketSize=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D 64,
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 },{
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .bEndpo=
intAddress=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D USB_DIR_IN | CCID_BULK_IN_EP,
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .bmAttr=
ibutes=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D USB_ENDPOI=
NT_XFER_BULK,
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .wMaxPa=
cketSize=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D 64,
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 },{
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .bEndpo=
intAddress=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D USB_DIR_OUT | CCID_BULK_OUT_EP,
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .bmAttr=
ibutes=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D USB_ENDPOI=
NT_XFER_BULK,
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .wMaxPa=
cketSize=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D 64,
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 },
+=C2=A0=C2=A0=C2=A0 }
+};
+
=C2=A0static const USBDescDevice desc_device =3D {
=C2=A0=C2=A0=C2=A0=C2=A0 .bcdUSB=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0 =3D 0x0110,
=C2=A0=C2=A0=C2=A0=C2=A0 .bMaxPacketSize0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D 64,
@@ -474,6 +539,23 @@ static const USBDescDevice desc_device =3D {
=C2=A0=C2=A0=C2=A0=C2=A0 },
=C2=A0};
=C2=A0
+static const USBDescDevice desc_device_multi =3D {
+=C2=A0=C2=A0=C2=A0 .bcdUSB=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0 =3D 0x0110,
+=C2=A0=C2=A0=C2=A0 .bMaxPacketSize0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D 64,
+=C2=A0=C2=A0=C2=A0 .bNumConfigurations=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D 1,
+=C2=A0=C2=A0=C2=A0 .confs =3D (USBDescConfig[]) {
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 {
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .bNumIn=
terfaces=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D 1,
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .bConfi=
gurationValue=C2=A0=C2=A0 =3D 1,
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .bmAttr=
ibutes=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D USB_CFG_AT=
T_ONE |
USB_CFG_ATT_SELFPOWER |
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 USB_C=
FG_ATT_WAKEUP,
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .bMaxPo=
wer=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
 =3D 50,
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .nif =
=3D 1,
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .ifs =
=3D &desc_iface0_multi,
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 },
+=C2=A0=C2=A0=C2=A0 },
+};
+
=C2=A0static const USBDesc desc_ccid =3D {
=C2=A0=C2=A0=C2=A0=C2=A0 .id =3D {
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .idVendor=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D CCID_VENDOR_ID,
@@ -487,6 +569,19 @@ static const USBDesc desc_ccid =3D {
=C2=A0=C2=A0=C2=A0=C2=A0 .str=C2=A0 =3D desc_strings,
=C2=A0};
=C2=A0
+static const USBDesc desc_ccid_multi =3D {
+=C2=A0=C2=A0=C2=A0 .id =3D {
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .idVendor=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D CCID_VENDOR_ID_MULTI,
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .idProduct=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D CCID_PRODUCT_ID_MULTI,
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .bcdDevice=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D CCID_DEVICE_VERSION,
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .iManufacturer=C2=A0=C2=A0=C2=
=A0=C2=A0 =3D STR_MANUFACTURER,
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .iProduct=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D STR_PRODUCT,
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 .iSerialNumber=C2=A0=C2=A0=C2=
=A0=C2=A0 =3D STR_SERIALNUMBER,
+=C2=A0=C2=A0=C2=A0 },
+=C2=A0=C2=A0=C2=A0 .full =3D &desc_device_multi,
+=C2=A0=C2=A0=C2=A0 .str=C2=A0 =3D desc_strings,
+};
+
=C2=A0static const uint8_t *ccid_card_get_atr(CCIDCardState *card, uint32_t
*len)
=C2=A0{
=C2=A0=C2=A0=C2=A0=C2=A0 CCIDCardClass *cc =3D CCID_CARD_GET_CLASS(card);
@@ -1293,10 +1388,12 @@ static void ccid_card_realize(DeviceState
*qdev, Error **errp)
=C2=A0=C2=A0=C2=A0=C2=A0 USBDevice *dev =3D USB_DEVICE(qdev->parent_bus->pa=
rent);
=C2=A0=C2=A0=C2=A0=C2=A0 USBCCIDState *s =3D USB_CCID_DEV(dev);
=C2=A0=C2=A0=C2=A0=C2=A0 Error *local_err =3D NULL;
+=C2=A0=C2=A0=C2=A0 const USBDesc *desc =3D usb_device_get_usb_desc(dev);
+=C2=A0=C2=A0=C2=A0 uint8_t bMaxSlotIndex =3D desc->full->confs[0].ifs-
>descs[0].data[4];
=C2=A0
-=C2=A0=C2=A0=C2=A0 if (card->slot !=3D 0) {
-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 error_setg(errp, "usb-ccid supp=
orts one slot, can't add %d",
-=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 card->slot);
+=C2=A0=C2=A0=C2=A0 if (card->slot > bMaxSlotIndex) {
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 error_setg(errp, "usb-ccid supp=
orts %d slots, can't add %d",
+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 bMaxSlotIndex + 1, card->slot);
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return;
=C2=A0=C2=A0=C2=A0=C2=A0 }
=C2=A0=C2=A0=C2=A0=C2=A0 if (s->card !=3D NULL) {
@@ -1317,6 +1414,8 @@ static void ccid_realize(USBDevice *dev, Error
**errp)
=C2=A0{
=C2=A0=C2=A0=C2=A0=C2=A0 USBCCIDState *s =3D USB_CCID_DEV(dev);
=C2=A0
+=C2=A0=C2=A0=C2=A0 dev->usb_desc =3D s->multi ? &desc_ccid_multi : &desc_c=
cid;
+
=C2=A0=C2=A0=C2=A0=C2=A0 usb_desc_create_serial(dev);
=C2=A0=C2=A0=C2=A0=C2=A0 usb_desc_init(dev);
=C2=A0=C2=A0=C2=A0=C2=A0 qbus_init(&s->bus, sizeof(s->bus), TYPE_CCID_BUS, =
DEVICE(dev),
NULL);
@@ -1433,6 +1532,7 @@ static const VMStateDescription ccid_vmstate =3D {
=C2=A0
=C2=A0static Property ccid_properties[] =3D {
=C2=A0=C2=A0=C2=A0=C2=A0 DEFINE_PROP_UINT8("debug", USBCCIDState, debug, 0),
+=C2=A0=C2=A0=C2=A0 DEFINE_PROP_BOOL("multi", USBCCIDState, multi, false),
=C2=A0=C2=A0=C2=A0=C2=A0 DEFINE_PROP_END_OF_LIST(),
=C2=A0};
=C2=A0
--=20
2.34.1

--=20
Klaus Ripke
Senior Developer
Public Authorities Division
secunet Security Networks AG

Telefon:  +49 201 5454-2982