From 38040ffee81e3c7a6972c9eae42af44eaaeb6ce6 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Mon, 26 Oct 2020 11:38:47 +0900 Subject: [PATCH] scd: Internal CCID driver thing only for SPR532. * scd/ccid-driver.c (ccid_vendor_specific_setup): New. Limit only for SPR532, excluding other readers by SCM. (ccid_slot_status): Use ccid_vendor_specific_setup. -- We follow the setup procedure of libccid implementation, which sends the escape command for SPR532 only. Signed-off-by: NIIBE Yutaka --- scd/ccid-driver.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c index 00b81ea0a..de2f4ae95 100644 --- a/scd/ccid-driver.c +++ b/scd/ccid-driver.c @@ -1299,6 +1299,19 @@ ccid_vendor_specific_init (ccid_driver_t handle) } +static int +ccid_vendor_specific_setup (ccid_driver_t handle) +{ + if (handle->id_vendor == VENDOR_SCM && handle->id_product == SCM_SPR532) + { + DEBUGOUT ("sending escape sequence to switch to a case 1 APDU\n"); + send_escape_cmd (handle, (const unsigned char*)"\x80\x02\x00", 3, + NULL, 0, NULL); + } + return 0; +} + + #define MAX_DEVICE 4 /* See MAX_READER in apdu.c. */ struct ccid_dev_table { @@ -2428,12 +2441,7 @@ ccid_slot_status (ccid_driver_t handle, int *statusbits, int on_wire) if (handle->transfer == NULL) { ccid_setup_intr (handle); - if (handle->id_vendor == VENDOR_SCM) - { - DEBUGOUT ("sending escape sequence to switch to a case 1 APDU\n"); - send_escape_cmd (handle, (const unsigned char*)"\x80\x02\x00", 3, - NULL, 0, NULL); - } + ccid_vendor_specific_setup (handle); } *statusbits = 0;