aboutsummaryrefslogtreecommitdiffstats
path: root/scd/ccid-driver.h
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2019-09-06 04:19:50 +0000
committerNIIBE Yutaka <[email protected]>2019-09-11 01:11:18 +0000
commitf44aa290c1368a3119b2323664c0f356195c4206 (patch)
tree4286673a75d234fe2d719728dbb189c0294b77e3 /scd/ccid-driver.h
parentdoc: Fix distchek for generated eps file (diff)
downloadgnupg-f44aa290c1368a3119b2323664c0f356195c4206.tar.gz
gnupg-f44aa290c1368a3119b2323664c0f356195c4206.zip
scd: Clean up the structure for future fix of PC/SC.
* scd/apdu.c (struct dev_list): Rename from ccid_table, with void*. (open_ccid_reader): Follow the change. (apdu_dev_list_start, apdu_dev_list_finish): Likewise. (apdu_open_reader): Likewise. * scd/ccid-driver.c (ccid_dev_scan): Use void *. (ccid_dev_scan_finish, ccid_get_BAI, ccid_open_usb_reader): Likewise. * scd/ccid-driver.h: Change the APIs. Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'scd/ccid-driver.h')
-rw-r--r--scd/ccid-driver.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/scd/ccid-driver.h b/scd/ccid-driver.h
index 1550b3eba..8e7ff4482 100644
--- a/scd/ccid-driver.h
+++ b/scd/ccid-driver.h
@@ -116,12 +116,12 @@ struct ccid_dev_table;
int ccid_set_debug_level (int level);
char *ccid_get_reader_list (void);
-gpg_error_t ccid_dev_scan (int *idx_max, struct ccid_dev_table **t_p);
-void ccid_dev_scan_finish (struct ccid_dev_table *tbl, int max);
-unsigned int ccid_get_BAI (int, struct ccid_dev_table *tbl);
+gpg_error_t ccid_dev_scan (int *idx_max, void **t_p);
+void ccid_dev_scan_finish (void *tbl0, int max);
+unsigned int ccid_get_BAI (int, void *tbl0);
int ccid_compare_BAI (ccid_driver_t handle, unsigned int);
int ccid_open_reader (const char *spec_reader_name,
- int idx, struct ccid_dev_table *ccid_table,
+ int idx, void *ccid_table0,
ccid_driver_t *handle, char **rdrname_p);
int ccid_set_progress_cb (ccid_driver_t handle,
void (*cb)(void *, const char *, int, int, int),