Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix random order of interfaces in OpenUSBByName(). #19

Closed
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/ccid_usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -622,12 +622,17 @@ status_t OpenUSBByName(unsigned int reader_index, /*@null@*/ char *device)
}

#ifdef USE_COMPOSITE_AS_MULTISLOT
/* use the next interface for the next "slot" */
static_interface++;
if ((GEMALTOPROXDU == readerID)
|| (GEMALTOPROXSU == readerID)
|| (FEITIANR502DUAL == readerID))
{
/* use the next interface for the next "slot" */
static_interface++;

/* reset for a next reader */
if (static_interface > 2)
static_interface = (FEITIANR502DUAL == readerID) ? 0: 1;
/* reset for a next reader */
if (static_interface > 2)
static_interface = (FEITIANR502DUAL == readerID) ? 0: 1;
}
#endif

/* Get Endpoints values*/
Expand Down