The branch, master has been updated
via 3fca5ea95a9bbd3f4c557eec0b470bf2b3f46d9f (commit)
via 329ab28dddd1cfb48dea560c3443a157177e6b50 (commit)
from 2013b000b2e4b9d02f23b1322c64e99c672bae52 (commit)
- Log -----------------------------------------------------------------
commit 3fca5ea95a9bbd3f4c557eec0b470bf2b3f46d9f
Author: xantares <xantares09@xxxxxxxxxxx>
Date: Thu Jun 5 22:10:20 2014 +0200
Fixed variable shadowing
commit 329ab28dddd1cfb48dea560c3443a157177e6b50
Author: xantares <xantares09@xxxxxxxxxxx>
Date: Thu Jun 5 21:44:41 2014 +0200
Added LibFTDI1ConfigVersion to allow version detection
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 37 ++++++++++++++++++++++++++++++++-
cmake/LibFTDI1ConfigVersion.cmake.in | 31 ++++++++++++++++++++++++++++
src/ftdi.c | 6 +----
3 files changed, 67 insertions(+), 7 deletions(-)
create mode 100644 cmake/LibFTDI1ConfigVersion.cmake.in
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8688d4..08e5771 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -201,9 +201,42 @@ set ( LIBFTDI_VERSION_MAJOR ${MAJOR_VERSION} )
set ( LIBFTDI_VERSION_MINOR ${MINOR_VERSION} )
set ( LIBFTDI_USE_FILE
${CMAKE_INSTALL_PREFIX}/${LIBFTDI_CMAKE_CONFIG_DIR}/UseLibFTDI1.cmake )
-configure_file ( cmake/LibFTDI1Config.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake @ONLY )
-install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake
cmake/UseLibFTDI1.cmake
+
+if(CMAKE_VERSION VERSION_LESS 2.8.8)
+ configure_file ( cmake/LibFTDI1Config.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake @ONLY )
+ configure_file ( cmake/LibFTDI1ConfigVersion.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1ConfigVersion.cmake @ONLY )
+else ()
+ include(CMakePackageConfigHelpers)
+
+ configure_package_config_file (
+ cmake/LibFTDI1Config.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake
+ INSTALL_DESTINATION ${LIBFTDI_CMAKE_CONFIG_DIR}
+ PATH_VARS
+ LIBFTDI_USE_FILE
+ LIBFTDI_ROOT_DIR
+ LIBFTDI_INCLUDE_DIR
+ LIBFTDI_INCLUDE_DIRS
+ LIBFTDI_LIBRARY_DIRS
+ NO_CHECK_REQUIRED_COMPONENTS_MACRO
+ )
+ write_basic_package_version_file (
+ LibFTDI1ConfigVersion.cmake
+ VERSION ${LIBFTDI_VERSION_STRING}
+ COMPATIBILITY AnyNewerVersion
+ )
+endif ()
+
+
+install ( FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1ConfigVersion.cmake
+ cmake/UseLibFTDI1.cmake
+
DESTINATION ${LIBFTDI_CMAKE_CONFIG_DIR}
)
+
+
+
include(CPack)
diff --git a/cmake/LibFTDI1ConfigVersion.cmake.in
b/cmake/LibFTDI1ConfigVersion.cmake.in
new file mode 100644
index 0000000..ed0d463
--- /dev/null
+++ b/cmake/LibFTDI1ConfigVersion.cmake.in
@@ -0,0 +1,31 @@
+# This is a basic version file for the Config-mode of find_package().
+# It is used by write_basic_package_version_file() as input file for
configure_file()
+# to create a version-file which can be installed along a config.cmake file.
+#
+# The created file sets PACKAGE_VERSION_EXACT if the current version string and
+# the requested version string are exactly the same and it sets
+# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version.
+# The variable CVF_VERSION must be set before calling configure_file().
+
+set(PACKAGE_VERSION "@LIBFTDI_VERSION_STRING@")
+
+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
+ set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+ set(PACKAGE_VERSION_COMPATIBLE TRUE)
+ if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
+ set(PACKAGE_VERSION_EXACT TRUE)
+ endif()
+endif()
+
+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set,
ignore it:
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "")
+ return()
+endif()
+
+# check that the installed version has the same 32/64bit-ness as the one which
is currently searching:
+if(NOT "${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
+ math(EXPR installedBits "8 * 8")
+ set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
+ set(PACKAGE_VERSION_UNSUITABLE TRUE)
+endif()
diff --git a/src/ftdi.c b/src/ftdi.c
index add6dc2..c62428d 100644
--- a/src/ftdi.c
+++ b/src/ftdi.c
@@ -3136,7 +3136,7 @@ static unsigned char bit2type(unsigned char bits)
*/
int ftdi_eeprom_decode(struct ftdi_context *ftdi, int verbose)
{
- unsigned char i, j;
+ int i, j;
unsigned short checksum, eeprom_checksum, value;
unsigned char manufacturer_size = 0, product_size = 0, serial_size = 0;
int eeprom_size;
@@ -3356,8 +3356,6 @@ int ftdi_eeprom_decode(struct ftdi_context *ftdi, int
verbose)
}
else if (ftdi->type == TYPE_232H)
{
- int i;
-
eeprom->channel_a_type = buf[0x00] & 0xf;
eeprom->channel_a_driver = (buf[0x00] & DRIVER_VCPH)?DRIVER_VCP:0;
eeprom->clock_polarity = buf[0x01] & FT1284_CLK_IDLE_STATE;
@@ -3474,7 +3472,6 @@ int ftdi_eeprom_decode(struct ftdi_context *ftdi, int
verbose)
}
else if (ftdi->type == TYPE_232H)
{
- int i;
char *cbush_mux[] = {"TRISTATE","RXLED","TXLED", "TXRXLED","PWREN",
"SLEEP","DRIVE_0","DRIVE_1","IOMODE","TXDEN",
"CLK30","CLK15","CLK7_5"
@@ -3496,7 +3493,6 @@ int ftdi_eeprom_decode(struct ftdi_context *ftdi, int
verbose)
}
else if (ftdi->type == TYPE_230X)
{
- int i;
char *cbush_mux[] = {"TRISTATE","RXLED","TXLED", "TXRXLED","PWREN",
"SLEEP","DRIVE_0","DRIVE_1","IOMODE","TXDEN",
"CLK24","CLK12","CLK6","BAT_DETECT","BAT_DETECT#",
hooks/post-receive
--
A library to talk to FTDI chips
--
libftdi-git - see http://www.intra2net.com/en/developer/libftdi for details.
To unsubscribe send a mail to libftdi-git+unsubscribe@xxxxxxxxxxxxxxxxxxxxxxx
|