From 33e42f389a62cfae9ba61a9e46bdd4aa0c75d1d4 Mon Sep 17 00:00:00 2001 From: Romuald Conty Date: Thu, 30 Sep 2010 10:32:44 +0000 Subject: [PATCH] Detect PN53x USB devices before ACR122. This change is needed by the fact that ACR122 use PCSC framework, and PCSC try to detect more than ACR122 devices, this reduce the connection speed (Plus, one some systems pcscd is not launched at boot time, its launched when some application access to using libpcsclite.) --- libnfc/drivers.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libnfc/drivers.h b/libnfc/drivers.h index 2343329..2afae0f 100644 --- a/libnfc/drivers.h +++ b/libnfc/drivers.h @@ -58,10 +58,6 @@ static const struct driver_callbacks drivers_callbacks_list[] = { // Driver Name Chip callbacks Pick Device List Devices Connect Transceive Disconnect -# if defined (DRIVER_ACR122_ENABLED) - {ACR122_DRIVER_NAME, &pn53x_callbacks_list, acr122_pick_device, acr122_list_devices, acr122_connect, - acr122_transceive, acr122_disconnect}, -# endif /* DRIVER_ACR122_ENABLED */ # if defined (DRIVER_PN531_USB_ENABLED) {PN531_USB_DRIVER_NAME, &pn53x_callbacks_list, pn531_usb_pick_device, pn531_usb_list_devices, pn531_usb_connect, pn53x_usb_transceive, pn53x_usb_disconnect}, @@ -70,6 +66,10 @@ static const struct driver_callbacks drivers_callbacks_list[] = { {PN533_USB_DRIVER_NAME, &pn53x_callbacks_list, pn533_usb_pick_device, pn533_usb_list_devices, pn533_usb_connect, pn53x_usb_transceive, pn53x_usb_disconnect}, # endif /* DRIVER_PN533_USB_ENABLED */ +# if defined (DRIVER_ACR122_ENABLED) + {ACR122_DRIVER_NAME, &pn53x_callbacks_list, acr122_pick_device, acr122_list_devices, acr122_connect, + acr122_transceive, acr122_disconnect}, +# endif /* DRIVER_ACR122_ENABLED */ # if defined (DRIVER_ARYGON_ENABLED) {ARYGON_DRIVER_NAME, &pn53x_callbacks_list, arygon_pick_device, arygon_list_devices, arygon_connect, arygon_transceive, arygon_disconnect},