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

Merge remote-tracking branch 'socram8888/cygfix'

Browse source
This commit is contained in:
Romuald Conty 2015-04-14 17:16:20 +02:00
commit f82aa75072
4 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -1,4 +1,5 @@
*~ *~
*.exe
Doxyfile Doxyfile
INSTALL INSTALL
Makefile Makefile
@ -11,6 +12,7 @@ cmake/Makefile
cmake/Makefile.in cmake/Makefile.in
cmake/modules/Makefile cmake/modules/Makefile
cmake/modules/Makefile.in cmake/modules/Makefile.in
compile
config.guess config.guess
config.h config.h
config.h.in config.h.in
@ -102,6 +104,7 @@ test/.deps/
test/.libs/ test/.libs/
test/Makefile test/Makefile
test/Makefile.in test/Makefile.in
test-driver
utils/*.la utils/*.la
utils/*.lo utils/*.lo
utils/*.o utils/*.o

9
libnfc/buses/uart.c
View file

@ -77,12 +77,19 @@
const char *serial_ports_device_radix[] = { "tty.SLAB_USBtoUART", "tty.usbserial", "tty.usbmodem", NULL }; const char *serial_ports_device_radix[] = { "tty.SLAB_USBtoUART", "tty.usbserial", "tty.usbmodem", NULL };
# elif defined (__FreeBSD__) || defined (__OpenBSD__) || defined(__FreeBSD_kernel__) # elif defined (__FreeBSD__) || defined (__OpenBSD__) || defined(__FreeBSD_kernel__)
const char *serial_ports_device_radix[] = { "cuaU", "cuau", NULL }; const char *serial_ports_device_radix[] = { "cuaU", "cuau", NULL };
# elif defined (__linux__) # elif defined (__linux__) || defined (__CYGWIN__)
const char *serial_ports_device_radix[] = { "ttyUSB", "ttyS", "ttyACM", "ttyAMA", "ttyO", NULL }; const char *serial_ports_device_radix[] = { "ttyUSB", "ttyS", "ttyACM", "ttyAMA", "ttyO", NULL };
# else # else
# error "Can't determine serial string for your system" # error "Can't determine serial string for your system"
# endif # endif
// As of 2015/Feb/22, Cygwin does not handle FIONREAD on physical serial devices.
// We'll use TIOCINQ instead which is pretty much the same.
#ifdef __CYGWIN__
# include <sys/termios.h>
# define FIONREAD TIOCINQ
#endif
// Work-around to claim uart interface using the c_iflag (software input processing) from the termios struct // Work-around to claim uart interface using the c_iflag (software input processing) from the termios struct
# define CCLAIMED 0x80000000 # define CCLAIMED 0x80000000

4
libnfc/nfc.c
View file

@ -1307,6 +1307,8 @@ str_nfc_baud_rate(const nfc_baud_rate nbr)
case NBR_847: case NBR_847:
return "847 kbps"; return "847 kbps";
} }
return "???";
} }
/** @ingroup string-converter /** @ingroup string-converter
@ -1335,6 +1337,8 @@ str_nfc_modulation_type(const nfc_modulation_type nmt)
case NMT_DEP: case NMT_DEP:
return "D.E.P."; return "D.E.P.";
} }
return "???";
} }
/** @ingroup string-converter /** @ingroup string-converter

1
utils/Makefile.am
View file

@ -14,6 +14,7 @@ AM_CPPFLAGS = $(all_includes) $(LIBNFC_CFLAGS)
noinst_LTLIBRARIES = libnfcutils.la noinst_LTLIBRARIES = libnfcutils.la
libnfcutils_la_SOURCES = nfc-utils.c libnfcutils_la_SOURCES = nfc-utils.c
libnfcutils_la_LIBADD = -lnfc
nfc_emulate_forum_tag4_SOURCES = nfc-emulate-forum-tag4.c nfc-utils.h nfc_emulate_forum_tag4_SOURCES = nfc-emulate-forum-tag4.c nfc-utils.h
nfc_emulate_forum_tag4_LDADD = $(top_builddir)/libnfc/libnfc.la \ nfc_emulate_forum_tag4_LDADD = $(top_builddir)/libnfc/libnfc.la \