diff options
| author | NIIBE Yutaka <[email protected]> | 2016-12-28 02:14:29 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2016-12-28 02:14:29 +0000 |
| commit | f9882d8336feea96e3b5e250e9093f8cca01e08b (patch) | |
| tree | 28a62c8b56747e5ebd1d38fcb6abd63e354f8644 /scd/apdu.h | |
| parent | scd: Improve internal CCID driver. (diff) | |
| download | gnupg-f9882d8336feea96e3b5e250e9093f8cca01e08b.tar.gz gnupg-f9882d8336feea96e3b5e250e9093f8cca01e08b.zip | |
scd: Simplify monitoring card removal.
* scd/apdu.c (struct reader_table_s): Remove any_status, last_status,
status, and change_counter field.
(new_reader_slot, dump_reader_status, ct_activate_card, open_ct_reader)
(connect_pcsc_card, open_pcsc_reader_direct, open_pcsc_reader_wrapped)
(open_ccid_reader, apdu_reset): Follow the change.
(ct_dump_reader_status): Remove.
(apdu_get_status_internal, apdu_get_status): Remove CHANGED arg.
(apdu_connect): Follow the change.
* scd/command.c (struct vreader_s): Remove reset_failed, any, and
changed field.
(cmd_getinfo, update_reader_status_file): Follow the change.
--
In the past, scdaemon monitors card insertion (as well as removal), so
the code has been complicated, and there has been duplication in two
layers. Now, it only monitors card removal, it's now simplified.
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'scd/apdu.h')
| -rw-r--r-- | scd/apdu.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scd/apdu.h b/scd/apdu.h index e29c971e1..ba856af9e 100644 --- a/scd/apdu.h +++ b/scd/apdu.h @@ -112,8 +112,7 @@ int apdu_disconnect (int slot); int apdu_set_progress_cb (int slot, gcry_handler_progress_t cb, void *cb_arg); int apdu_reset (int slot); -int apdu_get_status (int slot, int hang, - unsigned int *status, unsigned int *changed); +int apdu_get_status (int slot, int hang, unsigned int *status); int apdu_check_pinpad (int slot, int command, pininfo_t *pininfo); int apdu_pinpad_verify (int slot, int class, int ins, int p0, int p1, pininfo_t *pininfo); |