diff options
| author | NIIBE Yutaka <[email protected]> | 2017-01-27 09:01:52 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2017-01-27 09:01:52 +0000 |
| commit | 25cc8575da9a9b8bf60c64c8059cb5f73cc52e1d (patch) | |
| tree | a9100c34073a73e0ed13d802df7deae5d9027ab6 /scd/app-common.h | |
| parent | scd: Wake up the select when new USB scan. (diff) | |
| download | gnupg-25cc8575da9a9b8bf60c64c8059cb5f73cc52e1d.tar.gz gnupg-25cc8575da9a9b8bf60c64c8059cb5f73cc52e1d.zip | |
scd: Improve watching USB device removal.
* scd/apdu.c(struct reader_table_s): Add require_get_status.
(apdu_connect): Change return value meaning. Call apdu_reset here.
* scd/app.c (app_new_register): Add require_get_status.
(select_application): Use the return value of apdu_connect.
(scd_update_reader_status_file): Call update_fdset_for_usb with
checking all_have_intr_endp.
(app_list_start, app_list_finish): Remove.
* scd/ccid-driver.c (struct ccid_driver_s): Add transfer.
(intr_cb): Don't call libusb_transfer in this callback.
(ccid_require_get_status): New.
(do_close_reader): Call libusb_transfer here.
* scd/scdaemon.c (update_fdset_for_usb): Remove the first argument.
--
With Gnuk Token, it works fine as expected. With Gemalto reader,
intr_cb is not called when card is removed. So, the macro
LIBUSB_WORKS_EXPECTED_FOR_INTERRUPT_ENDP is not defined yet.
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'scd/app-common.h')
| -rw-r--r-- | scd/app-common.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/scd/app-common.h b/scd/app-common.h index b979f5476..521fcf329 100644 --- a/scd/app-common.h +++ b/scd/app-common.h @@ -121,8 +121,6 @@ size_t app_help_read_length_of_cert (int slot, int fid, size_t *r_certoff); /*-- app.c --*/ -app_t app_list_start (void); -void app_list_finish (void); void app_send_card_list (ctrl_t ctrl); char *app_get_serialno (app_t app); |