cleaned up scutils

- moved write/read_binary_rec to scutil.c
- removed unused handling of card driver
This commit is contained in:
Frank Morgner
2013-06-13 08:25:11 +02:00
parent f73f5a328d
commit 70d10b9410
8 changed files with 147 additions and 172 deletions

View File

@@ -156,11 +156,11 @@ detect_card_presence(void)
}
int ccid_initialize(int reader_id, const char *cdriver, int verbose)
int ccid_initialize(int reader_id, int verbose)
{
int i;
i = initialize(reader_id, cdriver, verbose, &ctx, &reader);
i = initialize(reader_id, verbose, &ctx, &reader);
if (i < 0)
return i;

View File

@@ -271,12 +271,11 @@ struct hid_class_descriptor {
* @brief Initializes reader for relaying
*
* @param[in] reader_id (optional) Index to the reader to be used. Set to -1 to use the first reader with a card or the first reader if no card is available.
* @param[in] cdriver (optional) Card driver to be used
* @param[in] verbose Verbosity level passed to \c sc_context_t
*
* @return \c SC_SUCCESS or error code if an error occurred
*/
int ccid_initialize(int reader_id, const char *cdriver, int verbose);
int ccid_initialize(int reader_id, int verbose);
/**
* @brief Disconnects from card, reader and releases allocated memory

View File

@@ -1531,7 +1531,7 @@ main (int argc, char **argv)
if (cmdline.info_flag)
return print_avail(verbose);
if (ccid_initialize(cmdline.reader_arg, NULL, verbose) < 0) {
if (ccid_initialize(cmdline.reader_arg, verbose) < 0) {
fprintf (stderr, "Can't initialize ccid\n");
return 1;
}