Cleanup codes

Author: ikspress

CMakeLists.txt

@@ -16,6 +16,8 @@ SET(PACKAGE_NAME "libnfc")
 SET(PACKAGE_VERSION ${VERSION})
 SET(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
 
+SET(C_STANDARD 99)
+
 # config.h
 IF(WIN32)
   SET(LIBNFC_SYSCONFDIR "./config" CACHE PATH "libnfc configuration directory")
@@ -52,9 +54,7 @@ ENDIF(LIBNFC_ENVVARS)
 SET(LIBNFC_DEBUG_MODE OFF CACHE BOOL "Debug mode")
 IF(LIBNFC_DEBUG_MODE)
   ADD_DEFINITIONS(-DDEBUG)
-  SET(CMAKE_C_FLAGS "-g3 ${CMAKE_C_FLAGS}")
   SET(WIN32_MODE "debug")
-  SET(CMAKE_RC_FLAGS "-D_DEBUG ${CMAKE_RC_FLAGS}")
 ELSE(LIBNFC_DEBUG_MODE)
   SET(WIN32_MODE "release")
 ENDIF(LIBNFC_DEBUG_MODE)
@@ -93,12 +93,6 @@ IF(NOT DEFINED SHARE_INSTALL_PREFIX)
   SET(SHARE_INSTALL_PREFIX share)
 ENDIF(NOT DEFINED SHARE_INSTALL_PREFIX)
 
-# Additonnal GCC flags
-IF(CMAKE_COMPILER_IS_GNUCC)
-  # Make sure we will not miss some warnings ;)
-  SET(CMAKE_C_FLAGS "-Wall -pedantic -std=c99 ${CMAKE_C_FLAGS}")
-ENDIF(CMAKE_COMPILER_IS_GNUCC)
-
 # Workarounds for libusb in C99
 ADD_DEFINITIONS(-Du_int8_t=uint8_t -Du_int16_t=uint16_t)
 
@@ -152,20 +146,20 @@ ENDIF(NOT WIN32)
 INCLUDE(LibnfcDrivers)
 
 IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    IF(I2C_REQUIRED)
-        # Inspired from http://cmake.3232098.n2.nabble.com/RFC-cmake-analog-to-AC-SEARCH-LIBS-td7585423.html
-        INCLUDE (CheckFunctionExists)
-        INCLUDE (CheckLibraryExists)
-        CHECK_FUNCTION_EXISTS (clock_gettime HAVE_CLOCK_GETTIME)
-        IF (NOT HAVE_CLOCK_GETTIME)
-            CHECK_LIBRARY_EXISTS (rt clock_gettime "" HAVE_CLOCK_GETTIME_IN_RT)
-            IF (HAVE_CLOCK_GETTIME_IN_RT)
-                SET(LIBRT_FOUND TRUE)
-                SET(LIBRT_LIBRARIES "rt")
-            ENDIF (HAVE_CLOCK_GETTIME_IN_RT)
-        ENDIF (NOT HAVE_CLOCK_GETTIME)
-    ENDIF(I2C_REQUIRED)
-  ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  IF(I2C_REQUIRED)
+    # Inspired from http://cmake.3232098.n2.nabble.com/RFC-cmake-analog-to-AC-SEARCH-LIBS-td7585423.html
+    INCLUDE (CheckFunctionExists)
+    INCLUDE (CheckLibraryExists)
+    CHECK_FUNCTION_EXISTS (clock_gettime HAVE_CLOCK_GETTIME)
+    IF (NOT HAVE_CLOCK_GETTIME)
+      CHECK_LIBRARY_EXISTS (rt clock_gettime "" HAVE_CLOCK_GETTIME_IN_RT)
+      IF (HAVE_CLOCK_GETTIME_IN_RT)
+        SET(LIBRT_FOUND TRUE)
+        SET(LIBRT_LIBRARIES "rt")
+      ENDIF (HAVE_CLOCK_GETTIME_IN_RT)
+    ENDIF (NOT HAVE_CLOCK_GETTIME)
+  ENDIF(I2C_REQUIRED)
+ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
 IF(PCSC_INCLUDE_DIRS)
   INCLUDE_DIRECTORIES(${PCSC_INCLUDE_DIRS})

contrib/win32/libnfc/buses/uart.c

@@ -45,9 +45,7 @@
 #define LOG_GROUP    NFC_LOG_GROUP_COM
 #define LOG_CATEGORY "libnfc.bus.uart_win32"
 
-// Handle platform specific includes
 #include "contrib/windows.h"
-#define delay_ms( X ) Sleep( X )
 
 struct serial_port_windows {
   HANDLE  hPort;                // Serial port handle
@@ -143,7 +141,7 @@ uart_set_speed(serial_port sp, const uint32_t uiPortSpeed)
   // Set baud rate
   spw->dcb.BaudRate = uiPortSpeed;
   if (!SetCommState(spw->hPort, &spw->dcb)) {
-    log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_ERROR, "%s", "Unable to apply new speed settings.");
+    log_put(LOG_GROUP, LOG_CATEGORY, NFC_LOG_PRIORITY_ERROR, "Unable to apply new speed settings.");
     return;
   }
   PurgeComm(spw->hPort, PURGE_RXABORT | PURGE_RXCLEAR);

examples/nfc-emulate-forum-tag2.c

@@ -120,8 +120,8 @@ static uint8_t __nfcforum_tag2_memory_area[] = {
 #define READ 		0x30
 #define WRITE 		0xA2
 #define SECTOR_SELECT 	0xC2
-
 #define HALT 		0x50
+
 static int
 nfcforum_tag2_io(struct nfc_emulator *emulator, const uint8_t *data_in, const size_t data_in_len, uint8_t *data_out, const size_t data_out_len)
 {

examples/nfc-emulate-tag.c

@@ -189,11 +189,7 @@ main(int argc, char *argv[])
   (void) argc;
   const char *acLibnfcVersion;
 
-#ifdef WIN32
-  signal(SIGINT, (void (__cdecl *)(int)) intr_hdlr);
-#else
   signal(SIGINT, intr_hdlr);
-#endif
 
   nfc_init(&context);
   if (context == NULL) {

examples/nfc-emulate-uid.c

@@ -130,11 +130,7 @@ main(int argc, char *argv[])
     }
   }
 
-#ifdef WIN32
-  signal(SIGINT, (void (__cdecl *)(int)) intr_hdlr);
-#else
   signal(SIGINT, intr_hdlr);
-#endif
 
   nfc_init(&context);
   if (context == NULL) {

examples/nfc-poll.c

@@ -44,7 +44,6 @@
 #  include "config.h"
 #endif // HAVE_CONFIG_H
 
-#include <err.h>
 #include <inttypes.h>
 #include <signal.h>
 #include <stdio.h>

examples/nfc-relay.c

@@ -109,11 +109,7 @@ main(int argc, char *argv[])
   // Display libnfc version
   printf("%s uses libnfc %s\n", argv[0], acLibnfcVersion);
 
-#ifdef WIN32
-  signal(SIGINT, (void (__cdecl *)(int)) intr_hdlr);
-#else
   signal(SIGINT, intr_hdlr);
-#endif
 
   nfc_context *context;
   nfc_init(&context);

examples/nfc-st25tb.c

@@ -64,11 +64,7 @@
 #include <string.h>
 #include <nfc/nfc.h>
 
-#if defined(WIN32) /* mingw compiler */
-#include <getopt.h>
-#endif
-
-#define ST25TB_SR_BLOCK_MAX_SIZE	((uint8_t) 4) // for static arrays
+#define ST25TB_SR_BLOCK_MAX_SIZE	((size_t) 4) // for static arrays
 typedef void(*get_info_specific) (uint8_t * systemArea);
 
 typedef struct _st_data {

examples/pn53x-diagnose.c

@@ -43,7 +43,6 @@
 #  include "config.h"
 #endif // HAVE_CONFIG_H
 
-#include <err.h>
 #include <stdlib.h>
 #include <string.h>
 

examples/pn53x-tamashell.c

@@ -54,24 +54,11 @@
 #include <ctype.h>
 #include <time.h>
 
-#ifndef _WIN32
-#  include <time.h>
-#  define msleep(x) do { \
-    struct timespec xsleep; \
-    xsleep.tv_sec = x / 1000; \
-    xsleep.tv_nsec = (x - xsleep.tv_sec * 1000) * 1000 * 1000; \
-    nanosleep(&xsleep, NULL); \
-  } while (0)
-#else
-#  include <winbase.h>
-#  define msleep Sleep
-#endif
-
-
 #include <nfc/nfc.h>
 
 #include "utils/nfc-utils.h"
 #include "libnfc/chips/pn53x.h"
+#include "libnfc/nfc-internal.h"
 
 #define MAX_FRAME_LEN 264