diff --git a/.gitea/workflows/build-win.yml b/.gitea/workflows/build-win.yml deleted file mode 100644 index 57c00f9..0000000 --- a/.gitea/workflows/build-win.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: Build eismuliplexer for windows -run-name: Building eismuliplexer for windows -on: [push] - -jobs: - Build: - runs-on: ubuntu-latest - steps: - - name: Check out repository code - uses: ischanx/checkout@8c80eac3058d03dc5301629e8f7d59ae255d6cc3 - - name: Install dependancies - run: | - apt update - apt install -y cmake mingw-w64-x86-64-dev gcc-mingw-w64 g++-mingw-w64 p7zip-full - cd ${{ gitea.workspace }} - wget https://github.com/libusb/libusb/releases/download/v1.0.29/libusb-1.0.29.7z - mkdir libusb - 7z x libusb-1.0.29.7z -olibusb - - name: Version - id: version - run: git fetch -a; echo "tag=$(git describe --tags `git rev-list --tags --max-count=1`)" >> $GITHUB_OUTPUT - - name: Build - run: | - mkdir ${{ gitea.workspace }}/build - cd ${{ gitea.workspace }}/build - cmake -DCMAKE_INSTALL_PREFIX=/usr/x86_64-w64-mingw32/ -DCMAKE_TOOLCHAIN_FILE=../crossW64.cmake -DCMAKE_BUILD_TYPE=Release -DLIBUSB_INCLUDE_DIRS=${{ gitea.workspace }}/libusb/include/ -DLIBUSB_LIBRARIES=${{ gitea.workspace }}/libusb/MinGW64/static/libusb-1.0.a -DGIT_TAG=${{ steps.version.outputs.tag }} .. - make - - name: Package - run: cd ${{ gitea.workspace }}/build; make package - - name: Upload artifacts - uses: actions/upload-artifact@v3 - with: - name: eismultiplexer-win-x86_64-${{ steps.version.outputs.tag }} - path: ${{ gitea.workspace }}/build/packaged/${{ steps.version.outputs.tag }}/* diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml deleted file mode 100644 index a672478..0000000 --- a/.gitea/workflows/build.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: Build eismuliplexer for linux -run-name: Building eismuliplexer for linux -on: [push] - -jobs: - Build: - runs-on: ubuntu-20.04 - steps: - - name: Install dependancies - run: apt update; apt install -y libusb-1.0-0-dev cmake - - name: Check out repository code - uses: ischanx/checkout@8c80eac3058d03dc5301629e8f7d59ae255d6cc3 - - name: Version - id: version - run: git fetch -a; echo "tag=$(git describe --tags `git rev-list --tags --max-count=1`)" >> $GITHUB_OUTPUT - - name: Build - run: mkdir ${{ gitea.workspace }}/build; cd ${{ gitea.workspace }}/build; cmake -DCMAKE_BUILD_TYPE=Release -DGIT_TAG=${{ steps.version.outputs.tag }} ..; make - - name: Package - run: cd ${{ gitea.workspace }}/build; make package - - name: Upload artifacts - uses: actions/upload-artifact@v3 - with: - name: eismultiplexer-linux-x86_64-${{ steps.version.outputs.tag }} - path: ${{ gitea.workspace }}/build/packaged/${{ steps.version.outputs.tag }}/* diff --git a/CMakeLists.txt b/CMakeLists.txt index 391b1f4..21ae33f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,28 +1,14 @@ -cmake_minimum_required(VERSION 3.16) +cmake_minimum_required(VERSION 3.20) project(eismultiplexer C) +find_package(PkgConfig REQUIRED) find_package(Doxygen) - -if(NOT LIBUSB_INCLUDE_DIRS OR NOT LIBUSB_LIBRARIES) - find_package(PkgConfig REQUIRED) - pkg_check_modules(LIBUSB libusb-1.0) -endif() - -list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/") -include(GitVersion) -get_version_from_git() -message("Building version ${PROJECT_VERSION}") +pkg_check_modules(LIBUSB REQUIRED libusb-1.0) set(CMAKE_CXX_STANDARD 17) set(CMAKE_C_STANDARD 11) -add_compile_definitions(VERSION_MAJOR=${CMAKE_PROJECT_VERSION_MAJOR}) -add_compile_definitions(VERSION_MINOR=${CMAKE_PROJECT_VERSION_MINOR}) -add_compile_definitions(VERSION_PATCH=${CMAKE_PROJECT_VERSION_PATCH}) - -option(UDEV_RULES "install udev files" ON) - set(SRC_FILES eismultiplexer.c usbshm.c) message("Platform " ${CMAKE_SYSTEM_NAME}) @@ -31,51 +17,25 @@ if(WIN32) file(GLOB_RECURSE ARGP_SRC ${PROJECT_SOURCE_DIR}/argp/*.*) set(SRC_FILES ${SRC_FILES} ${ARGP_SRC}) include_directories(./argp) - if(NOT (CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/release-win.sh ${CMAKE_CURRENT_BINARY_DIR}/release.sh @ONLY) - add_custom_target(package - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/release.sh - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMENT "Createing release archive" - VERBATIM) - endif() else() message("Building for UNIX") if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "..." FORCE) endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/release-lin.sh ${CMAKE_CURRENT_BINARY_DIR}/release.sh @ONLY) - add_custom_target(package - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/release.sh - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - COMMENT "Createing release archive" - VERBATIM) endif(WIN32) add_library(${PROJECT_NAME} SHARED ${SRC_FILES}) -target_include_directories(${PROJECT_NAME} PUBLIC ${LIBUSB_INCLUDE_DIRS}) target_link_libraries(${PROJECT_NAME} ${LIBUSB_LIBRARIES}) -if(WIN32) - target_link_libraries(${PROJECT_NAME} libpthread.a) -endif(WIN32) -target_compile_options(${PROJECT_NAME} PRIVATE -Wall -O2 -fno-strict-aliasing) +target_include_directories(${PROJECT_NAME} PUBLIC ${LIBUSB_INCLUDE_DIRS}) +add_definitions("-std=c17 -Wall -O2 -fno-strict-aliasing") install(TARGETS ${PROJECT_NAME} DESTINATION lib) install(FILES ./eismultiplexer.h DESTINATION include) -add_library(${PROJECT_NAME}_static STATIC ${SRC_FILES}) -target_include_directories(${PROJECT_NAME}_static PUBLIC ${LIBUSB_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME}_static ${LIBUSB_LIBRARIES}) -if(WIN32) - target_link_libraries(${PROJECT_NAME}_static libpthread.a) -endif(WIN32) -target_compile_options(${PROJECT_NAME}_static PRIVATE -Wall -O2 -fno-strict-aliasing -fPIC) -install(TARGETS ${PROJECT_NAME}_static DESTINATION lib) - link_directories(${CMAKE_CURRENT_BINARY_DIR}) add_executable(${PROJECT_NAME}_cli main.c) -add_dependencies(${PROJECT_NAME}_cli ${PROJECT_NAME}_static) -target_link_libraries( ${PROJECT_NAME}_cli ${PROJECT_NAME}_static) -target_compile_options(${PROJECT_NAME} PRIVATE -Wall -O2 -fno-strict-aliasing) +add_dependencies(${PROJECT_NAME}_cli ${PROJECT_NAME}) +target_link_libraries( ${PROJECT_NAME}_cli ${PROJECT_NAME}) +add_definitions("-std=c17 -Wall -O2 -fno-strict-aliasing") install(TARGETS ${PROJECT_NAME}_cli DESTINATION bin) configure_file(pkgconfig/eismuliplexer.pc.in pkgconfig/eismuliplexer.pc @ONLY) @@ -96,7 +56,7 @@ else (DOXYGEN_FOUND) message("Doxygen needs to be installed to generate the doxygen documentation") endif (DOXYGEN_FOUND) -if(CMAKE_SYSTEM_NAME MATCHES "^Linux" AND UDEV_RULES) +if(CMAKE_SYSTEM_NAME MATCHES "^Linux") set(UDEV_RULES_INSTALL_DIR /lib/udev/rules.d CACHE PATH "install directory for linux udev config") install(FILES 90-eismultiplexer.rules DESTINATION ${UDEV_RULES_INSTALL_DIR}) endif() diff --git a/EisMultiplexerWinDriver/_DriverFiles.7z b/EisMultiplexerWinDriver/_DriverFiles.7z new file mode 100755 index 0000000..32adf29 Binary files /dev/null and b/EisMultiplexerWinDriver/_DriverFiles.7z differ diff --git a/README.md b/README.md index 0d069f9..d13b75c 100644 --- a/README.md +++ b/README.md @@ -37,4 +37,4 @@ to make the documentation: ### License -librelaxisloader is licensed to you under the lgpl-3.0 or later license +librelaxisloader is licensed to you under the BSD-3-CLAUSE license diff --git a/cmake/GitVersion.cmake b/cmake/GitVersion.cmake deleted file mode 100644 index b147005..0000000 --- a/cmake/GitVersion.cmake +++ /dev/null @@ -1,38 +0,0 @@ -function(get_version_from_git) - find_package(Git REQUIRED) - - if(NOT GIT_TAG) - execute_process( - COMMAND ${GIT_EXECUTABLE} describe --tags --always - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - OUTPUT_VARIABLE GIT_TAG - OUTPUT_STRIP_TRAILING_WHITESPACE - RESULT_VARIABLE GIT_RESULT - ) - if(NOT GIT_RESULT EQUAL 0) - message(FATAL_ERROR "Failed to get git tag") - endif() - endif() - - string(REGEX REPLACE "^v" "" CLEAN_TAG "${GIT_TAG}") - if(CLEAN_TAG MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)(-.*)?$") - - set(CMAKE_PROJECT_VERSION_MAJOR ${CMAKE_MATCH_1}) - set(CMAKE_PROJECT_VERSION_MAJOR ${CMAKE_MATCH_1} PARENT_SCOPE) - set(CMAKE_PROJECT_VERSION_MINOR ${CMAKE_MATCH_2}) - set(CMAKE_PROJECT_VERSION_MINOR ${CMAKE_MATCH_2} PARENT_SCOPE) - set(CMAKE_PROJECT_VERSION_PATCH ${CMAKE_MATCH_3}) - set(CMAKE_PROJECT_VERSION_PATCH ${CMAKE_MATCH_3} PARENT_SCOPE) - - set(PROJECT_VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}") - set(PROJECT_VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}" PARENT_SCOPE) - else() - message(WARNING "Tag '${CLEAN_TAG}' does not match semver format") - set(CMAKE_PROJECT_VERSION_MAJOR 0) - set(CMAKE_PROJECT_VERSION_MAJOR 0 PARENT_SCOPE) - set(CMAKE_PROJECT_VERSION_MINOR 0) - set(CMAKE_PROJECT_VERSION_MINOR 0 PARENT_SCOPE) - set(CMAKE_PROJECT_VERSION_PATCH 0) - set(CMAKE_PROJECT_VERSION_PATCH 0 PARENT_SCOPE) - endif() -endfunction() diff --git a/crossW64.cmake b/crossW64.cmake index 4f841a7..250001d 100644 --- a/crossW64.cmake +++ b/crossW64.cmake @@ -1,5 +1,4 @@ set(CMAKE_SYSTEM_NAME Windows) -set(CMAKE_SYSTEM_PROCESSOR AMD64) set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc) set(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++) set(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32) diff --git a/eismultiplexer.c b/eismultiplexer.c index 08477fa..925b344 100644 --- a/eismultiplexer.c +++ b/eismultiplexer.c @@ -33,39 +33,6 @@ #include #include #include -#include - -#ifdef WIND32 -#include -#endif - -typedef enum -{ - COMMAND_LED_OFF = 0, - COMMAND_LED_ON, - COMMAND_SET_OUTPUTS, - COMMAND_GET_OUTPUTS, - COMMAND_EEPROM_READ, - COMMAND_EEPROM_WRITE, - COMMAND_GET_GITREV, - COMMAND_GET_CHANNEL_COUNT, - COMMAND_GET_PROTO_VERSION, - COMMAND_SET_TRIG, - COMMAND_GET_TRIG, - COMMAND_GET_TRIG_COUNT -} command_t; - -static void msleep(uint64_t milliseconds) -{ -#ifdef WIN32 - Sleep(milliseconds); -#else - struct timespec ts; - ts.tv_sec = milliseconds / 1000; - ts.tv_nsec = (milliseconds % 1000) * 1000000; - nanosleep(&ts, NULL); -#endif -} uint16_t* eismultiplexer_list_available_devices(size_t* count) { @@ -163,80 +130,6 @@ uint16_t eismultiplexer_read_eeprom(struct eismultiplexer* muliplexer, uint16_t return *((uint16_t*)buffer); } -int eismultiplexer_set_trigger_state(struct eismultiplexer* muliplexer, uint16_t index, trigger_state_t state) -{ - int ret; - ret = usbshm_write_control_transfer(muliplexer->priv, COMMAND_SET_TRIG, NULL, 0, state, index); - return ret; -} - -int eismultiplexer_get_trigger_state(struct eismultiplexer* muliplexer, uint16_t index, trigger_state_t* state, bool* level) -{ - uint8_t buffer[2] = {}; - int ret = usbshm_read_control_transfer(muliplexer->priv, COMMAND_GET_TRIG, 0, index, buffer, 2); - if(ret == 2) { - if(state) - *state = buffer[1]; - if(level) - *level = buffer[0]; - } - return ret; -} - -int eismultiplexer_wait_trigger(struct eismultiplexer* muliplexer, uint16_t index, trigger_wait_t wait, uint64_t timeout) -{ - bool level; - bool prevlevel; - int ret = eismultiplexer_get_trigger_state(muliplexer, index, NULL, &prevlevel); - if(ret != 2) - return ret; - - struct timeval start; - struct timeval current; - gettimeofday(&start, NULL); - gettimeofday(¤t, NULL); - while((current.tv_sec - start.tv_sec)*1000 + (current.tv_usec - start.tv_usec)/1000 < timeout) { - int ret = eismultiplexer_get_trigger_state(muliplexer, index, NULL, &level); - if(ret != 2) - return ret; - switch(wait) { - case TRIGGER_WAIT_HIGH_LEVEL: - if(level) - return 0; - break; - case TRIGGER_WAIT_LOW_LEVEL: - if(!level) - return 0; - break; - case TRIGGER_WAIT_EDGE: - if(prevlevel != level) - return 0; - break; - case TRIGGER_WAIT_HIGH: - if(!prevlevel && level) - return 0; - break; - case TRIGGER_WAIT_LOW: - if(prevlevel && !level) - return 0; - break; - } - msleep(100); - gettimeofday(¤t, NULL); - } - return 1; -} - -int eismultiplexer_get_trigger_count(struct eismultiplexer* muliplexer) -{ - uint8_t buffer[1] = {}; - int ret = usbshm_read_control_transfer(muliplexer->priv, COMMAND_GET_TRIG, 0, 0, buffer, 1); - if(ret >= 0) - return buffer[0]; - else - return 0; -} - void eismultiplexer_disconnect(struct eismultiplexer* muliplexer) { usbshm_close(muliplexer->priv); diff --git a/eismultiplexer.h b/eismultiplexer.h index e5cb1ef..711a318 100644 --- a/eismultiplexer.h +++ b/eismultiplexer.h @@ -54,23 +54,6 @@ typedef enum { CHANNEL_NONE = 0, } channel_t; -typedef enum -{ - TRIGGER_INPUT = 0, /*** Trigger is high impedance and set as an input*/ - TRIGGER_LOW, /*** Trigger output is logic low*/ - TRIGGER_HIGH, /*** Trigger output is logic high*/ - TRIGGER_STATE_COUNT -} trigger_state_t; - -typedef enum -{ - TRIGGER_WAIT_LOW = 0, /*** Waits until the trigger falls from high to low*/ - TRIGGER_WAIT_HIGH, /*** Waits until the trigger rises from low to high*/ - TRIGGER_WAIT_EDGE, /*** Waits until the trigger changes from low to high or high to low*/ - TRIGGER_WAIT_LOW_LEVEL, /*** Waits until the trigger is low*/ - TRIGGER_WAIT_HIGH_LEVEL /*** Waits until the trigger is high*/ -} trigger_wait_t; - struct eismultiplexer { struct usbshm* priv; }; @@ -130,41 +113,6 @@ channel_t eismultiplexer_get_connected(struct eismultiplexer* muliplexer); */ int eismultiplexer_set_led(struct eismultiplexer* muliplexer, bool on); -/** - * @brief Sets the state of the trigger pin - * @param multiplexer pointer to a eismultiplexer struct - * @param state state to put the trigger in - * @param index the index of the trigger to set - * @return 0 on success and < 0 on failure - */ -int eismultiplexer_set_trigger_state(struct eismultiplexer* muliplexer, uint16_t index, trigger_state_t state); - -/** - * @brief Gets the logic level and state of the trigger pin - * @param multiplexer pointer to a eismultiplexer struct - * @param index the index of the trigger - * @param state a pointer where the current state of the trigger will be stored, can be NULL - * @param level a pointer where the current logic level of the trigger will be stored, only relevant if state is TRIGGER_INPUT, can be NULL - * @return 0 on success and < 0 on failure - */ -int eismultiplexer_get_trigger_state(struct eismultiplexer* muliplexer, uint16_t index, trigger_state_t* state, bool* level); - -/** - * @brief Sets the state of the trigger pin - * @param multiplexer pointer to a eismultiplexer struct - * @param index the index of the trigger - * @param wait wait type - * @param timeout maximum time in milliseconds to wait - * @return 0 on success and < 0 on failure - */ -int eismultiplexer_wait_trigger(struct eismultiplexer* muliplexer, uint16_t index, trigger_wait_t wait, uint64_t timeout); - -/** - * @brief gets the nummber of trigger pins available on the device - * @return the nummber of trigger pins on success and < 0 on failure - */ -int eismultiplexer_get_trigger_count(struct eismultiplexer* muliplexer); - /** * @brief Gets the number of channels on the device * @param multiplexer pointer to an eismultiplexer struct diff --git a/gpl-3.0.txt b/gpl-3.0.txt deleted file mode 100644 index f288702..0000000 --- a/gpl-3.0.txt +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/lgpl-3.0.txt b/lgpl-3.0.txt deleted file mode 100644 index 0a04128..0000000 --- a/lgpl-3.0.txt +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/main.c b/main.c index 62fc29f..13539a4 100644 --- a/main.c +++ b/main.c @@ -80,9 +80,8 @@ void print_commands(void) puts("get\t\t\t | get the state of all channels"); puts("read [ADDRESS] [LENGTH]\t | read from the device eeprom at address"); puts("write [ADDRESS] [LENGTH] | write to the device eeprom at address"); - puts("trigger [INDEX] [STATE]\t | set the trigger state input (0), output and low (1) or output and high(2)"); - puts("list\t\t\t | list the serial nummbers of the connected devices"); - puts("channels\t\t | get the number of channels the device has"); + puts("list | list the serial nummbers of the connected devices"); + puts("channels | get the channel of the device"); } static int process_commands(char** commands, size_t command_count, struct eismultiplexer* multiplexer, char* name) @@ -161,14 +160,6 @@ static int process_commands(char** commands, size_t command_count, struct eismul bool connected = channels & (1 << i); printf("Channel %c: %s\n", (char)('A'+i), connected ? "on" : "off"); } - int trigger_count = eismultiplexer_get_trigger_count(multiplexer); - for(int i = 0; i < trigger_count; ++i) - { - trigger_state_t state; - bool level; - eismultiplexer_get_trigger_state(multiplexer, i, &state, &level); - printf("Trigger %i: state: %i level: %i\n", i, state, level); - } } else if(strcmp(commands[0], "channels") == 0) { @@ -196,33 +187,6 @@ static int process_commands(char** commands, size_t command_count, struct eismul free(serials); } - else if(strcmp(commands[0], "trigger") == 0) - { - if(command_count < 2) - { - printf("Usage %s %s [INDEX] [STATE]\n", name, commands[0]); - return 2; - } - int trigger_count = eismultiplexer_get_trigger_count(multiplexer); - long index = strtol(commands[1], NULL, 10); - long state = strtol(commands[2], NULL, 10); - if(state >= TRIGGER_STATE_COUNT) - { - printf("%li is an invalid state\n", state); - return 2; - } - if(index >= trigger_count) - { - printf("%li is out of range as the device has only %i triggers\n", index, trigger_count); - return 2; - } - int ret = eismultiplexer_set_trigger_state(multiplexer, index, state); - if(ret < 0) - { - puts("Unable to set trigger state"); - return 3; - } - } else { if(command_count != 2) @@ -312,34 +276,18 @@ int main(int argc, char* argv[]) printf("A command is required\n"); return 2; } - - if(config.verbose) - { - size_t count = 0; - printf("Connected devices:\n"); - uint16_t* serials = eismultiplexer_list_available_devices(&count); - for(size_t i = 0; i < count; ++i) - printf("%zu: Serial %i\n", i, serials[i]); - free(serials); - } - + struct eismultiplexer multiplexer; - int ret = eismultiplexer_connect(&multiplexer, config.serialSet ? config.serial : 0); - if(ret) + if(eismultiplexer_connect(&multiplexer, config.serialSet ? config.serial : 0)) { char serialStr[5]; snprintf(serialStr, sizeof(serialStr), "%04hu", config.serial); printf("Can not connect to EISmultiplexer device%s%s\n", config.serialSet ? " with serial " : "", config.serialSet ? serialStr : ""); - if(config.verbose) - printf("eismultiplexer_connect ret %i\n", ret); return 1; } - if(config.verbose) - printf("eismultiplexer_connect ret %i\n", ret); - - ret = 0; + int ret = 0; if(config.interactive || config.pipe) { diff --git a/options.h b/options.h index 9c1d166..4295a0a 100644 --- a/options.h +++ b/options.h @@ -44,7 +44,6 @@ static struct argp_option options[] = {"pipe", 'p', 0, 0, "run in pipe mode" }, {"serial", 's', "[NUMBER]", 0, "serial number of device to connect to"}, {"list", 'l', 0, 0, "list commands"}, - {"verbose", 'v', 0, 0, "enable verbose debug prints"}, {0} }; @@ -62,7 +61,6 @@ struct config char* commands[MAX_COMMANDS]; size_t command_count; bool list_commands; - bool verbose; }; static error_t parse_opt (int key, char *arg, struct argp_state *state) @@ -91,9 +89,6 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state) case 'l': config->list_commands = true; break; - case 'v': - config->verbose = true; - break; case ARGP_KEY_ARG: { if(config->command_count+1 > MAX_COMMANDS) diff --git a/pkgconfig/eismuliplexer.pc.in b/pkgconfig/eismuliplexer.pc.in index 8fc4898..c181acf 100644 --- a/pkgconfig/eismuliplexer.pc.in +++ b/pkgconfig/eismuliplexer.pc.in @@ -1,5 +1,4 @@ includedir=@CMAKE_INSTALL_PREFIX@/include -libdir=@CMAKE_INSTALL_PREFIX@/lib Name: libeismuliplexer Description: C lib to control EISmultiplexer devices diff --git a/scripts/release-lin.sh b/scripts/release-lin.sh deleted file mode 100755 index 1deff7a..0000000 --- a/scripts/release-lin.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash -e -# -# libkissinference - an inference libary for kiss networks -# Copyright (C) 2024 Carl Philipp Klemm -# -# This file is part of libkissinference. -# -# libkissinference is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# libkissinference is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with libkissinference. If not, see . -# - -PROJECTNAME=@PROJECT_NAME@ -SYSTEMPROC=@CMAKE_SYSTEM_PROCESSOR@ -ROOTPATH=@CMAKE_FIND_ROOT_PATH@ -VERSION="@CMAKE_PROJECT_VERSION_MAJOR@.@CMAKE_PROJECT_VERSION_MINOR@.@CMAKE_PROJECT_VERSION_PATCH@" -BINARYDIR="@CMAKE_CURRENT_BINARY_DIR@" -SRCDIR="@CMAKE_CURRENT_SOURCE_DIR@" -RELDIRECTORY="$BINARYDIR/packaged/$VERSION/release" -ZIPNAME=$PROJECTNAME-linux-$SYSTEMPROC-$VERSION -LIBUSB_PATH=$(readlink -f $(ldconfig -p | grep libusb-1.0.so.0 | tr ' ' '\n' | grep / | grep -v 32)) - -rm $BINARYDIR/packaged/$ZIPNAME.zip || true -cd $BINARYDIR -install -d $RELDIRECTORY -cp libeismultiplexer.so $RELDIRECTORY -cp libeismultiplexer_static.a $RELDIRECTORY -cp $LIBUSB_PATH $RELDIRECTORY/libusb-1.0.so.0 -cp eismultiplexer_cli $RELDIRECTORY -mkdir $RELDIRECTORY/include || true -cp $SRCDIR/eismultiplexer.h $RELDIRECTORY/include -cp $SRCDIR/gpl-3.0.txt $SRCDIR/lgpl-3.0.txt $RELDIRECTORY -cp $SRCDIR/README.md $RELDIRECTORY -cd $RELDIRECTORY/.. -rm $BINARYDIR/packaged/$ZIPNAME.zip || true -zip -r $BINARYDIR/packaged/$ZIPNAME.zip release diff --git a/scripts/release-win.sh b/scripts/release-win.sh deleted file mode 100755 index 7ade7eb..0000000 --- a/scripts/release-win.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash -e -# -# libkissinference - an inference libary for kiss networks -# Copyright (C) 2024 Carl Philipp Klemm -# -# This file is part of libkissinference. -# -# libkissinference is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# libkissinference is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with libkissinference. If not, see . -# - -PROJECTNAME=@PROJECT_NAME@ -SYSTEMPROC=@CMAKE_SYSTEM_PROCESSOR@ -ROOTPATH=@CMAKE_FIND_ROOT_PATH@ -VERSION="@CMAKE_PROJECT_VERSION_MAJOR@.@CMAKE_PROJECT_VERSION_MINOR@.@CMAKE_PROJECT_VERSION_PATCH@" -BINARYDIR="@CMAKE_CURRENT_BINARY_DIR@" -SRCDIR="@CMAKE_CURRENT_SOURCE_DIR@" -RELDIRECTORY="$BINARYDIR/packaged/$VERSION/release" -ZIPNAME=$PROJECTNAME-win-$SYSTEMPROC-$VERSION - -rm $BINARYDIR/packaged/$ZIPNAME.zip || true -cd $BINARYDIR -install -d $RELDIRECTORY -cp libeismultiplexer.dll $RELDIRECTORY -cp libeismultiplexer_static.a $RELDIRECTORY -cp libeismultiplexer.dll.a $RELDIRECTORY -#cp $ROOTPATH/bin/libwinpthread-1.dll $RELDIRECTORY -#cp $ROOTPATH/bin/libusb-1.0.dll $RELDIRECTORY -#cp $ROOTPATH/bin/libssp-0.dll $RELDIRECTORY -cp eismultiplexer_cli.exe $RELDIRECTORY -cp -r $SRCDIR/EisMultiplexerWinDriver $RELDIRECTORY/driver -mkdir $RELDIRECTORY/include || true -cp $SRCDIR/eismultiplexer.h $RELDIRECTORY/include -cp $SRCDIR/gpl-3.0.txt $SRCDIR/lgpl-3.0.txt $RELDIRECTORY -cp $SRCDIR/README.md $RELDIRECTORY -cd $RELDIRECTORY/.. -rm $BINARYDIR/packaged/$ZIPNAME.zip || true -zip -r $BINARYDIR/packaged/$ZIPNAME.zip release diff --git a/usbshm.c b/usbshm.c index 4af807b..e588088 100644 --- a/usbshm.c +++ b/usbshm.c @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include static int object_counter = 0; @@ -125,7 +125,6 @@ int usbshm_find(struct usbshm* instance, int vendorID, int productID, unsigned c (*serials)[*count] = calloc(16, 1); libusb_get_string_descriptor_ascii(handle, desc.iSerialNumber, (*serials)[*count], 16); ++(*count); - libusb_close(handle); } else { @@ -141,8 +140,6 @@ int usbshm_find(struct usbshm* instance, int vendorID, int productID, unsigned c return USBSHM_ERROR_ERR; } - libusb_free_device_list(list, true); - pthread_mutex_unlock(instance->mutex); return 0; diff --git a/usbshm.h b/usbshm.h index 0880507..3430d22 100644 --- a/usbshm.h +++ b/usbshm.h @@ -25,7 +25,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include #include #include