forked/libnfc
1
0
Fork 0
mirror of https://github.com/nfc-tools/libnfc.git synced 2026-04-11 17:16:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add "usb" keyword support to connstring to specify all usb drivers at once

Browse Source
This commit is contained in:
Philippe Teuwen
2012-06-06 01:10:05 +00:00
parent b4ef1a3a5d
commit 4b5b45f14a
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libnfc/nfc.c
View File

@@ -198,13 +198,21 @@ nfc_open(nfc_context *context, const nfc_connstring connstring)
while ((ndr = *pndr)) {
// Specific device is requested: using device description
if (0 != strncmp(ndr->name, ncs, strlen(ndr->name))) {
pndr++;
continue;
// Check if connstring driver is usb -> accept any driver *_usb
if ((0 != strncmp("usb", ncs, strlen("usb"))) || 0 != strncmp ("_usb", ndr->name + (strlen(ndr->name) - 4), 4)) {
pndr++;
continue;
}
}
pnd = ndr->open(ncs);
// Test if the opening was successful
if (pnd == NULL) {
if (0 == strncmp("usb", ncs, strlen("usb"))) {
// We've to test the other usb drivers before giving up
pndr++;
continue;
}
log_put(LOG_CATEGORY, NFC_PRIORITY_TRACE, "Unable to open \"%s\".", ncs);
log_fini();
return pnd;