crewID/libnfc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace usb_set_debug() in utils by new group in LIBNFC_LOG_LEVEL

Browse source 
To use it: (NFC_LOG_PRIORITY_DEBUG * 2 ^ NFC_LOG_GROUP_LIBUSB)
LIBUSB_LOG_LEVEL=12288
This commit is contained in:
Philippe Teuwen 2013-03-02 23:41:43 +01:00
parent b1448f6785
commit b68a37b835
4 changed files with 11 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libnfc/buses/usbbus.c
View file

@ -38,6 +38,16 @@ int usb_prepare(void)
if (usb_initialized) { if (usb_initialized) {
return 0; return 0;
} }
#ifdef ENVVARS
char *env_log_level = getenv("LIBNFC_LOG_LEVEL");
// Set libusb debug only if asked explicitely:
// LIBUSB_LOG_LEVEL=12288 (= NFC_LOG_PRIORITY_DEBUG * 2 ^ NFC_LOG_GROUP_LIBUSB)
if (env_log_level && (((atoi(env_log_level) >> (NFC_LOG_GROUP_LIBUSB * 2)) & 0x00000003) >= NFC_LOG_PRIORITY_DEBUG)) {
setenv("USB_DEBUG", "255", 1);
}
#endif
usb_init(); usb_init();
usb_initialized = true; usb_initialized = true;

1
libnfc/log.h
View file

@ -35,6 +35,7 @@
#define NFC_LOG_GROUP_CHIP 3 #define NFC_LOG_GROUP_CHIP 3
#define NFC_LOG_GROUP_DRIVER 4 #define NFC_LOG_GROUP_DRIVER 4
#define NFC_LOG_GROUP_COM 5 #define NFC_LOG_GROUP_COM 5
#define NFC_LOG_GROUP_LIBUSB 6
/* /*
To enable log only for one (or more) group, you can use this formula: To enable log only for one (or more) group, you can use this formula:

12
utils/nfc-list.c
View file

@ -38,12 +38,6 @@
# include "config.h" # include "config.h"
#endif // HAVE_CONFIG_H #endif // HAVE_CONFIG_H
#ifdef HAVE_LIBUSB
# ifdef DEBUG
# include <usb.h>
# endif
#endif
#include <err.h> #include <err.h>
#include <stdio.h> #include <stdio.h>
#include <stddef.h> #include <stddef.h>
@ -90,12 +84,6 @@ main(int argc, const char *argv[])
} }
} }
#ifdef HAVE_LIBUSB
# ifdef DEBUG
usb_set_debug(4);
# endif
#endif
/* Lazy way to open an NFC device */ /* Lazy way to open an NFC device */
#if 0 #if 0
pnd = nfc_open(context, NULL); pnd = nfc_open(context, NULL);

12
utils/nfc-scan-device.c
View file

@ -38,12 +38,6 @@
# include "config.h" # include "config.h"
#endif // HAVE_CONFIG_H #endif // HAVE_CONFIG_H
#ifdef HAVE_LIBUSB
# ifdef DEBUG
# include <usb.h>
# endif
#endif
#include <err.h> #include <err.h>
#include <stdio.h> #include <stdio.h>
#include <stddef.h> #include <stddef.h>
@ -101,12 +95,6 @@ main(int argc, const char *argv[])
acLibnfcVersion = nfc_version(); acLibnfcVersion = nfc_version();
printf("%s uses libnfc %s\n", argv[0], acLibnfcVersion); printf("%s uses libnfc %s\n", argv[0], acLibnfcVersion);
#ifdef HAVE_LIBUSB
# ifdef DEBUG
usb_set_debug(4);
# endif
#endif
nfc_connstring connstrings[MAX_DEVICE_COUNT]; nfc_connstring connstrings[MAX_DEVICE_COUNT];
size_t szDeviceFound = nfc_list_devices(context, connstrings, MAX_DEVICE_COUNT); size_t szDeviceFound = nfc_list_devices(context, connstrings, MAX_DEVICE_COUNT);