diff options
| author | Werner Koch <[email protected]> | 2011-12-13 15:55:42 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2011-12-13 15:55:42 +0000 |
| commit | 24e121ef261731069868ca403b818f1168237f53 (patch) | |
| tree | 358c72a405ba2c2688c1bf50e7201181f3aa76d3 /scd/scdaemon.h | |
| parent | scd: Retry command SERIALNO for an inactive card. (diff) | |
| download | gnupg-24e121ef261731069868ca403b818f1168237f53.tar.gz gnupg-24e121ef261731069868ca403b818f1168237f53.zip | |
scd: Introduce a virtual reader table.
The vreader table makes the code more clear by explicitly talking
about APDU slots and reader indices. It also accommodates for future
extensions.
* scd/scdaemon.h (server_control_s): Remove READER_SLOT.
* scd/scdaemon.c (scd_init_default_ctrl): Do not init READER_SLOT.
* scd/app.c (check_application_conflict): Add arg SLOT.
* scd/command.c (slot_status_s): Rename to vreader_s.
(server_local_s): Add field VREADER_IDX as replacement for
the READER_SLOT in server_control_s. Change all users.
(slot_table): Rename to vreader_table. Change all users.
(vreader_slot): New.
(do_reset, cmd_apdu): Map vreader to apdu slot.
(get_reader_slot): Rename to get_current_reader. Return -1 on error.
(open_card): Map vreader toapdu slot. Pass slot to
check_application_conflict.
(scd_command_handler): Init VREADER_IDX.
(update_reader_status_file): Reset SLOT field on error.
Diffstat (limited to 'scd/scdaemon.h')
| -rw-r--r-- | scd/scdaemon.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/scd/scdaemon.h b/scd/scdaemon.h index 0cf2f249d..4c0a66330 100644 --- a/scd/scdaemon.h +++ b/scd/scdaemon.h @@ -97,9 +97,6 @@ struct server_control_s /* Local data of the server; used only in command.c. */ struct server_local_s *server_local; - /* Slot of the open reader or -1 if not open. */ - int reader_slot; - /* The application context used with this connection or NULL if none associated. Note that this is shared with the other connections: All connections accessing the same reader are using the same |