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.

Sign up for GitHub

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

Jump to bottom

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

Closed
wants to merge 1 commit into from
Closed

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Fix random order of interfaces in OpenUSBByName(). 
The value of static_interface should be increased for composite devices
only.
  • Loading branch information
@godfreychung
godfreychung committed Jun 22, 2016
commit 4e73603be2d8a11df0bb17f0d67aea7bce076d0e
15 changes: 10 additions & 5 deletions src/ccid_usb.c
View file
Open in desktop
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