From d8125a0d7e74c58910840d0f28e891ce7ffda60e Mon Sep 17 00:00:00 2001 From: Lutz Helwing Date: Thu, 7 May 2015 11:34:40 +0200 Subject: Updated license headers to latest GENIVI license policy. Fixed further LRT Scan findings. Renamed and cleanup further files. Signed-off-by: Alexander Wenzel --- AUTHORS | 6 + CMakeLists.txt | 19 +- COPYING | 14 + INSTALL | 165 ++++++++++++ INSTALL.txt | 165 ------------ LICENSE | 374 +++++++++++++++++++++++++++ LICENSE.txt | 12 - MPL.txt | 374 --------------------------- README | 79 ++++++ README.txt | 79 ------ ReleaseNotes.txt | 1 + automotive-dlt.pc.in | 17 ++ automotive-dlt.spec.in | 17 ++ cmake/CMakeLists.txt | 17 ++ cmake/config.h.cmake | 17 ++ cmake/dlt_version.h.cmake | 17 ++ doc/CMakeLists.txt | 24 +- doc/dlt-convert.1 | 14 +- doc/dlt-convert.1.txt | 4 + doc/dlt-daemon.1 | 11 +- doc/dlt-daemon.1.txt | 4 + doc/dlt-receive.1 | 9 +- doc/dlt-receive.1.txt | 4 + doc/dlt-system.1 | 9 +- doc/dlt-system.1.txt | 4 + doc/dlt-system.conf.5 | 6 +- doc/dlt.conf.5 | 8 +- doc/dlt_book.txt | 19 +- doc/dlt_cheatsheet.txt | 15 ++ doc/dlt_design_specification.txt | 15 ++ doc/dlt_extended_network_trace.txt | 15 ++ doc/dlt_filetransfer.txt | 15 ++ doc/dlt_howto_debug.txt | 15 ++ doc/dlt_user_manual.txt | 17 +- doc/doxygen.cfg.cmake | 17 ++ doc/extended_network_trace_doxygen.cfg.cmake | 17 ++ doc/mainpage.h | 24 +- examples/README.txt | 6 + examples/example1/CMakeLists.txt | 19 +- examples/example1/example1.c | 28 +- examples/example2/CMakeLists.txt | 19 +- examples/example2/dlt_id.h | 17 ++ examples/example2/example2.c | 28 +- examples/example3/CMakeLists.txt | 19 +- examples/example3/dlt_id.h | 17 ++ examples/example3/example3.c | 28 +- examples/example4/CMakeLists.txt | 19 +- examples/example4/example4.c | 28 +- include/CMakeLists.txt | 19 +- include/dlt/CMakeLists.txt | 19 +- include/dlt/dlt.h | 28 +- include/dlt/dlt_client.h | 28 +- include/dlt/dlt_common.h | 28 +- include/dlt/dlt_common_api.h | 28 +- include/dlt/dlt_filetransfer.h | 25 +- include/dlt/dlt_offline_trace.h | 28 +- include/dlt/dlt_protocol.h | 28 +- include/dlt/dlt_shm.h | 28 +- include/dlt/dlt_types.h | 28 +- include/dlt/dlt_user.h | 27 +- include/dlt/dlt_user_macros.h | 28 +- src/CMakeLists.txt | 19 +- src/adaptor/CMakeLists.txt | 19 +- src/adaptor/dlt-adaptor-stdin.c | 28 +- src/adaptor/dlt-adaptor-udp.c | 28 +- src/console/CMakeLists.txt | 19 +- src/console/dlt-control.c | 28 +- src/console/dlt-convert.c | 27 +- src/console/dlt-receive.c | 28 +- src/daemon/CMakeLists.txt | 19 +- src/daemon/dlt-daemon.c | 26 +- src/daemon/dlt-daemon.h | 26 +- src/daemon/dlt-daemon_cfg.h | 27 +- src/daemon/dlt_daemon_client.c | 27 +- src/daemon/dlt_daemon_client.h | 28 +- src/daemon/dlt_daemon_common.c | 26 +- src/daemon/dlt_daemon_common.h | 26 +- src/daemon/dlt_daemon_common_cfg.h | 28 +- src/daemon/dlt_daemon_serial.c | 27 +- src/daemon/dlt_daemon_serial.h | 26 +- src/daemon/dlt_daemon_socket.c | 27 +- src/daemon/dlt_daemon_socket.h | 26 +- src/dbus/CMakeLists.txt | 19 +- src/dbus/dlt-dbus-options.c | 29 ++- src/dbus/dlt-dbus.c | 27 +- src/dbus/dlt-dbus.h | 27 +- src/examples/CMakeLists.txt | 19 +- src/examples/dlt-example-filetransfer.c | 27 +- src/examples/dlt-example-user-common-api.c | 28 +- src/examples/dlt-example-user-func.c | 26 +- src/examples/dlt-example-user.c | 27 +- src/lib/CMakeLists.txt | 19 +- src/lib/dlt_client.c | 26 +- src/lib/dlt_client_cfg.h | 26 +- src/lib/dlt_filetransfer.c | 27 +- src/lib/dlt_user.c | 26 +- src/lib/dlt_user.c.rej | 62 ----- src/lib/dlt_user_cfg.h | 27 +- src/lib/dlt_user_cfg.h.rej | 16 -- src/shared/dlt_common.c | 25 +- src/shared/dlt_common_cfg.h | 27 +- src/shared/dlt_offline_trace.c | 27 +- src/shared/dlt_shm.c | 26 +- src/shared/dlt_user_shared.c | 26 +- src/shared/dlt_user_shared.h | 26 +- src/shared/dlt_user_shared_cfg.h | 26 +- src/system/CMakeLists.txt | 19 +- src/system/dlt-system-filetransfer.c | 26 +- src/system/dlt-system-journal.c | 26 +- src/system/dlt-system-logfile.c | 26 +- src/system/dlt-system-options.c | 26 +- src/system/dlt-system-process-handling.c | 26 +- src/system/dlt-system-processes.c | 28 +- src/system/dlt-system-shell.c | 28 +- src/system/dlt-system-syslog.c | 28 +- src/system/dlt-system-watchdog.c | 27 +- src/system/dlt-system.c | 26 +- src/system/dlt-system.h | 28 +- src/tests/CMakeLists.txt | 20 +- src/tests/dlt-test-client.c | 26 +- src/tests/dlt-test-filetransfer.c | 26 +- src/tests/dlt-test-multi-process-client.c | 26 +- src/tests/dlt-test-multi-process.c | 26 +- src/tests/dlt-test-multi-process.h | 26 +- src/tests/dlt-test-stress-client.c | 26 +- src/tests/dlt-test-stress-user.c | 26 +- src/tests/dlt-test-stress.c | 26 +- src/tests/dlt-test-user.c | 26 +- systemd/CMakeLists.txt | 19 +- systemd/dlt-adaptor-udp.service.cmake | 19 +- systemd/dlt-dbus.service.cmake | 19 +- systemd/dlt-example-user.service.cmake | 19 +- systemd/dlt-receive.service.cmake | 19 +- systemd/dlt-system.service.cmake | 19 +- systemd/dlt.service.cmake | 19 +- testscripts/CMakeLists.txt | 19 +- testscripts/Meego/dlt-daemon.cmake | 17 ++ testscripts/Ubuntu/dlt-daemon.cmake | 18 ++ 138 files changed, 2354 insertions(+), 1786 deletions(-) create mode 100755 COPYING create mode 100644 INSTALL delete mode 100644 INSTALL.txt create mode 100755 LICENSE delete mode 100755 LICENSE.txt delete mode 100755 MPL.txt create mode 100644 README delete mode 100644 README.txt delete mode 100644 src/lib/dlt_user.c.rej delete mode 100644 src/lib/dlt_user_cfg.h.rej diff --git a/AUTHORS b/AUTHORS index fdbd568..be7d001 100755 --- a/AUTHORS +++ b/AUTHORS @@ -1,3 +1,9 @@ +Copyright (C) 2015 BMW AG. + +Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. + Alexander Wenzel Christian Muck Mikko Rapeli diff --git a/CMakeLists.txt b/CMakeLists.txt index 12fff75..48b6054 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,18 +1,19 @@ ####### -# Dlt - Diagnostic Log and Trace # @licence make begin@ +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. # -# Copyright (C) 2011-2014, BMW AG - Alexander Wenzel -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. # +# For further information see http://www.genivi.org/. # @licence end@ -######## +####### cmake_minimum_required( VERSION 2.6 ) project( automotive-dlt ) diff --git a/COPYING b/COPYING new file mode 100755 index 0000000..a1907b6 --- /dev/null +++ b/COPYING @@ -0,0 +1,14 @@ + # @licence make begin@ + # SPDX license identifier: MPL-2.0 + # + # Copyright (C) 2011-2015, BMW AG" + # + # This file is part of GENIVI Project DLT - Diagnostic Log and Trace. + # + # This Source Code Form is subject to the terms of the + # Mozilla Public License (MPL), v. 2.0. + # If a copy of the MPL was not distributed with this file, + # You can obtain one at http://mozilla.org/MPL/2.0/. + # + # For further information see http://www.genivi.org/. + # @licence end@ \ No newline at end of file diff --git a/INSTALL b/INSTALL new file mode 100644 index 0000000..266fd46 --- /dev/null +++ b/INSTALL @@ -0,0 +1,165 @@ +Diagnostic Log and Trace - Installation +======================================== +Alexander Wenzel + +Instructions for installing this software +----------------------------------------- +This software uses cmake as its build tool. To build and install the +DLT daemon, follow these steps: + +- mkdir build +- cd build +- cmake .. +- make +- optional: sudo make install +- optional: sudo ldconfig + +Compile options with default values +----------------------------------- +[options="header"] +|============================================================================================== +| Option | Value | Comment +| WITH_SYSTEMD | OFF | Set to on to run CMakeLists.txt in systemd +| WITH_SYSTEMD_WATCHDOG | OFF | Set to ON to use the systemd watchdog in dlt-daemon +| WITH_DLT_ADAPTOR | ON | Set ton ON to build src/adaptor binaries +| WITH_DLT_CONSOLE | ON | Set ton ON to build src/console binaries +| WITH_DLT_SYSTEM | ON | Set ton ON to build src/systembinaries +| WITH_DLT_EXAMPLES | ON | Set ton ON to build src/examplesbinaries +| WITH_DLT_TESTS | ON | Set ton ON to build src/testbinaries +| WITH_DLT_SHM_ENABLE | OFF | Set to OFF to use FIFO as IPC from user to daemon +| WITH_CHECK_CONFIG_FILE | OFF | Set to ON to create a configure file of CheckIncludeFiles and CheckFunctionExists +| WITH_DOC | OFF | Set to ON to build documentation target +| WITH_TESTSCRIPTS | OFF | Set to on to run CMakeLists.txt in test scripts +| WITH_GPROF | OFF | Set \-pg to compile flags +| WITH_MAN | ON | Set to OFF to skip building of man pages +| BUILD_SHARED_LIBS | ON | Set to OFF to build static libraries +| CMAKE_INSTALL_PREFIX | /usr/local | +| CMAKE_BUILD_TYPE | RelWithDebInfo | +|============================================================================================== + +In order to change these options, you can modify this values +with ccmake, do the appropriate changes in CmakeList.txt or via +the commandline for cmake + +- Change a value with: cmake -D= +- Example: cmake -DCMAKE_INSTALL_PREFIX=/usr + +Create Man pages +---------------- +The man pages are generated with following commands. +They are generated by default (WITH_MAN=ON). + +---- +mkdir build +cd build +cmake .. +make +sudo make install +---- + +You will find the man pages after installation in /share/man. + +The man pages are generated with asciidoc. +If the man pages are changed the following command must be executed. + +---- +mkdir build +cd build +cmake -DWITH_DOC=ON .. +make doc-man +---- + +The generated man pages overwrites the existing ones. + +Create manuals documentation +---------------------------- +The manuals are generated with asciidoc. + +---- +mkdir build +cd build +cmake -DWITH_DOC=ON .. +make doc-manuals +---- + +You will find the generated documents in build/doc/manuals. + +Create api documentation +------------------------ +The API documentation is generated with doxygen. + +---- +mkdir build +cd build +cmake -DWITH_DOC=ON .. +make doc +---- + +You will find the generated documents in build/doc/DOC_DLT. + +Generation of systemd unit files +-------------------------------- +DLT provides some example unit files for systemd, stored in /systemd. +In /systemd/CMakeLists.txt you have to specify some values, e.g. the port for dlt-adaptor-udp. +By default the generation of unit files with cmake is off. Please follow these steps to enable the generation: + +* Change into the root directory of DLT-daemon +* mkdir build +* cd build +* cmake -DWITH_SYSTEMD=ON .. + +You find the parsed unit files in the PROJECT_BINARY_DIR/systemd directory. + +Git configuration +----------------- +It is important to set the name of the user and the email of the user for all git instances on the system: + +---- +git config --global user.name "Firstname Lastname" +git config --global user.email "your_email@youremail.com" +---- + +If you are behind a proxy you have to set up the Git proxy configuration, e.g. + +---- +git config --global http.proxy $http_proxy +---- + +Checkout the code from the OSS Git repository. + +---- +git clone http://git.projects.genivi.org/dlt-daemon.git +---- + +Working on the code & contribution +---------------------------------- +Get an overview of all branches: + +---- +git branch -a +---- + +Switch to the branch you want to work on (see versioning scheme, the master is the feature branch) and verify that it has switched. + +---- +git checkout +git branch -a +---- + +Best practice is to create a local branch based on the remote branch: + +---- +git checkout -b +---- + +Start working, best practice is to commit smaller, compilable pieces during the work that makes it easier to handle later on. + +If you want to commit your changes, send them to the auto-dlt list, you can create a patch like this: + +---- +git format-patch -s +---- + +This creates a set of patches that are published via the mailing list. The patches will be discussed, merged & uploaded on the git. + + diff --git a/INSTALL.txt b/INSTALL.txt deleted file mode 100644 index 266fd46..0000000 --- a/INSTALL.txt +++ /dev/null @@ -1,165 +0,0 @@ -Diagnostic Log and Trace - Installation -======================================== -Alexander Wenzel - -Instructions for installing this software ------------------------------------------ -This software uses cmake as its build tool. To build and install the -DLT daemon, follow these steps: - -- mkdir build -- cd build -- cmake .. -- make -- optional: sudo make install -- optional: sudo ldconfig - -Compile options with default values ------------------------------------ -[options="header"] -|============================================================================================== -| Option | Value | Comment -| WITH_SYSTEMD | OFF | Set to on to run CMakeLists.txt in systemd -| WITH_SYSTEMD_WATCHDOG | OFF | Set to ON to use the systemd watchdog in dlt-daemon -| WITH_DLT_ADAPTOR | ON | Set ton ON to build src/adaptor binaries -| WITH_DLT_CONSOLE | ON | Set ton ON to build src/console binaries -| WITH_DLT_SYSTEM | ON | Set ton ON to build src/systembinaries -| WITH_DLT_EXAMPLES | ON | Set ton ON to build src/examplesbinaries -| WITH_DLT_TESTS | ON | Set ton ON to build src/testbinaries -| WITH_DLT_SHM_ENABLE | OFF | Set to OFF to use FIFO as IPC from user to daemon -| WITH_CHECK_CONFIG_FILE | OFF | Set to ON to create a configure file of CheckIncludeFiles and CheckFunctionExists -| WITH_DOC | OFF | Set to ON to build documentation target -| WITH_TESTSCRIPTS | OFF | Set to on to run CMakeLists.txt in test scripts -| WITH_GPROF | OFF | Set \-pg to compile flags -| WITH_MAN | ON | Set to OFF to skip building of man pages -| BUILD_SHARED_LIBS | ON | Set to OFF to build static libraries -| CMAKE_INSTALL_PREFIX | /usr/local | -| CMAKE_BUILD_TYPE | RelWithDebInfo | -|============================================================================================== - -In order to change these options, you can modify this values -with ccmake, do the appropriate changes in CmakeList.txt or via -the commandline for cmake - -- Change a value with: cmake -D= -- Example: cmake -DCMAKE_INSTALL_PREFIX=/usr - -Create Man pages ----------------- -The man pages are generated with following commands. -They are generated by default (WITH_MAN=ON). - ----- -mkdir build -cd build -cmake .. -make -sudo make install ----- - -You will find the man pages after installation in /share/man. - -The man pages are generated with asciidoc. -If the man pages are changed the following command must be executed. - ----- -mkdir build -cd build -cmake -DWITH_DOC=ON .. -make doc-man ----- - -The generated man pages overwrites the existing ones. - -Create manuals documentation ----------------------------- -The manuals are generated with asciidoc. - ----- -mkdir build -cd build -cmake -DWITH_DOC=ON .. -make doc-manuals ----- - -You will find the generated documents in build/doc/manuals. - -Create api documentation ------------------------- -The API documentation is generated with doxygen. - ----- -mkdir build -cd build -cmake -DWITH_DOC=ON .. -make doc ----- - -You will find the generated documents in build/doc/DOC_DLT. - -Generation of systemd unit files --------------------------------- -DLT provides some example unit files for systemd, stored in /systemd. -In /systemd/CMakeLists.txt you have to specify some values, e.g. the port for dlt-adaptor-udp. -By default the generation of unit files with cmake is off. Please follow these steps to enable the generation: - -* Change into the root directory of DLT-daemon -* mkdir build -* cd build -* cmake -DWITH_SYSTEMD=ON .. - -You find the parsed unit files in the PROJECT_BINARY_DIR/systemd directory. - -Git configuration ------------------ -It is important to set the name of the user and the email of the user for all git instances on the system: - ----- -git config --global user.name "Firstname Lastname" -git config --global user.email "your_email@youremail.com" ----- - -If you are behind a proxy you have to set up the Git proxy configuration, e.g. - ----- -git config --global http.proxy $http_proxy ----- - -Checkout the code from the OSS Git repository. - ----- -git clone http://git.projects.genivi.org/dlt-daemon.git ----- - -Working on the code & contribution ----------------------------------- -Get an overview of all branches: - ----- -git branch -a ----- - -Switch to the branch you want to work on (see versioning scheme, the master is the feature branch) and verify that it has switched. - ----- -git checkout -git branch -a ----- - -Best practice is to create a local branch based on the remote branch: - ----- -git checkout -b ----- - -Start working, best practice is to commit smaller, compilable pieces during the work that makes it easier to handle later on. - -If you want to commit your changes, send them to the auto-dlt list, you can create a patch like this: - ----- -git format-patch -s ----- - -This creates a set of patches that are published via the mailing list. The patches will be discussed, merged & uploaded on the git. - - diff --git a/LICENSE b/LICENSE new file mode 100755 index 0000000..52d1351 --- /dev/null +++ b/LICENSE @@ -0,0 +1,374 @@ +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. + diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100755 index 611d164..0000000 --- a/LICENSE.txt +++ /dev/null @@ -1,12 +0,0 @@ - # @licence make begin@ - # - # Copyright (C) 2011-2012, BMW AG - Alexander Wenzel - # - # Contributions are licensed to the GENIVI Alliance under one or more - # Contribution License Agreements. - # - # This Source Code Form is subject to the terms of the - # Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - # this file, You can obtain one at http://mozilla.org/MPL/2.0/. - # - # @licence end@ diff --git a/MPL.txt b/MPL.txt deleted file mode 100755 index 52d1351..0000000 --- a/MPL.txt +++ /dev/null @@ -1,374 +0,0 @@ -Mozilla Public License Version 2.0 -================================== - -1. Definitions --------------- - -1.1. "Contributor" - means each individual or legal entity that creates, contributes to - the creation of, or owns Covered Software. - -1.2. "Contributor Version" - means the combination of the Contributions of others (if any) used - by a Contributor and that particular Contributor's Contribution. - -1.3. "Contribution" - means Covered Software of a particular Contributor. - -1.4. "Covered Software" - means Source Code Form to which the initial Contributor has attached - the notice in Exhibit A, the Executable Form of such Source Code - Form, and Modifications of such Source Code Form, in each case - including portions thereof. - -1.5. "Incompatible With Secondary Licenses" - means - - (a) that the initial Contributor has attached the notice described - in Exhibit B to the Covered Software; or - - (b) that the Covered Software was made available under the terms of - version 1.1 or earlier of the License, but not also under the - terms of a Secondary License. - -1.6. "Executable Form" - means any form of the work other than Source Code Form. - -1.7. "Larger Work" - means a work that combines Covered Software with other material, in - a separate file or files, that is not Covered Software. - -1.8. "License" - means this document. - -1.9. "Licensable" - means having the right to grant, to the maximum extent possible, - whether at the time of the initial grant or subsequently, any and - all of the rights conveyed by this License. - -1.10. "Modifications" - means any of the following: - - (a) any file in Source Code Form that results from an addition to, - deletion from, or modification of the contents of Covered - Software; or - - (b) any new file in Source Code Form that contains any Covered - Software. - -1.11. "Patent Claims" of a Contributor - means any patent claim(s), including without limitation, method, - process, and apparatus claims, in any patent Licensable by such - Contributor that would be infringed, but for the grant of the - License, by the making, using, selling, offering for sale, having - made, import, or transfer of either its Contributions or its - Contributor Version. - -1.12. "Secondary License" - means either the GNU General Public License, Version 2.0, the GNU - Lesser General Public License, Version 2.1, the GNU Affero General - Public License, Version 3.0, or any later versions of those - licenses. - -1.13. "Source Code Form" - means the form of the work preferred for making modifications. - -1.14. "You" (or "Your") - means an individual or a legal entity exercising rights under this - License. For legal entities, "You" includes any entity that - controls, is controlled by, or is under common control with You. For - purposes of this definition, "control" means (a) the power, direct - or indirect, to cause the direction or management of such entity, - whether by contract or otherwise, or (b) ownership of more than - fifty percent (50%) of the outstanding shares or beneficial - ownership of such entity. - -2. License Grants and Conditions --------------------------------- - -2.1. Grants - -Each Contributor hereby grants You a world-wide, royalty-free, -non-exclusive license: - -(a) under intellectual property rights (other than patent or trademark) - Licensable by such Contributor to use, reproduce, make available, - modify, display, perform, distribute, and otherwise exploit its - Contributions, either on an unmodified basis, with Modifications, or - as part of a Larger Work; and - -(b) under Patent Claims of such Contributor to make, use, sell, offer - for sale, have made, import, and otherwise transfer either its - Contributions or its Contributor Version. - -2.2. Effective Date - -The licenses granted in Section 2.1 with respect to any Contribution -become effective for each Contribution on the date the Contributor first -distributes such Contribution. - -2.3. Limitations on Grant Scope - -The licenses granted in this Section 2 are the only rights granted under -this License. No additional rights or licenses will be implied from the -distribution or licensing of Covered Software under this License. -Notwithstanding Section 2.1(b) above, no patent license is granted by a -Contributor: - -(a) for any code that a Contributor has removed from Covered Software; - or - -(b) for infringements caused by: (i) Your and any other third party's - modifications of Covered Software, or (ii) the combination of its - Contributions with other software (except as part of its Contributor - Version); or - -(c) under Patent Claims infringed by Covered Software in the absence of - its Contributions. - -This License does not grant any rights in the trademarks, service marks, -or logos of any Contributor (except as may be necessary to comply with -the notice requirements in Section 3.4). - -2.4. Subsequent Licenses - -No Contributor makes additional grants as a result of Your choice to -distribute the Covered Software under a subsequent version of this -License (see Section 10.2) or under the terms of a Secondary License (if -permitted under the terms of Section 3.3). - -2.5. Representation - -Each Contributor represents that the Contributor believes its -Contributions are its original creation(s) or it has sufficient rights -to grant the rights to its Contributions conveyed by this License. - -2.6. Fair Use - -This License is not intended to limit any rights You have under -applicable copyright doctrines of fair use, fair dealing, or other -equivalents. - -2.7. Conditions - -Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted -in Section 2.1. - -3. Responsibilities -------------------- - -3.1. Distribution of Source Form - -All distribution of Covered Software in Source Code Form, including any -Modifications that You create or to which You contribute, must be under -the terms of this License. You must inform recipients that the Source -Code Form of the Covered Software is governed by the terms of this -License, and how they can obtain a copy of this License. You may not -attempt to alter or restrict the recipients' rights in the Source Code -Form. - -3.2. Distribution of Executable Form - -If You distribute Covered Software in Executable Form then: - -(a) such Covered Software must also be made available in Source Code - Form, as described in Section 3.1, and You must inform recipients of - the Executable Form how they can obtain a copy of such Source Code - Form by reasonable means in a timely manner, at a charge no more - than the cost of distribution to the recipient; and - -(b) You may distribute such Executable Form under the terms of this - License, or sublicense it under different terms, provided that the - license for the Executable Form does not attempt to limit or alter - the recipients' rights in the Source Code Form under this License. - -3.3. Distribution of a Larger Work - -You may create and distribute a Larger Work under terms of Your choice, -provided that You also comply with the requirements of this License for -the Covered Software. If the Larger Work is a combination of Covered -Software with a work governed by one or more Secondary Licenses, and the -Covered Software is not Incompatible With Secondary Licenses, this -License permits You to additionally distribute such Covered Software -under the terms of such Secondary License(s), so that the recipient of -the Larger Work may, at their option, further distribute the Covered -Software under the terms of either this License or such Secondary -License(s). - -3.4. Notices - -You may not remove or alter the substance of any license notices -(including copyright notices, patent notices, disclaimers of warranty, -or limitations of liability) contained within the Source Code Form of -the Covered Software, except that You may alter any license notices to -the extent required to remedy known factual inaccuracies. - -3.5. Application of Additional Terms - -You may choose to offer, and to charge a fee for, warranty, support, -indemnity or liability obligations to one or more recipients of Covered -Software. However, You may do so only on Your own behalf, and not on -behalf of any Contributor. You must make it absolutely clear that any -such warranty, support, indemnity, or liability obligation is offered by -You alone, and You hereby agree to indemnify every Contributor for any -liability incurred by such Contributor as a result of warranty, support, -indemnity or liability terms You offer. You may include additional -disclaimers of warranty and limitations of liability specific to any -jurisdiction. - -4. Inability to Comply Due to Statute or Regulation ---------------------------------------------------- - -If it is impossible for You to comply with any of the terms of this -License with respect to some or all of the Covered Software due to -statute, judicial order, or regulation then You must: (a) comply with -the terms of this License to the maximum extent possible; and (b) -describe the limitations and the code they affect. Such description must -be placed in a text file included with all distributions of the Covered -Software under this License. Except to the extent prohibited by statute -or regulation, such description must be sufficiently detailed for a -recipient of ordinary skill to be able to understand it. - -5. Termination --------------- - -5.1. The rights granted under this License will terminate automatically -if You fail to comply with any of its terms. However, if You become -compliant, then the rights granted under this License from a particular -Contributor are reinstated (a) provisionally, unless and until such -Contributor explicitly and finally terminates Your grants, and (b) on an -ongoing basis, if such Contributor fails to notify You of the -non-compliance by some reasonable means prior to 60 days after You have -come back into compliance. Moreover, Your grants from a particular -Contributor are reinstated on an ongoing basis if such Contributor -notifies You of the non-compliance by some reasonable means, this is the -first time You have received notice of non-compliance with this License -from such Contributor, and You become compliant prior to 30 days after -Your receipt of the notice. - -5.2. If You initiate litigation against any entity by asserting a patent -infringement claim (excluding declaratory judgment actions, -counter-claims, and cross-claims) alleging that a Contributor Version -directly or indirectly infringes any patent, then the rights granted to -You by any and all Contributors for the Covered Software under Section -2.1 of this License shall terminate. - -5.3. In the event of termination under Sections 5.1 or 5.2 above, all -end user license agreements (excluding distributors and resellers) which -have been validly granted by You or Your distributors under this License -prior to termination shall survive termination. - -************************************************************************ -* * -* 6. Disclaimer of Warranty * -* ------------------------- * -* * -* Covered Software is provided under this License on an "as is" * -* basis, without warranty of any kind, either expressed, implied, or * -* statutory, including, without limitation, warranties that the * -* Covered Software is free of defects, merchantable, fit for a * -* particular purpose or non-infringing. The entire risk as to the * -* quality and performance of the Covered Software is with You. * -* Should any Covered Software prove defective in any respect, You * -* (not any Contributor) assume the cost of any necessary servicing, * -* repair, or correction. This disclaimer of warranty constitutes an * -* essential part of this License. No use of any Covered Software is * -* authorized under this License except under this disclaimer. * -* * -************************************************************************ - -************************************************************************ -* * -* 7. Limitation of Liability * -* -------------------------- * -* * -* Under no circumstances and under no legal theory, whether tort * -* (including negligence), contract, or otherwise, shall any * -* Contributor, or anyone who distributes Covered Software as * -* permitted above, be liable to You for any direct, indirect, * -* special, incidental, or consequential damages of any character * -* including, without limitation, damages for lost profits, loss of * -* goodwill, work stoppage, computer failure or malfunction, or any * -* and all other commercial damages or losses, even if such party * -* shall have been informed of the possibility of such damages. This * -* limitation of liability shall not apply to liability for death or * -* personal injury resulting from such party's negligence to the * -* extent applicable law prohibits such limitation. Some * -* jurisdictions do not allow the exclusion or limitation of * -* incidental or consequential damages, so this exclusion and * -* limitation may not apply to You. * -* * -************************************************************************ - -8. Litigation -------------- - -Any litigation relating to this License may be brought only in the -courts of a jurisdiction where the defendant maintains its principal -place of business and such litigation shall be governed by laws of that -jurisdiction, without reference to its conflict-of-law provisions. -Nothing in this Section shall prevent a party's ability to bring -cross-claims or counter-claims. - -9. Miscellaneous ----------------- - -This License represents the complete agreement concerning the subject -matter hereof. If any provision of this License is held to be -unenforceable, such provision shall be reformed only to the extent -necessary to make it enforceable. Any law or regulation which provides -that the language of a contract shall be construed against the drafter -shall not be used to construe this License against a Contributor. - -10. Versions of the License ---------------------------- - -10.1. New Versions - -Mozilla Foundation is the license steward. Except as provided in Section -10.3, no one other than the license steward has the right to modify or -publish new versions of this License. Each version will be given a -distinguishing version number. - -10.2. Effect of New Versions - -You may distribute the Covered Software under the terms of the version -of the License under which You originally received the Covered Software, -or under the terms of any subsequent version published by the license -steward. - -10.3. Modified Versions - -If you create software not governed by this License, and you want to -create a new license for such software, you may create and use a -modified version of this License if you rename the license and remove -any references to the name of the license steward (except to note that -such modified license differs from this License). - -10.4. Distributing Source Code Form that is Incompatible With Secondary -Licenses - -If You choose to distribute Source Code Form that is Incompatible With -Secondary Licenses under the terms of this version of the License, the -notice described in Exhibit B of this License must be attached. - -Exhibit A - Source Code Form License Notice -------------------------------------------- - - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. - -If it is not possible or desirable to put the notice in a particular -file, then You may include the notice in a location (such as a LICENSE -file in a relevant directory) where a recipient would be likely to look -for such a notice. - -You may add additional accurate notices of copyright ownership. - -Exhibit B - "Incompatible With Secondary Licenses" Notice ---------------------------------------------------------- - - This Source Code Form is "Incompatible With Secondary Licenses", as - defined by the Mozilla Public License, v. 2.0. - diff --git a/README b/README new file mode 100644 index 0000000..f8c6ca9 --- /dev/null +++ b/README @@ -0,0 +1,79 @@ +Diagnostic Log and Trace - Readme +================================== +Alexander Wenzel + +Overview +-------- +This component provides a standardised log and trace interface, based on the +standardised protocol specified in the AUTOSAR standard 4.0 DLT. +This component can be used by GENIVI components and other applications as +logging facility providing + +- the DLT shared library +- the DLT daemon +- the DLT daemon adaptors +- the DLT client console utilities +- the DLT test applications + +The DLT daemon is the central component in GENIVI, which gathers all +logs and traces from the DLT user applications. The logs and traces +are stored optionally directly in a file in the ECU. The DLT daemon +forwards all logs and traces to a connected DLT client. +The DLT client can send control messages to the daemon, e.g. to set +individual log levels of applications and contexts or get the list of +applications and contexts registered in the DLT daemon. + +Documentation +------------- +- DLT Release Notes: ReleaseNotes.txt +- DLT Installation: INSTALL +- DLT User Manual: doc/dlt_user_manual.txt +- DLT Cheatsheet: doc/dlt_cheatsheet.txt +- DLT Design Specification :doc/dlt_design_specification.txt + +API Documentation +----------------- +See INSTALL regarding doxygen API documentation generation. + +Manpages +-------- +- dlt-daemon(1) +- dlt.conf(5) +- dlt-system(1) +- dlt-system.conf(5) +- dlt-receive(1) +- dlt-convert(9) + +Known issues +------------ +- DLT library: Usage of dlt_user_log_write_float64() and DLT_FLOAT64() leads to "Illegal instruction (core dumped)" on ARM target. +- DLT library: Nested calls to DLT_LOG_ ... are not supported, and will lead to a deadlock. + +Software/Hardware +----------------- +Developped and tested with Ubuntu Linux 12.04 32-bit / Intel PC + +License +------- +Full information on the license for this software is available in the "LICENSE" file. + +Source Code +----------- +git://git.projects.genivi.org/dlt-daemon.git +http://git.projects.genivi.org/dlt-daemon.git +ssh://git-genivi@git.projects.genivi.org/dlt-daemon.git + +Homepage +-------- +http://projects.genivi.org/diagnostic-log-trace + +Mailinglist +----------- +https://lists.genivi.org/mailman/listinfo/genivi-diagnostic-log-and-trace + +Contact +------- +Alexander Wenzel + +Christian Muck + + diff --git a/README.txt b/README.txt deleted file mode 100644 index a6d2c08..0000000 --- a/README.txt +++ /dev/null @@ -1,79 +0,0 @@ -Diagnostic Log and Trace - Readme -================================== -Alexander Wenzel - -Overview --------- -This component provides a standardised log and trace interface, based on the -standardised protocol specified in the AUTOSAR standard 4.0 DLT. -This component can be used by GENIVI components and other applications as -logging facility providing - -- the DLT shared library -- the DLT daemon -- the DLT daemon adaptors -- the DLT client console utilities -- the DLT test applications - -The DLT daemon is the central component in GENIVI, which gathers all -logs and traces from the DLT user applications. The logs and traces -are stored optionally directly in a file in the ECU. The DLT daemon -forwards all logs and traces to a connected DLT client. -The DLT client can send control messages to the daemon, e.g. to set -individual log levels of applications and contexts or get the list of -applications and contexts registered in the DLT daemon. - -Documentation -------------- -- DLT Release Notes: ReleaseNotes.txt -- DLT Installation: INSTALL.txt -- DLT User Manual: doc/dlt_user_manual.txt -- DLT Cheatsheet: doc/dlt_cheatsheet.txt -- DLT Design Specification :doc/dlt_design_specification.txt - -API Documentation ------------------ -See INSTALL.txt regarding doxygen API documentation generation. - -Manpages --------- -- dlt-daemon(1) -- dlt.conf(5) -- dlt-system(1) -- dlt-system.conf(5) -- dlt-receive(1) -- dlt-convert(9) - -Known issues ------------- -- DLT library: Usage of dlt_user_log_write_float64() and DLT_FLOAT64() leads to "Illegal instruction (core dumped)" on ARM target. -- DLT library: Nested calls to DLT_LOG_ ... are not supported, and will lead to a deadlock. - -Software/Hardware ------------------ -Developped and tested with Ubuntu Linux 12.04 32-bit / Intel PC - -License -------- -Full information on the license for this software is available in the "LICENSE.txt" file. - -Source Code ------------ -git://git.projects.genivi.org/dlt-daemon.git -http://git.projects.genivi.org/dlt-daemon.git -ssh://git-genivi@git.projects.genivi.org/dlt-daemon.git - -Homepage --------- -http://projects.genivi.org/diagnostic-log-trace - -Mailinglist ------------ -https://lists.genivi.org/mailman/listinfo/genivi-diagnostic-log-and-trace - -Contact -------- -Alexander Wenzel + -Christian Muck - - diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 4319eac..e44039c 100755 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -10,6 +10,7 @@ Changes ------- 2.11.0 + * New macros for Format of Hex and Binary. * Enable dbus trace when adaptor starts up. * Added configuration of dbus filter. diff --git a/automotive-dlt.pc.in b/automotive-dlt.pc.in index 2008d9f..d960514 100755 --- a/automotive-dlt.pc.in +++ b/automotive-dlt.pc.in @@ -1,3 +1,20 @@ +####### +# @licence make begin@ +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. +# +# This Source Code Form is subject to the terms of the +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. +# +# For further information see http://www.genivi.org/. +# @licence end@ +####### + prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=@CMAKE_INSTALL_PREFIX@ libdir=${exec_prefix}/lib diff --git a/automotive-dlt.spec.in b/automotive-dlt.spec.in index e93833f..5557529 100644 --- a/automotive-dlt.spec.in +++ b/automotive-dlt.spec.in @@ -1,3 +1,20 @@ +####### +# @licence make begin@ +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. +# +# This Source Code Form is subject to the terms of the +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. +# +# For further information see http://www.genivi.org/. +# @licence end@ +####### + Name: @PROJECT_NAME@ Version: @DLT_VERSION@ Release: @GENIVI_RPM_RELEASE@ diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 0dad9f5..4dead3a 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -1,3 +1,20 @@ +####### +# @licence make begin@ +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. +# +# This Source Code Form is subject to the terms of the +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. +# +# For further information see http://www.genivi.org/. +# @licence end@ +####### + # Run CheckIncludeFiles and CheckFunctionExists include(TestBigEndian) TEST_BIG_ENDIAN( DLT_BIGENDIAN ) diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake index f9e701b..ddedecb 100755 --- a/cmake/config.h.cmake +++ b/cmake/config.h.cmake @@ -1,3 +1,20 @@ +/* + * @licence app begin@ + * SPDX license identifier: MPL-2.0 + * + * Copyright (C) 2011-2015, BMW AG" + * + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. + * + * This Source Code Form is subject to the terms of the + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. + * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + // DO NOT EDIT! GENERATED AUTOMATICALLY! // cmakedefine01 sets #define [0|1] if variable is defined in cmake // variable is set by CHECK_INCLUDE_FILES and CHECK_FUNCTION_EXISTS diff --git a/cmake/dlt_version.h.cmake b/cmake/dlt_version.h.cmake index ba94983..39826e5 100755 --- a/cmake/dlt_version.h.cmake +++ b/cmake/dlt_version.h.cmake @@ -1,3 +1,20 @@ +/* + * @licence app begin@ + * SPDX license identifier: MPL-2.0 + * + * Copyright (C) 2011-2015, BMW AG" + * + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. + * + * This Source Code Form is subject to the terms of the + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. + * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ #ifndef __DLT_VERSION_H_ #define __DLT_VERSION_H_ diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index d670614..9eee003 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,17 +1,19 @@ ####### -# Dlt - Diagnostic Log and Trace # @licence make begin@ +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. +# +# For further information see http://www.genivi.org/. # @licence end@ -######## +####### if(WITH_DOC) find_package(Doxygen) @@ -27,8 +29,8 @@ if(WITH_DOC) COMMAND mkdir -p ${CMAKE_BINARY_DIR}/doc/manuals COMMAND mkdir -p ${CMAKE_BINARY_DIR}/doc/manuals/images COMMAND cp ${CMAKE_SOURCE_DIR}/doc/images/* ${CMAKE_BINARY_DIR}/doc/manuals/images - COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/INSTALL.html ${CMAKE_SOURCE_DIR}/INSTALL.txt - COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/README.html ${CMAKE_SOURCE_DIR}/README.txt + COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/INSTALL.html ${CMAKE_SOURCE_DIR}/INSTALL + COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/README.html ${CMAKE_SOURCE_DIR}/README COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/ReleaseNotes.html ${CMAKE_SOURCE_DIR}/ReleaseNotes.txt COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt_user_manual.html ${CMAKE_SOURCE_DIR}/doc/dlt_user_manual.txt COMMAND asciidoc -a TOC1 -o ${CMAKE_BINARY_DIR}/doc/manuals/dlt_cheatsheet.html ${CMAKE_SOURCE_DIR}/doc/dlt_cheatsheet.txt diff --git a/doc/dlt-convert.1 b/doc/dlt-convert.1 index 90f7d33..2431d39 100644 --- a/doc/dlt-convert.1 +++ b/doc/dlt-convert.1 @@ -1,13 +1,13 @@ '\" t .\" Title: dlt-convert .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.76.1 -.\" Date: 10/12/2012 +.\" Generator: DocBook XSL Stylesheets v1.78.1 +.\" Date: 05/12/2015 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "DLT\-CONVERT" "1" "10/12/2012" "\ \&" "\ \&" +.TH "DLT\-CONVERT" "1" "05/12/2015" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -95,31 +95,26 @@ Follow dlt file while file is increasing\&. .PP Start DLT daemon in background mode .RS 4 - \fBdlt\-daemon \-d\fR .RE .PP Start DLT daemon with own configuration .RS 4 - \fBdlt\-daemon \-c ~/my\-dlt\-configuration\&.cfg\fR .RE .PP Convert DLT file into ASCII .RS 4 - \fBdlt\-convert \-a mylog\&.dlt\fR .RE .PP Cut a specific range, e\&.g\&. from message 1 to message 3 from a file called log\&.dlt and store the result to a file called newlog\&.dlt .RS 4 - \fBdlt\-convert \-b 1 \-e 3 \-o newlog\&.dlt log\&.dlt\fR .RE .PP Paste two dlt files log1\&.dlt and log2\&.dlt to a new file called newlog\&.dlt .RS 4 - \fBdlt\-convert \-o newlog\&.dlt log1\&.dlt log2\&.dlt\fR .RE .SH "EXIT STATUS" @@ -128,6 +123,9 @@ Non zero is returned in case of failure\&. .SH "AUTHOR" .sp Alexander Wenzel (alexander\&.aw\&.wenzel (at) bmw\&.de) +.SH "COPYRIGHT" +.sp +Copyright \(co 2015 BMW AG\&. License MPL\-2\&.0: Mozilla Public License version 2\&.0 http://mozilla\&.org/MPL/2\&.0/\&. .SH "RESOURCES" .sp Main web site: http://projects\&.genivi\&.org/diagnostic\-log\-trace Mailinglist: https://lists\&.genivi\&.org/mailman/listinfo/genivi\-diagnostic\-log\-and\-trace diff --git a/doc/dlt-convert.1.txt b/doc/dlt-convert.1.txt index 37d4886..17ff71e 100644 --- a/doc/dlt-convert.1.txt +++ b/doc/dlt-convert.1.txt @@ -76,6 +76,10 @@ AUTHOR ------ Alexander Wenzel (alexander.aw.wenzel (at) bmw.de) +COPYRIGHT +--------- +Copyright (C) 2015 BMW AG. License MPL-2.0: Mozilla Public License version 2.0 . + RESOURCES --------- Main web site: + diff --git a/doc/dlt-daemon.1 b/doc/dlt-daemon.1 index 44dbb00..b668f9c 100644 --- a/doc/dlt-daemon.1 +++ b/doc/dlt-daemon.1 @@ -1,13 +1,13 @@ '\" t .\" Title: dlt-daemon .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.76.1 -.\" Date: 10/12/2012 +.\" Generator: DocBook XSL Stylesheets v1.78.1 +.\" Date: 05/12/2015 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "DLT\-DAEMON" "1" "10/12/2012" "\ \&" "\ \&" +.TH "DLT\-DAEMON" "1" "05/12/2015" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -55,13 +55,11 @@ Load an alternative configuration file\&. By default the configuration file /etc .PP Start DLT daemon in background mode .RS 4 - \fBdlt\-daemon \-d\fR .RE .PP Start DLT daemon with own configuration .RS 4 - \fBdlt\-daemon \-c ~/my\-dlt\-configuration\&.cfg\fR .RE .SH "EXIT STATUS" @@ -70,6 +68,9 @@ Non zero is returned in case of failure\&. .SH "AUTHOR" .sp Alexander Wenzel (alexander\&.aw\&.wenzel (at) bmw\&.de) +.SH "COPYRIGHT" +.sp +Copyright \(co 2015 BMW AG\&. License MPL\-2\&.0: Mozilla Public License version 2\&.0 http://mozilla\&.org/MPL/2\&.0/\&. .SH "RESOURCES" .sp Main web site: http://projects\&.genivi\&.org/diagnostic\-log\-trace Mailinglist: https://lists\&.genivi\&.org/mailman/listinfo/genivi\-diagnostic\-log\-and\-trace diff --git a/doc/dlt-daemon.1.txt b/doc/dlt-daemon.1.txt index 69159a7..5b3d306 100644 --- a/doc/dlt-daemon.1.txt +++ b/doc/dlt-daemon.1.txt @@ -45,6 +45,10 @@ AUTHOR ------ Alexander Wenzel (alexander.aw.wenzel (at) bmw.de) +COPYRIGHT +--------- +Copyright (C) 2015 BMW AG. License MPL-2.0: Mozilla Public License version 2.0 . + RESOURCES --------- Main web site: + diff --git a/doc/dlt-receive.1 b/doc/dlt-receive.1 index 4a80d94..9efbbca 100644 --- a/doc/dlt-receive.1 +++ b/doc/dlt-receive.1 @@ -1,13 +1,13 @@ '\" t .\" Title: dlt-receive .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.76.1 -.\" Date: 10/12/2012 +.\" Generator: DocBook XSL Stylesheets v1.78.1 +.\" Date: 05/12/2015 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "DLT\-RECEIVE" "1" "10/12/2012" "\ \&" "\ \&" +.TH "DLT\-RECEIVE" "1" "05/12/2015" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -108,6 +108,9 @@ Non zero is returned in case of failure\&. .SH "AUTHOR" .sp Alexander Wenzel (alexander\&.aw\&.wenzel (at) bmw\&.de) +.SH "COPYRIGHT" +.sp +Copyright \(co 2015 BMW AG\&. License MPL\-2\&.0: Mozilla Public License version 2\&.0 http://mozilla\&.org/MPL/2\&.0/\&. .SH "RESOURCES" .sp Main web site: http://projects\&.genivi\&.org/diagnostic\-log\-trace Mailinglist: https://lists\&.genivi\&.org/mailman/listinfo/genivi\-diagnostic\-log\-and\-trace diff --git a/doc/dlt-receive.1.txt b/doc/dlt-receive.1.txt index 440ac2b..1c9e8be 100644 --- a/doc/dlt-receive.1.txt +++ b/doc/dlt-receive.1.txt @@ -65,6 +65,10 @@ AUTHOR ------ Alexander Wenzel (alexander.aw.wenzel (at) bmw.de) +COPYRIGHT +--------- +Copyright (C) 2015 BMW AG. License MPL-2.0: Mozilla Public License version 2.0 . + RESOURCES --------- Main web site: + diff --git a/doc/dlt-system.1 b/doc/dlt-system.1 index faef769..951f366 100644 --- a/doc/dlt-system.1 +++ b/doc/dlt-system.1 @@ -1,13 +1,13 @@ '\" t .\" Title: dlt-system .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.76.1 -.\" Date: 10/12/2012 +.\" Generator: DocBook XSL Stylesheets v1.78.1 +.\" Date: 05/12/2015 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "DLT\-SYSTEM" "1" "10/12/2012" "\ \&" "\ \&" +.TH "DLT\-SYSTEM" "1" "05/12/2015" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -60,6 +60,9 @@ Non zero is returned in case of failure\&. .SH "AUTHOR" .sp Alexander Wenzel (alexander\&.aw\&.wenzel (at) bmw\&.de) +.SH "COPYRIGHT" +.sp +Copyright \(co 2015 BMW AG\&. License MPL\-2\&.0: Mozilla Public License version 2\&.0 http://mozilla\&.org/MPL/2\&.0/\&. .SH "RESOURCES" .sp Main web site: http://projects\&.genivi\&.org/diagnostic\-log\-trace Mailinglist: https://lists\&.genivi\&.org/mailman/listinfo/genivi\-diagnostic\-log\-and\-trace diff --git a/doc/dlt-system.1.txt b/doc/dlt-system.1.txt index 81d8033..6b26b6b 100644 --- a/doc/dlt-system.1.txt +++ b/doc/dlt-system.1.txt @@ -43,6 +43,10 @@ AUTHOR ------ Alexander Wenzel (alexander.aw.wenzel (at) bmw.de) +COPYRIGHT +--------- +Copyright (C) 2015 BMW AG. License MPL-2.0: Mozilla Public License version 2.0 . + RESOURCES --------- Main web site: + diff --git a/doc/dlt-system.conf.5 b/doc/dlt-system.conf.5 index 2f100ff..91442ec 100644 --- a/doc/dlt-system.conf.5 +++ b/doc/dlt-system.conf.5 @@ -1,13 +1,13 @@ '\" t .\" Title: dlt-system.conf .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.76.1 -.\" Date: 10/12/2012 +.\" Generator: DocBook XSL Stylesheets v1.78.1 +.\" Date: 05/12/2015 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "DLT\-SYSTEM\&.CONF" "5" "10/12/2012" "\ \&" "\ \&" +.TH "DLT\-SYSTEM\&.CONF" "5" "05/12/2015" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/dlt.conf.5 b/doc/dlt.conf.5 index 99cd507..62ca224 100644 --- a/doc/dlt.conf.5 +++ b/doc/dlt.conf.5 @@ -1,13 +1,13 @@ '\" t .\" Title: dlt.conf .\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.76.1 -.\" Date: 10/12/2012 +.\" Generator: DocBook XSL Stylesheets v1.78.1 +.\" Date: 05/12/2015 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "DLT\&.CONF" "5" "10/12/2012" "\ \&" "\ \&" +.TH "DLT\&.CONF" "5" "05/12/2015" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -311,13 +311,11 @@ Absolute path to file storing version information \- if disabled the DLT version .PP Start DLT daemon in background mode .RS 4 - \fBdlt\-daemon \-d\fR .RE .PP Start DLT daemon with own configuration .RS 4 - \fBdlt\-daemon \-c ~/my\-dlt\-configuration\&.cfg\fR .RE .SH "AUTHOR" diff --git a/doc/dlt_book.txt b/doc/dlt_book.txt index e883b57..af05a94 100644 --- a/doc/dlt_book.txt +++ b/doc/dlt_book.txt @@ -1,3 +1,18 @@ +//// +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. +# +# This Source Code Form is subject to the terms of the +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. +# +# For further information see http://www.genivi.org/. +//// + DLT Documentation ================= Alexander Wenzel @@ -14,9 +29,9 @@ Information :leveloffset: 1 -include::../README.txt[] +include::../README[] -include::../INSTALL.txt[] +include::../INSTALL[] include::../ReleaseNotes.txt[] diff --git a/doc/dlt_cheatsheet.txt b/doc/dlt_cheatsheet.txt index 906378b..3d50ce4 100644 --- a/doc/dlt_cheatsheet.txt +++ b/doc/dlt_cheatsheet.txt @@ -1,3 +1,18 @@ +//// +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. +# +# This Source Code Form is subject to the terms of the +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. +# +# For further information see http://www.genivi.org/. +//// + DLT Cheatsheet ============== Alexander Wenzel diff --git a/doc/dlt_design_specification.txt b/doc/dlt_design_specification.txt index 0fc0cda..8cc0dde 100644 --- a/doc/dlt_design_specification.txt +++ b/doc/dlt_design_specification.txt @@ -1,3 +1,18 @@ +//// +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. +# +# This Source Code Form is subject to the terms of the +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. +# +# For further information see http://www.genivi.org/. +//// + DLT Design Specification ======================== Alexander Wenzel diff --git a/doc/dlt_extended_network_trace.txt b/doc/dlt_extended_network_trace.txt index dd45a91..1277e9c 100644 --- a/doc/dlt_extended_network_trace.txt +++ b/doc/dlt_extended_network_trace.txt @@ -1,3 +1,18 @@ +//// +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. +# +# This Source Code Form is subject to the terms of the +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. +# +# For further information see http://www.genivi.org/. +//// + Extended Network Trace ====================== Lassi Marttala diff --git a/doc/dlt_filetransfer.txt b/doc/dlt_filetransfer.txt index 27124ae..1dadd92 100644 --- a/doc/dlt_filetransfer.txt +++ b/doc/dlt_filetransfer.txt @@ -1,3 +1,18 @@ +//// +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. +# +# This Source Code Form is subject to the terms of the +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. +# +# For further information see http://www.genivi.org/. +//// + DLT Filetransfer ================ Christian Muck diff --git a/doc/dlt_howto_debug.txt b/doc/dlt_howto_debug.txt index 7d0d8e6..95eb020 100644 --- a/doc/dlt_howto_debug.txt +++ b/doc/dlt_howto_debug.txt @@ -1,3 +1,18 @@ +//// +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. +# +# This Source Code Form is subject to the terms of the +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. +# +# For further information see http://www.genivi.org/. +//// + How To - Debug DLT Daemon ========================= Lassi Marttala diff --git a/doc/dlt_user_manual.txt b/doc/dlt_user_manual.txt index 54773e9..e8abcfa 100644 --- a/doc/dlt_user_manual.txt +++ b/doc/dlt_user_manual.txt @@ -1,3 +1,18 @@ +//// +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. +# +# This Source Code Form is subject to the terms of the +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. +# +# For further information see http://www.genivi.org/. +//// + DLT User Manual =============== Alexander Wenzel @@ -260,7 +275,7 @@ Two types of DLT user interfaces are provided to applications. The first interfa The doxygen documentation of the dlt-daemon contains more informations about functional/macro based interfaces. -See INSTALL.txt how to generate doxygen documentation. +See INSTALL file how to generate doxygen documentation. === DLT macro interface The DLT macro interface provides a very easy to use interface. It is very easy to log a flexible size of parameters into a single log in a single source code line. diff --git a/doc/doxygen.cfg.cmake b/doc/doxygen.cfg.cmake index d5f44d0..d2ecc6f 100755 --- a/doc/doxygen.cfg.cmake +++ b/doc/doxygen.cfg.cmake @@ -1,3 +1,20 @@ +####### +# @licence make begin@ +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. +# +# This Source Code Form is subject to the terms of the +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. +# +# For further information see http://www.genivi.org/. +# @licence end@ +####### + # Doxyfile 1.5.8 # This file describes the settings to be used by the documentation system diff --git a/doc/extended_network_trace_doxygen.cfg.cmake b/doc/extended_network_trace_doxygen.cfg.cmake index b7f997f..275820e 100755 --- a/doc/extended_network_trace_doxygen.cfg.cmake +++ b/doc/extended_network_trace_doxygen.cfg.cmake @@ -1,3 +1,20 @@ +####### +# @licence make begin@ +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. +# +# This Source Code Form is subject to the terms of the +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. +# +# For further information see http://www.genivi.org/. +# @licence end@ +####### + # Doxyfile 1.5.8 # This file describes the settings to be used by the documentation system diff --git a/doc/mainpage.h b/doc/mainpage.h index 757c727..749ca81 100644 --- a/doc/mainpage.h +++ b/doc/mainpage.h @@ -1,27 +1,27 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * - * \author Alexander Wenzel BMW 2011-2012 + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * * For further information see http://www.genivi.org/. * @licence end@ */ - + /*! \mainpage +\author Alexander Wenzel +\copyright Copyright © 2015 BMW AG. \n +License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + \par More information can be found at http://projects.genivi.org/diagnostic-log-trace/ \n diff --git a/examples/README.txt b/examples/README.txt index 6599b7c..5d871b6 100644 --- a/examples/README.txt +++ b/examples/README.txt @@ -1,3 +1,9 @@ +Copyright (C) 2015 BMW AG. + +Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. + This folder contains several examples of applications using the DLT library. These examples will be extended in the future to show different Use Cases. Example1: Minimal DLT Example diff --git a/examples/example1/CMakeLists.txt b/examples/example1/CMakeLists.txt index d95ebfc..f18526d 100755 --- a/examples/example1/CMakeLists.txt +++ b/examples/example1/CMakeLists.txt @@ -1,18 +1,19 @@ ####### -# Dlt - Diagnostic Log and Trace # @licence make begin@ +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. # -# Copyright (C) 2011-2014, BMW AG - Alexander Wenzel -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. # +# For further information see http://www.genivi.org/. # @licence end@ -######## +####### # # DLT example implementation diff --git a/examples/example1/example1.c b/examples/example1/example1.c index 4c812dd..e525781 100644 --- a/examples/example1/example1.c +++ b/examples/example1/example1.c @@ -1,25 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2014 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * - * \author Alexander Wenzel BMW 2011-2012 - * - * \file dlt-example-user.c * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file example1.c +*/ + /******************************************************************************* ** ** diff --git a/examples/example2/CMakeLists.txt b/examples/example2/CMakeLists.txt index fd7bae8..d081b56 100755 --- a/examples/example2/CMakeLists.txt +++ b/examples/example2/CMakeLists.txt @@ -1,18 +1,19 @@ ####### -# Dlt - Diagnostic Log and Trace # @licence make begin@ +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. # -# Copyright (C) 2011-2014, BMW AG - Alexander Wenzel -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. # +# For further information see http://www.genivi.org/. # @licence end@ -######## +####### # # DLT example implementation diff --git a/examples/example2/dlt_id.h b/examples/example2/dlt_id.h index e5d1dbc..5c93d6f 100644 --- a/examples/example2/dlt_id.h +++ b/examples/example2/dlt_id.h @@ -1,3 +1,20 @@ +/* + * @licence app begin@ + * SPDX license identifier: MPL-2.0 + * + * Copyright (C) 2011-2015, BMW AG" + * + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. + * + * This Source Code Form is subject to the terms of the + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. + * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + // generated file, do not edit #ifndef DLT_ID_H diff --git a/examples/example2/example2.c b/examples/example2/example2.c index 7daa9a9..73c1916 100644 --- a/examples/example2/example2.c +++ b/examples/example2/example2.c @@ -1,25 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2014 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * - * \author Alexander Wenzel BMW 2011-2012 - * - * \file dlt-example-user.c * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file example2.c +*/ + /******************************************************************************* ** ** diff --git a/examples/example3/CMakeLists.txt b/examples/example3/CMakeLists.txt index 7e7cf1a..92e5385 100755 --- a/examples/example3/CMakeLists.txt +++ b/examples/example3/CMakeLists.txt @@ -1,18 +1,19 @@ ####### -# Dlt - Diagnostic Log and Trace # @licence make begin@ +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. # -# Copyright (C) 2011-2014, BMW AG - Alexander Wenzel -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. # +# For further information see http://www.genivi.org/. # @licence end@ -######## +####### # # DLT example implementation diff --git a/examples/example3/dlt_id.h b/examples/example3/dlt_id.h index 844de3c..29a3b91 100644 --- a/examples/example3/dlt_id.h +++ b/examples/example3/dlt_id.h @@ -1,3 +1,20 @@ +/* + * @licence app begin@ + * SPDX license identifier: MPL-2.0 + * + * Copyright (C) 2011-2015, BMW AG" + * + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. + * + * This Source Code Form is subject to the terms of the + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. + * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + // generated file, do not edit #ifndef DLT_ID_H diff --git a/examples/example3/example3.c b/examples/example3/example3.c index 737a2a1..4c90f97 100644 --- a/examples/example3/example3.c +++ b/examples/example3/example3.c @@ -1,25 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2014 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * - * \author Alexander Wenzel BMW 2011-2012 - * - * \file dlt-example-user.c * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file example3.c +*/ + /******************************************************************************* ** ** diff --git a/examples/example4/CMakeLists.txt b/examples/example4/CMakeLists.txt index e558904..c56a340 100755 --- a/examples/example4/CMakeLists.txt +++ b/examples/example4/CMakeLists.txt @@ -1,18 +1,19 @@ ####### -# Dlt - Diagnostic Log and Trace # @licence make begin@ +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. # -# Copyright (C) 2011-2014, BMW AG - Alexander Wenzel -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. # +# For further information see http://www.genivi.org/. # @licence end@ -######## +####### # # DLT example implementation diff --git a/examples/example4/example4.c b/examples/example4/example4.c index 4b7d862..4e11ae8 100644 --- a/examples/example4/example4.c +++ b/examples/example4/example4.c @@ -1,25 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2014 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * - * \author Alexander Wenzel BMW 2011-2012 - * - * \file example4.c * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file example4.c +*/ + /******************************************************************************* ** ** diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index b567380..02e4b27 100755 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -1,18 +1,19 @@ ####### -# Dlt - Diagnostic Log and Trace # @licence make begin@ +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. # +# For further information see http://www.genivi.org/. # @licence end@ -######## +####### ADD_SUBDIRECTORY( dlt ) diff --git a/include/dlt/CMakeLists.txt b/include/dlt/CMakeLists.txt index 76121dd..94aeaf4 100644 --- a/include/dlt/CMakeLists.txt +++ b/include/dlt/CMakeLists.txt @@ -1,18 +1,19 @@ ####### -# Dlt - Diagnostic Log and Trace # @licence make begin@ +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. # +# For further information see http://www.genivi.org/. # @licence end@ -######## +####### install(FILES dlt.h dlt_user.h dlt_user_macros.h dlt_client.h dlt_protocol.h dlt_common.h dlt_types.h dlt_version.h dlt_shm.h dlt_offline_trace.h dlt_filetransfer.h dlt_common_api.h DESTINATION include/dlt diff --git a/include/dlt/dlt.h b/include/dlt/dlt.h index e4bc367..b814077 100755 --- a/include/dlt/dlt.h +++ b/include/dlt/dlt.h @@ -1,25 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. - * + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * \author Alexander Wenzel BMW 2011-2012 - * - * \file dlt.h * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt.h +*/ + /******************************************************************************* ** ** ** SRC-MODULE: dlt.h ** diff --git a/include/dlt/dlt_client.h b/include/dlt/dlt_client.h index 29c7c1b..c62a389 100755 --- a/include/dlt/dlt_client.h +++ b/include/dlt/dlt_client.h @@ -1,25 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. - * + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * \author Alexander Wenzel BMW 2011-2012 - * - * \file dlt_client.h * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt_client.h +*/ + /******************************************************************************* ** ** diff --git a/include/dlt/dlt_common.h b/include/dlt/dlt_common.h index a0d48f6..6e27d4c 100755 --- a/include/dlt/dlt_common.h +++ b/include/dlt/dlt_common.h @@ -1,25 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. - * + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * \author Alexander Wenzel BMW 2011-2012 - * - * \file dlt_common.h * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt_common.h +*/ + /******************************************************************************* ** ** ** SRC-MODULE: dlt_common.h ** diff --git a/include/dlt/dlt_common_api.h b/include/dlt/dlt_common_api.h index c6670b5..bcd0fed 100644 --- a/include/dlt/dlt_common_api.h +++ b/include/dlt/dlt_common_api.h @@ -1,25 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2014 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. - * + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * \author Alexander Wenzel BMW 2011-2012 - * - * \file dlt_common_api.h * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt_common_api.h +*/ + /******************************************************************************* ** ** ** SRC-MODULE: dlt_commpn_api.h ** diff --git a/include/dlt/dlt_filetransfer.h b/include/dlt/dlt_filetransfer.h index 44436e7..89e5c7a 100644 --- a/include/dlt/dlt_filetransfer.h +++ b/include/dlt/dlt_filetransfer.h @@ -1,22 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * \file dlt_filetransfer.h * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt_filetransfer.h +*/ + #include /* Needed for LONG_MAX */ #include /* Needed for struct stat st*/ #include "dlt.h" /* Needed for DLT Logs */ diff --git a/include/dlt/dlt_offline_trace.h b/include/dlt/dlt_offline_trace.h index 0e7a356..efef08a 100644 --- a/include/dlt/dlt_offline_trace.h +++ b/include/dlt/dlt_offline_trace.h @@ -1,25 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. - * + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * \author Alexander Wenzel BMW 2011-2012 - * - * \file dlt_offline_trace.h * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt_offline_trace.h +*/ + /******************************************************************************* ** ** diff --git a/include/dlt/dlt_protocol.h b/include/dlt/dlt_protocol.h index df5a33d..9c5ea35 100755 --- a/include/dlt/dlt_protocol.h +++ b/include/dlt/dlt_protocol.h @@ -1,25 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * - * \author Alexander Wenzel BMW 2011-2012 + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * \file dlt_protocal.h * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt_protocol.h +*/ + /******************************************************************************* ** ** diff --git a/include/dlt/dlt_shm.h b/include/dlt/dlt_shm.h index f8b821a..463e1c1 100644 --- a/include/dlt/dlt_shm.h +++ b/include/dlt/dlt_shm.h @@ -1,25 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. - * + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * \author Alexander Wenzel BMW 2011-2012 - * - * \file dlt_shm.h * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt_shm.h +*/ + /******************************************************************************* ** ** diff --git a/include/dlt/dlt_types.h b/include/dlt/dlt_types.h index b66e518..819c25c 100755 --- a/include/dlt/dlt_types.h +++ b/include/dlt/dlt_types.h @@ -1,25 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * - * \author Alexander Wenzel BMW 2011-2012 - * - * \file dlt_types.h * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt_types.h +*/ + /******************************************************************************* ** ** diff --git a/include/dlt/dlt_user.h b/include/dlt/dlt_user.h index 10de203..ff73910 100644 --- a/include/dlt/dlt_user.h +++ b/include/dlt/dlt_user.h @@ -1,25 +1,28 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. - * + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * \author Alexander Wenzel BMW 2011-2012 - * - * \file dlt_user.h * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt_user.h +*/ /******************************************************************************* ** ** diff --git a/include/dlt/dlt_user_macros.h b/include/dlt/dlt_user_macros.h index 23a6f49..e79f712 100644 --- a/include/dlt/dlt_user_macros.h +++ b/include/dlt/dlt_user_macros.h @@ -1,25 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. - * + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * \author Alexander Wenzel BMW 2011-2012 - * - * \file dlt_user_macros.h * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt_user_macros.h +*/ + /******************************************************************************* ** ** ** SRC-MODULE: dlt_user_macros.h ** diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 52291f8..5fb3309 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,18 +1,19 @@ ####### -# Dlt - Diagnostic Log and Trace # @licence make begin@ +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. # +# For further information see http://www.genivi.org/. # @licence end@ -######## +####### add_subdirectory( lib ) add_subdirectory( daemon ) diff --git a/src/adaptor/CMakeLists.txt b/src/adaptor/CMakeLists.txt index 7bde645..aa7dc19 100755 --- a/src/adaptor/CMakeLists.txt +++ b/src/adaptor/CMakeLists.txt @@ -1,18 +1,19 @@ ####### -# Dlt - Diagnostic Log and Trace # @licence make begin@ +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. # +# For further information see http://www.genivi.org/. # @licence end@ -######## +####### set(dlt_adaptor_stdin_SRCS dlt-adaptor-stdin.c) add_executable(dlt-adaptor-stdin ${dlt_adaptor_stdin_SRCS}) diff --git a/src/adaptor/dlt-adaptor-stdin.c b/src/adaptor/dlt-adaptor-stdin.c index 624ea1c..23cd9ca 100755 --- a/src/adaptor/dlt-adaptor-stdin.c +++ b/src/adaptor/dlt-adaptor-stdin.c @@ -1,25 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * - * \author Alexander Wenzel BMW 2011-2012 + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * \file dlt-adaptor-stdin.c * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt-adaptor-stdin.c +*/ + /******************************************************************************* ** ** ** SRC-MODULE: dlt-adaptor-stdin.c ** diff --git a/src/adaptor/dlt-adaptor-udp.c b/src/adaptor/dlt-adaptor-udp.c index ce204c1..67d35b8 100755 --- a/src/adaptor/dlt-adaptor-udp.c +++ b/src/adaptor/dlt-adaptor-udp.c @@ -1,25 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. - * + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * \author Alexander Wenzel BMW 2011-2012 - * - * \file dlt-adaptor-udp.c * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt-adaptor-udp.c +*/ + /******************************************************************************* ** ** ** SRC-MODULE: dlt-adaptor-udp.c ** diff --git a/src/console/CMakeLists.txt b/src/console/CMakeLists.txt index bbab009..3ae35aa 100755 --- a/src/console/CMakeLists.txt +++ b/src/console/CMakeLists.txt @@ -1,18 +1,19 @@ ####### -# Dlt - Diagnostic Log and Trace # @licence make begin@ +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. # +# For further information see http://www.genivi.org/. # @licence end@ -######## +####### set(dlt_convert_SRCS dlt-convert.c) add_executable(dlt-convert ${dlt_convert_SRCS} ${dlt_most_SRCS}) diff --git a/src/console/dlt-control.c b/src/console/dlt-control.c index cc11298..96f89d0 100755 --- a/src/console/dlt-control.c +++ b/src/console/dlt-control.c @@ -1,25 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * - * \author Alexander Wenzel BMW 2011-2012 + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * \file dlt-receive.c * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt-control.cpp +*/ + /******************************************************************************* ** ** diff --git a/src/console/dlt-convert.c b/src/console/dlt-convert.c index 7a54343..4f593e2 100755 --- a/src/console/dlt-convert.c +++ b/src/console/dlt-convert.c @@ -1,25 +1,28 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. - * + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * \author Alexander Wenzel BMW 2011-2012 - * - * \file dlt-convert.c * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt-convert.cpp +*/ /******************************************************************************* ** ** diff --git a/src/console/dlt-receive.c b/src/console/dlt-receive.c index ff08dd1..11f81a3 100755 --- a/src/console/dlt-receive.c +++ b/src/console/dlt-receive.c @@ -1,25 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * - * \author Alexander Wenzel BMW 2011-2012 + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * \file dlt-receive.c * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt-receive.cpp +*/ + /******************************************************************************* ** ** diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt index 42d2081..46a087a 100755 --- a/src/daemon/CMakeLists.txt +++ b/src/daemon/CMakeLists.txt @@ -1,18 +1,19 @@ ####### -# Dlt - Diagnostic Log and Trace # @licence make begin@ +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. # +# For further information see http://www.genivi.org/. # @licence end@ -######## +####### if(WITH_SYSTEMD_WATCHDOG OR WITH_SYSTEMD) diff --git a/src/daemon/dlt-daemon.c b/src/daemon/dlt-daemon.c index 8a17c55..302a613 100644 --- a/src/daemon/dlt-daemon.c +++ b/src/daemon/dlt-daemon.c @@ -1,26 +1,30 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012-2014 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. - * + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! * \author * Alexander Wenzel * Markus Klein * Mikko Rapeli * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * * \file dlt-daemon.c - * For further information see http://www.genivi.org/. - * @licence end@ */ #include diff --git a/src/daemon/dlt-daemon.h b/src/daemon/dlt-daemon.h index d6cb91f..f917555 100755 --- a/src/daemon/dlt-daemon.h +++ b/src/daemon/dlt-daemon.h @@ -1,23 +1,27 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Alexander Wenzel * - * \author Alexander Wenzel BMW 2011-2012 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt-daemon.h - * For further information see http://www.genivi.org/. - * @licence end@ */ diff --git a/src/daemon/dlt-daemon_cfg.h b/src/daemon/dlt-daemon_cfg.h index 07e68c7..acddd45 100755 --- a/src/daemon/dlt-daemon_cfg.h +++ b/src/daemon/dlt-daemon_cfg.h @@ -1,25 +1,28 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * - * \author Alexander Wenzel BMW 2011-2012 - * - * \file dlt-daemon_cfg.h * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt-daemon_cfg.h + */ /******************************************************************************* ** ** diff --git a/src/daemon/dlt_daemon_client.c b/src/daemon/dlt_daemon_client.c index 6fde373..1b76b2c 100644 --- a/src/daemon/dlt_daemon_client.c +++ b/src/daemon/dlt_daemon_client.c @@ -1,26 +1,31 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012-2014 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! * \author * Alexander Wenzel * Markus Klein * Mikko Rapeli * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * * \file dlt_daemon_client.c - * For further information see http://www.genivi.org/. - * @licence end@ - */ +*/ #include #include diff --git a/src/daemon/dlt_daemon_client.h b/src/daemon/dlt_daemon_client.h index 380f78c..fba4eb3 100644 --- a/src/daemon/dlt_daemon_client.h +++ b/src/daemon/dlt_daemon_client.h @@ -1,25 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. - * + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * \author Alexander Wenzel BMW 2011-2012 - * - * \file dlt_daemon_client.h * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt_daemon_client.h +*/ + /******************************************************************************* ** ** diff --git a/src/daemon/dlt_daemon_common.c b/src/daemon/dlt_daemon_common.c index ce6af70..31e228b 100644 --- a/src/daemon/dlt_daemon_common.c +++ b/src/daemon/dlt_daemon_common.c @@ -1,23 +1,27 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Alexander Wenzel * - * \author Alexander Wenzel BMW 2011-2012 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt_daemon_common.c - * For further information see http://www.genivi.org/. - * @licence end@ */ /******************************************************************************* diff --git a/src/daemon/dlt_daemon_common.h b/src/daemon/dlt_daemon_common.h index 4807407..a0dba90 100644 --- a/src/daemon/dlt_daemon_common.h +++ b/src/daemon/dlt_daemon_common.h @@ -1,23 +1,27 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Alexander Wenzel * - * \author Alexander Wenzel BMW 2011-2012 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt_daemon_common.h - * For further information see http://www.genivi.org/. - * @licence end@ */ diff --git a/src/daemon/dlt_daemon_common_cfg.h b/src/daemon/dlt_daemon_common_cfg.h index 914767a..b237b60 100755 --- a/src/daemon/dlt_daemon_common_cfg.h +++ b/src/daemon/dlt_daemon_common_cfg.h @@ -1,25 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * - * \author Alexander Wenzel BMW 2011-2012 - * - * \file dlt_daemon_common_cfg.h * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt_daemon_common_cfg.h +*/ + /******************************************************************************* diff --git a/src/daemon/dlt_daemon_serial.c b/src/daemon/dlt_daemon_serial.c index 36bf049..bcacdd6 100644 --- a/src/daemon/dlt_daemon_serial.c +++ b/src/daemon/dlt_daemon_serial.c @@ -1,22 +1,27 @@ -/* @licence app begin@ - * Copyright (C) 2012 BMW AG +/* + * @licence app begin@ + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Alexander Wenzel * - * \author Alexander Wenzel BMW 2011-2012 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt_daemon_serial.c - * For further information see http://www.genivi.org/. - * @licence end@ */ /******************************************************************************* diff --git a/src/daemon/dlt_daemon_serial.h b/src/daemon/dlt_daemon_serial.h index 928abc2..a12ab7b 100644 --- a/src/daemon/dlt_daemon_serial.h +++ b/src/daemon/dlt_daemon_serial.h @@ -1,23 +1,27 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Alexander Wenzel * - * \author Alexander Wenzel BMW 2011-2012 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt_daemon_serial.h - * For further information see http://www.genivi.org/. - * @licence end@ */ diff --git a/src/daemon/dlt_daemon_socket.c b/src/daemon/dlt_daemon_socket.c index 146d952..4ba5c08 100644 --- a/src/daemon/dlt_daemon_socket.c +++ b/src/daemon/dlt_daemon_socket.c @@ -1,26 +1,33 @@ -/* @licence app begin@ - * Copyright (C) 2012-2014 BMW AG +/* + * @licence app begin@ + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! * \author * Alexander Wenzel * Markus Klein * Mikko Rapeli * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * * \file dlt_daemon_socket.c - * For further information see http://www.genivi.org/. - * @licence end@ */ + #include #include #include /* for printf() and fprintf() */ diff --git a/src/daemon/dlt_daemon_socket.h b/src/daemon/dlt_daemon_socket.h index 1ab7346..51f82fc 100644 --- a/src/daemon/dlt_daemon_socket.h +++ b/src/daemon/dlt_daemon_socket.h @@ -1,23 +1,27 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Alexander Wenzel * - * \author Alexander Wenzel BMW 2011-2012 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt_daemon_socket.h - * For further information see http://www.genivi.org/. - * @licence end@ */ diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt index 6b457be..9186937 100644 --- a/src/dbus/CMakeLists.txt +++ b/src/dbus/CMakeLists.txt @@ -1,18 +1,19 @@ ####### -# Dlt - Diagnostic Log and Trace # @licence make begin@ +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. # -# Copyright (C) 2011-2014, BMW AG - Alexander Wenzel -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. # +# For further information see http://www.genivi.org/. # @licence end@ -######## +####### include_directories( ${CMAKE_SOURCE_DIR}/ diff --git a/src/dbus/dlt-dbus-options.c b/src/dbus/dlt-dbus-options.c index f1c72dd..7a54dca 100644 --- a/src/dbus/dlt-dbus-options.c +++ b/src/dbus/dlt-dbus-options.c @@ -1,24 +1,31 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2014 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * \author Alexander Wenzel + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * \file dlt-dbus-options.c * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt-dbus-options.c + */ + + + #include "dlt-dbus.h" #include diff --git a/src/dbus/dlt-dbus.c b/src/dbus/dlt-dbus.c index ce5505f..44593aa 100644 --- a/src/dbus/dlt-dbus.c +++ b/src/dbus/dlt-dbus.c @@ -1,24 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2014 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * \author Alexander Wenzel - * - * \file dlt-dbus.c * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt-dbus.c + */ + #include "dlt-dbus.h" #include diff --git a/src/dbus/dlt-dbus.h b/src/dbus/dlt-dbus.h index 07f5b5f..9dd6fdb 100644 --- a/src/dbus/dlt-dbus.h +++ b/src/dbus/dlt-dbus.h @@ -1,24 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2014 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * \author Alexander Wenzel - * - * \file dlt-dbus.c * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt-dbus.h + */ + #ifndef DLT_DBUS_H_ #define DLT_DBUS_H_ diff --git a/src/examples/CMakeLists.txt b/src/examples/CMakeLists.txt index 767afc7..0387e81 100755 --- a/src/examples/CMakeLists.txt +++ b/src/examples/CMakeLists.txt @@ -1,18 +1,19 @@ ####### -# Dlt - Diagnostic Log and Trace # @licence make begin@ +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. # +# For further information see http://www.genivi.org/. # @licence end@ -######## +####### set(dlt_example_user_SRCS dlt-example-user.c) add_executable(dlt-example-user ${dlt_example_user_SRCS}) diff --git a/src/examples/dlt-example-filetransfer.c b/src/examples/dlt-example-filetransfer.c index 96336a4..b02be19 100644 --- a/src/examples/dlt-example-filetransfer.c +++ b/src/examples/dlt-example-filetransfer.c @@ -1,25 +1,28 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. - * + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * \author Alexander Wenzel BMW 2011-2012 - * - * \file dlt-example-filetransfer.c * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt-example-filetransfer.c + */ /******************************************************************************* ** ** diff --git a/src/examples/dlt-example-user-common-api.c b/src/examples/dlt-example-user-common-api.c index 8404090..6bf9141 100644 --- a/src/examples/dlt-example-user-common-api.c +++ b/src/examples/dlt-example-user-common-api.c @@ -1,25 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. - * + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * \author Alexander Wenzel BMW 2011-2012 - * - * \file dlt-example-user.c * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt-example-user-common-api.c + */ + /******************************************************************************* ** ** diff --git a/src/examples/dlt-example-user-func.c b/src/examples/dlt-example-user-func.c index 20b700a..6023cd5 100755 --- a/src/examples/dlt-example-user-func.c +++ b/src/examples/dlt-example-user-func.c @@ -1,23 +1,27 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Alexander Wenzel * - * \author Alexander Wenzel BMW 2011-2012 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt-example-user-func.c - * For further information see http://www.genivi.org/. - * @licence end@ */ /******************************************************************************* diff --git a/src/examples/dlt-example-user.c b/src/examples/dlt-example-user.c index 9c4a529..8872aa9 100755 --- a/src/examples/dlt-example-user.c +++ b/src/examples/dlt-example-user.c @@ -1,25 +1,28 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. - * + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * \author Alexander Wenzel BMW 2011-2012 - * - * \file dlt-example-user.c * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt-example-user.c + */ /******************************************************************************* ** ** diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index 6668793..af8472d 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -1,18 +1,19 @@ ####### -# Dlt - Diagnostic Log and Trace # @licence make begin@ +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. # +# For further information see http://www.genivi.org/. # @licence end@ -########q +####### set(dlt_LIB_SRCS dlt_user dlt_client dlt_filetransfer ${CMAKE_SOURCE_DIR}/src/shared/dlt_common.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_user_shared.c ${CMAKE_SOURCE_DIR}/src/shared/dlt_shm.c) diff --git a/src/lib/dlt_client.c b/src/lib/dlt_client.c index d5f81e9..210d303 100755 --- a/src/lib/dlt_client.c +++ b/src/lib/dlt_client.c @@ -1,23 +1,27 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Alexander Wenzel * - * \author Alexander Wenzel BMW 2011-2012 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt_client.c - * For further information see http://www.genivi.org/. - * @licence end@ */ /******************************************************************************* diff --git a/src/lib/dlt_client_cfg.h b/src/lib/dlt_client_cfg.h index 6b490e7..d4d8a35 100755 --- a/src/lib/dlt_client_cfg.h +++ b/src/lib/dlt_client_cfg.h @@ -1,23 +1,27 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Alexander Wenzel * - * \author Alexander Wenzel BMW 2011-2012 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt_client_cfg.h - * For further information see http://www.genivi.org/. - * @licence end@ */ diff --git a/src/lib/dlt_filetransfer.c b/src/lib/dlt_filetransfer.c index 43047e3..f3ba2db 100644 --- a/src/lib/dlt_filetransfer.c +++ b/src/lib/dlt_filetransfer.c @@ -1,25 +1,28 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. - * + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * \author Alexander Wenzel BMW 2011-2012 - * - * \file dlt_filetransfer.c * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt_filetransfer.c + */ /******************************************************************************* ** ** diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c index 95bcf8d..97e780e 100644 --- a/src/lib/dlt_user.c +++ b/src/lib/dlt_user.c @@ -1,26 +1,30 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012-2014 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. - * + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! * \author * Alexander Wenzel * Markus Klein * Mikko Rapeli * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * * \file dlt_user.c - * For further information see http://www.genivi.org/. - * @licence end@ */ #include /* for getenv(), free(), atexit() */ diff --git a/src/lib/dlt_user.c.rej b/src/lib/dlt_user.c.rej deleted file mode 100644 index c197d0d..0000000 --- a/src/lib/dlt_user.c.rej +++ /dev/null @@ -1,62 +0,0 @@ ---- src/lib/dlt_user.c -+++ src/lib/dlt_user.c -@@ -501,48 +501,21 @@ int dlt_user_atexit_blow_out_user_buffer(void){ - - uint32_t exitTime = dlt_uptime() + DLT_USER_ATEXIT_RESEND_BUFFER_EXIT_TIMEOUT; - -- /* Send content of ringbuffer */ -- DLT_SEM_LOCK(); -- count = dlt_buffer_get_message_count(&(dlt_user.startup_buffer)); -- DLT_SEM_FREE(); -- -- if (count > 0) -- { -- while(dlt_uptime() < exitTime ) -- { -- if (dlt_user.dlt_log_handle == -1) -- { -- /* Reattach to daemon if neccesary */ -- dlt_user_log_reattach_to_daemon(); -+ while(dlt_uptime() < exitTime ){ - -- if ((dlt_user.dlt_log_handle != -1) && (dlt_user.overflow_counter)) -- { -- if (dlt_user_log_send_overflow()==0) -- { -- snprintf(str,DLT_USER_BUFFER_LENGTH,"%u messages discarded!\n",dlt_user.overflow_counter); -- dlt_log(LOG_WARNING, str); -- dlt_user.overflow_counter=0; -- } -- } -- } -- -- if (dlt_user.dlt_log_handle != -1) -- { -- ret = dlt_user_log_resend_buffer(); -+ ret = dlt_user_log_resend_buffer(); - -- if(ret == 0) -- { -- return 0; -- } -- } -+ if(ret == 0) -+ { -+ return 0; -+ } - -- usleep(DLT_USER_ATEXIT_RESEND_BUFFER_SLEEP); -- } -+ usleep(DLT_USER_ATEXIT_RESEND_BUFFER_SLEEP); -+ } - -- DLT_SEM_LOCK(); -- count = dlt_buffer_get_message_count(&(dlt_user.startup_buffer)); -- DLT_SEM_FREE(); -- } -+ DLT_SEM_LOCK(); -+ count = dlt_buffer_get_message_count(&(dlt_user.startup_buffer)); -+ DLT_SEM_FREE(); - - return count; - } diff --git a/src/lib/dlt_user_cfg.h b/src/lib/dlt_user_cfg.h index 124be44..b9eeb8a 100755 --- a/src/lib/dlt_user_cfg.h +++ b/src/lib/dlt_user_cfg.h @@ -1,25 +1,28 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * - * \author Alexander Wenzel BMW 2011-2012 - * - * \file dlt_user_cfg.h * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt_user_cfg.h + */ /******************************************************************************* ** ** diff --git a/src/lib/dlt_user_cfg.h.rej b/src/lib/dlt_user_cfg.h.rej deleted file mode 100644 index a722e78..0000000 --- a/src/lib/dlt_user_cfg.h.rej +++ /dev/null @@ -1,16 +0,0 @@ ---- src/lib/dlt_user_cfg.h -+++ src/lib/dlt_user_cfg.h -@@ -126,11 +126,11 @@ - /* Name of environment variable for local print mode */ - #define DLT_USER_ENV_LOCAL_PRINT_MODE "DLT_LOCAL_PRINT_MODE" - --/* Timeout offset for resending user buffer at exit in 10th milliseconds (10000 = 1s)*/ -+/* Timeout offset for resending user buffer at exit in usec (1000 usec = 1ms)*/ - #define DLT_USER_ATEXIT_RESEND_BUFFER_EXIT_TIMEOUT 100000 - - /* Sleeps between resending user buffer at exit in usec (1000 usec = 1ms)*/ --#define DLT_USER_ATEXIT_RESEND_BUFFER_SLEEP 100000 -+#define DLT_USER_ATEXIT_RESEND_BUFFER_SLEEP 1000 - - - /************************/ diff --git a/src/shared/dlt_common.c b/src/shared/dlt_common.c index 88e77b2..24922c3 100755 --- a/src/shared/dlt_common.c +++ b/src/shared/dlt_common.c @@ -1,25 +1,30 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012-2014 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! * \author * Alexander Wenzel * Markus Klein * Mikko Rapeli * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * * \file dlt_common.c - * For further information see http://www.genivi.org/. - * @licence end@ */ #include diff --git a/src/shared/dlt_common_cfg.h b/src/shared/dlt_common_cfg.h index f765ed6..d554fb2 100755 --- a/src/shared/dlt_common_cfg.h +++ b/src/shared/dlt_common_cfg.h @@ -1,25 +1,28 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * - * \author Alexander Wenzel BMW 2011-2012 - * - * \file dlt_common_cfg.h * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt_common_cfg.h + */ /******************************************************************************* ** ** diff --git a/src/shared/dlt_offline_trace.c b/src/shared/dlt_offline_trace.c index 554e2d5..760884f 100644 --- a/src/shared/dlt_offline_trace.c +++ b/src/shared/dlt_offline_trace.c @@ -1,25 +1,28 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * - * \author Alexander Wenzel BMW 2011-2012 - * - * \file dlt_offline_trace.c * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Alexander Wenzel + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt_offline_trace.c + */ /******************************************************************************* ** ** diff --git a/src/shared/dlt_shm.c b/src/shared/dlt_shm.c index d4eb35b..e67a134 100644 --- a/src/shared/dlt_shm.c +++ b/src/shared/dlt_shm.c @@ -1,23 +1,27 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Alexander Wenzel * - * \author Alexander Wenzel BMW 2011-2012 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt_shm.c - * For further information see http://www.genivi.org/. - * @licence end@ */ diff --git a/src/shared/dlt_user_shared.c b/src/shared/dlt_user_shared.c index 300b77e..20454a7 100755 --- a/src/shared/dlt_user_shared.c +++ b/src/shared/dlt_user_shared.c @@ -1,23 +1,27 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Alexander Wenzel * - * \author Alexander Wenzel BMW 2011-2012 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt_user_shared.c - * For further information see http://www.genivi.org/. - * @licence end@ */ diff --git a/src/shared/dlt_user_shared.h b/src/shared/dlt_user_shared.h index a980d0d..6db3299 100755 --- a/src/shared/dlt_user_shared.h +++ b/src/shared/dlt_user_shared.h @@ -1,23 +1,27 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Alexander Wenzel * - * \author Alexander Wenzel BMW 2011-2012 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt_user_shared.h - * For further information see http://www.genivi.org/. - * @licence end@ */ diff --git a/src/shared/dlt_user_shared_cfg.h b/src/shared/dlt_user_shared_cfg.h index a8576f5..cdfd4fe 100755 --- a/src/shared/dlt_user_shared_cfg.h +++ b/src/shared/dlt_user_shared_cfg.h @@ -1,23 +1,27 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Alexander Wenzel * - * \author Alexander Wenzel BMW 2011-2012 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt_user_shared_cfg.h - * For further information see http://www.genivi.org/. - * @licence end@ */ diff --git a/src/system/CMakeLists.txt b/src/system/CMakeLists.txt index 8398207..7c98de8 100644 --- a/src/system/CMakeLists.txt +++ b/src/system/CMakeLists.txt @@ -1,18 +1,19 @@ ####### -# Dlt - Diagnostic Log and Trace # @licence make begin@ +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. # +# For further information see http://www.genivi.org/. # @licence end@ -######## +####### if(WITH_SYSTEMD_WATCHDOG OR WITH_SYSTEMD OR WITH_SYSTEMD_JOURNAL) message( STATUS "Added ${systemd_SRCS} to dlt-system") diff --git a/src/system/dlt-system-filetransfer.c b/src/system/dlt-system-filetransfer.c index 5cfcf09..3f31c81 100644 --- a/src/system/dlt-system-filetransfer.c +++ b/src/system/dlt-system-filetransfer.c @@ -1,28 +1,34 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012-2014 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! * \author * Lassi Marttala * Alexander Wenzel * Markus Klein * Mikko Rapeli * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * * \file dlt-system-filetransfer.c - * For further information see http://www.genivi.org/. - * @licence end@ */ + /******************************************************************************* ** ** ** SRC-MODULE: dlt-system-filetransfer.c ** diff --git a/src/system/dlt-system-journal.c b/src/system/dlt-system-journal.c index 926cd17..bbd8385 100644 --- a/src/system/dlt-system-journal.c +++ b/src/system/dlt-system-journal.c @@ -1,23 +1,27 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2013 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Alexander Wenzel * - * \author Alexander Wenzel BMW 2013 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt-system-journal.c - * For further information see http://www.genivi.org/. - * @licence end@ */ /******************************************************************************* diff --git a/src/system/dlt-system-logfile.c b/src/system/dlt-system-logfile.c index 1354b83..a2ec7ec 100644 --- a/src/system/dlt-system-logfile.c +++ b/src/system/dlt-system-logfile.c @@ -1,23 +1,27 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Lassi Marttala * - * \author Lassi Marttala BMW 2012 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt-system-logfile.c - * For further information see http://www.genivi.org/. - * @licence end@ */ /******************************************************************************* diff --git a/src/system/dlt-system-options.c b/src/system/dlt-system-options.c index 3b4195d..d00b571 100644 --- a/src/system/dlt-system-options.c +++ b/src/system/dlt-system-options.c @@ -1,23 +1,27 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Lassi Marttala * - * \author Lassi Marttala BMW 2012 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt-system-options.c - * For further information see http://www.genivi.org/. - * @licence end@ */ /******************************************************************************* diff --git a/src/system/dlt-system-process-handling.c b/src/system/dlt-system-process-handling.c index c23bcca..2352204 100644 --- a/src/system/dlt-system-process-handling.c +++ b/src/system/dlt-system-process-handling.c @@ -1,23 +1,27 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Lassi Marttala * - * \author Lassi Marttala BMW 2012 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt-system-process-handling.c - * For further information see http://www.genivi.org/. - * @licence end@ */ /******************************************************************************* diff --git a/src/system/dlt-system-processes.c b/src/system/dlt-system-processes.c index 4457f50..fab3b4f 100644 --- a/src/system/dlt-system-processes.c +++ b/src/system/dlt-system-processes.c @@ -1,25 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * - * \author Lassi Marttala BMW 2012 - * - * \file dlt-system-logfile.c * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Lassi Marttala + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt-system-processes.c + */ + /******************************************************************************* ** ** ** SRC-MODULE: dlt-system-processes.c ** diff --git a/src/system/dlt-system-shell.c b/src/system/dlt-system-shell.c index 1c875fb..a753185 100644 --- a/src/system/dlt-system-shell.c +++ b/src/system/dlt-system-shell.c @@ -1,25 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * - * \author Lassi Marttala BMW 2012 - * - * \file dlt-system-logfile.c * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Lassi Marttala + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt-system-shell.c + */ + /******************************************************************************* ** ** ** SRC-MODULE: dlt-system-shell.c ** diff --git a/src/system/dlt-system-syslog.c b/src/system/dlt-system-syslog.c index d7e7e1d..8a6a7be 100644 --- a/src/system/dlt-system-syslog.c +++ b/src/system/dlt-system-syslog.c @@ -1,25 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * - * \author Lassi Marttala BMW 2012 - * - * \file dlt-system-logfile.c * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Lassi Marttala + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt-system-syslog.c + */ + /******************************************************************************* ** ** ** SRC-MODULE: dlt-system-syslog.c ** diff --git a/src/system/dlt-system-watchdog.c b/src/system/dlt-system-watchdog.c index c44b9b3..255a789 100644 --- a/src/system/dlt-system-watchdog.c +++ b/src/system/dlt-system-watchdog.c @@ -1,26 +1,31 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012-2014 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! * \author * Lassi Marttala * Alexander Wenzel * Markus Klein * Mikko Rapeli * - * \file dlt-system-logfile.c - * For further information see http://www.genivi.org/. - * @licence end@ + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt-system-watchdog.c */ #if defined(DLT_SYSTEMD_WATCHDOG_ENABLE) diff --git a/src/system/dlt-system.c b/src/system/dlt-system.c index 8575d2f..60781b1 100644 --- a/src/system/dlt-system.c +++ b/src/system/dlt-system.c @@ -1,23 +1,27 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Lassi Marttala * - * \author Lassi Marttala BMW 2012 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt-system.c - * For further information see http://www.genivi.org/. - * @licence end@ */ /******************************************************************************* diff --git a/src/system/dlt-system.h b/src/system/dlt-system.h index 07cc2d6..1f217b0 100644 --- a/src/system/dlt-system.h +++ b/src/system/dlt-system.h @@ -1,25 +1,29 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. - * + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * - * \author Lassi Marttala BMW 2012 - * - * \file dlt-system.c * For further information see http://www.genivi.org/. * @licence end@ */ +/*! + * \author Lassi Marttala + * + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. + * + * \file dlt-system.h + */ + /******************************************************************************* ** ** ** SRC-MODULE: dlt-system.h ** diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 7c1f0f2..7716d64 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -1,18 +1,20 @@ ####### -# Dlt - Diagnostic Log and Trace # @licence make begin@ +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. # +# For further information see http://www.genivi.org/. # @licence end@ -######## +####### + set(dlt_test_multi_process_SRCS dlt-test-multi-process.c) add_executable(dlt-test-multi-process ${dlt_test_multi_process_SRCS}) target_link_libraries(dlt-test-multi-process dlt) diff --git a/src/tests/dlt-test-client.c b/src/tests/dlt-test-client.c index cb03503..42bda9d 100755 --- a/src/tests/dlt-test-client.c +++ b/src/tests/dlt-test-client.c @@ -1,23 +1,27 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Alexander Wenzel * - * \author Alexander Wenzel BMW 2011-2012 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt-test-client.c - * For further information see http://www.genivi.org/. - * @licence end@ */ diff --git a/src/tests/dlt-test-filetransfer.c b/src/tests/dlt-test-filetransfer.c index 14b69e4..d08db91 100644 --- a/src/tests/dlt-test-filetransfer.c +++ b/src/tests/dlt-test-filetransfer.c @@ -1,23 +1,27 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Alexander Wenzel * - * \author Alexander Wenzel BMW 2011-2012 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt-test-filetransfer.c - * For further information see http://www.genivi.org/. - * @licence end@ */ diff --git a/src/tests/dlt-test-multi-process-client.c b/src/tests/dlt-test-multi-process-client.c index 95e622a..98ee652 100644 --- a/src/tests/dlt-test-multi-process-client.c +++ b/src/tests/dlt-test-multi-process-client.c @@ -1,23 +1,27 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Lassi Marttala * - * \author Lassi Marttala BMW 2011-2012 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt-test-multi-process-client.c - * For further information see http://www.genivi.org/. - * @licence end@ */ /******************************************************************************* diff --git a/src/tests/dlt-test-multi-process.c b/src/tests/dlt-test-multi-process.c index bb81cb3..4740882 100755 --- a/src/tests/dlt-test-multi-process.c +++ b/src/tests/dlt-test-multi-process.c @@ -1,23 +1,27 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Lassi Marttala * - * \author Lassi Marttala BMW 2011-2012 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt-test-multi-process.c - * For further information see http://www.genivi.org/. - * @licence end@ */ /******************************************************************************* diff --git a/src/tests/dlt-test-multi-process.h b/src/tests/dlt-test-multi-process.h index 0c252ae..ee8341e 100644 --- a/src/tests/dlt-test-multi-process.h +++ b/src/tests/dlt-test-multi-process.h @@ -1,23 +1,27 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Lassi Marttala * - * \author Lassi Marttala BMW 2011-2012 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt-test-multi-process.h - * For further information see http://www.genivi.org/. - * @licence end@ */ diff --git a/src/tests/dlt-test-stress-client.c b/src/tests/dlt-test-stress-client.c index e3498c0..fbc152e 100644 --- a/src/tests/dlt-test-stress-client.c +++ b/src/tests/dlt-test-stress-client.c @@ -1,23 +1,27 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Alexander Wenzel * - * \author Alexander Wenzel BMW 2011-2012 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt-test-stress-client.c - * For further information see http://www.genivi.org/. - * @licence end@ */ /******************************************************************************* diff --git a/src/tests/dlt-test-stress-user.c b/src/tests/dlt-test-stress-user.c index 6f0683f..73da3e5 100644 --- a/src/tests/dlt-test-stress-user.c +++ b/src/tests/dlt-test-stress-user.c @@ -1,23 +1,27 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Alexander Wenzel * - * \author Alexander Wenzel BMW 2011-2012 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt-test-stress-user.c - * For further information see http://www.genivi.org/. - * @licence end@ */ diff --git a/src/tests/dlt-test-stress.c b/src/tests/dlt-test-stress.c index 650aecd..6ed66b0 100755 --- a/src/tests/dlt-test-stress.c +++ b/src/tests/dlt-test-stress.c @@ -1,23 +1,27 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Alexander Wenzel * - * \author Alexander Wenzel BMW 2011-2012 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt-test-stress.c - * For further information see http://www.genivi.org/. - * @licence end@ */ diff --git a/src/tests/dlt-test-user.c b/src/tests/dlt-test-user.c index 6d6045f..44abdf7 100755 --- a/src/tests/dlt-test-user.c +++ b/src/tests/dlt-test-user.c @@ -1,23 +1,27 @@ -/** +/* * @licence app begin@ - * Copyright (C) 2012 BMW AG + * SPDX license identifier: MPL-2.0 * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * Copyright (C) 2011-2015, BMW AG" * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. + * This file is part of GENIVI Project DLT - Diagnostic Log and Trace. * - * \copyright * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * Mozilla Public License (MPL), v. 2.0. + * If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. * + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/*! + * \author Alexander Wenzel * - * \author Alexander Wenzel BMW 2011-2012 + * \copyright Copyright © 2015 BMW AG. \n + * License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/. * * \file dlt-test-user.c - * For further information see http://www.genivi.org/. - * @licence end@ */ diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt index a9838e4..10bbfe1 100644 --- a/systemd/CMakeLists.txt +++ b/systemd/CMakeLists.txt @@ -1,18 +1,19 @@ ####### -# Dlt - Diagnostic Log and Trace # @licence make begin@ +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. # +# For further information see http://www.genivi.org/. # @licence end@ -######## +####### if(WITH_SYSTEMD) diff --git a/systemd/dlt-adaptor-udp.service.cmake b/systemd/dlt-adaptor-udp.service.cmake index 0c39637..d98b481 100644 --- a/systemd/dlt-adaptor-udp.service.cmake +++ b/systemd/dlt-adaptor-udp.service.cmake @@ -1,18 +1,19 @@ ####### -# Dlt - Diagnostic Log and Trace # @licence make begin@ +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. # +# For further information see http://www.genivi.org/. # @licence end@ -######## +####### [Unit] Description=GENIVI DLT adaptor stdin. Adaptor for forwarding received UDP messages to DLT daemon. diff --git a/systemd/dlt-dbus.service.cmake b/systemd/dlt-dbus.service.cmake index e448523..cb27cd9 100755 --- a/systemd/dlt-dbus.service.cmake +++ b/systemd/dlt-dbus.service.cmake @@ -1,18 +1,19 @@ ####### -# Dlt - Diagnostic Log and Trace # @licence make begin@ +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. # +# For further information see http://www.genivi.org/. # @licence end@ -######## +####### [Unit] Description=GENIVI DLT DBus. Application to forward DBus messages to DLT. diff --git a/systemd/dlt-example-user.service.cmake b/systemd/dlt-example-user.service.cmake index 3652292..31ff50b 100644 --- a/systemd/dlt-example-user.service.cmake +++ b/systemd/dlt-example-user.service.cmake @@ -1,18 +1,19 @@ ####### -# Dlt - Diagnostic Log and Trace # @licence make begin@ +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. # +# For further information see http://www.genivi.org/. # @licence end@ -######## +####### [Unit] Description=GENIVI DLT example user. Generate DLT messages and store them to file or send them to daemon. diff --git a/systemd/dlt-receive.service.cmake b/systemd/dlt-receive.service.cmake index b92c8b2..9a976e3 100644 --- a/systemd/dlt-receive.service.cmake +++ b/systemd/dlt-receive.service.cmake @@ -1,18 +1,19 @@ ####### -# Dlt - Diagnostic Log and Trace # @licence make begin@ +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. # +# For further information see http://www.genivi.org/. # @licence end@ -######## +####### [Unit] Description=GENIVI DLT receive. Receive DLT messages from DLT daemon and print or store the messages. diff --git a/systemd/dlt-system.service.cmake b/systemd/dlt-system.service.cmake index f1383dd..b1c1f9e 100755 --- a/systemd/dlt-system.service.cmake +++ b/systemd/dlt-system.service.cmake @@ -1,18 +1,19 @@ ####### -# Dlt - Diagnostic Log and Trace # @licence make begin@ +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. # +# For further information see http://www.genivi.org/. # @licence end@ -######## +####### [Unit] Description=GENIVI DLT system. Application to forward syslog messages to DLT, transfer system information, logs and files. diff --git a/systemd/dlt.service.cmake b/systemd/dlt.service.cmake index 22279c4..35d2216 100755 --- a/systemd/dlt.service.cmake +++ b/systemd/dlt.service.cmake @@ -1,18 +1,19 @@ ####### -# Dlt - Diagnostic Log and Trace # @licence make begin@ +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. # +# For further information see http://www.genivi.org/. # @licence end@ -######## +####### [Unit] Description=GENIVI DLT logging daemon diff --git a/testscripts/CMakeLists.txt b/testscripts/CMakeLists.txt index 34413c3..4249285 100755 --- a/testscripts/CMakeLists.txt +++ b/testscripts/CMakeLists.txt @@ -1,18 +1,19 @@ ####### -# Dlt - Diagnostic Log and Trace # @licence make begin@ +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. # -# Copyright (C) 2011-2012, BMW AG - Alexander Wenzel -# -# Contributions are licensed to the GENIVI Alliance under one or more -# Contribution License Agreements. -# # This Source Code Form is subject to the terms of the -# Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with -# this file, You can obtain one at http://mozilla.org/MPL/2.0/. +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. # +# For further information see http://www.genivi.org/. # @licence end@ -######## +####### if(WITH_TESTSCRIPTS) configure_file(${CMAKE_SOURCE_DIR}/testscripts/Meego/dlt-daemon.cmake ${PROJECT_BINARY_DIR}/testscripts/Meego/dlt-daemon @ONLY) diff --git a/testscripts/Meego/dlt-daemon.cmake b/testscripts/Meego/dlt-daemon.cmake index a2e908e..ba8be08 100755 --- a/testscripts/Meego/dlt-daemon.cmake +++ b/testscripts/Meego/dlt-daemon.cmake @@ -1,5 +1,22 @@ #!/bin/sh + +####### +# @licence app begin@ +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. # +# This Source Code Form is subject to the terms of the +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. +# +# For further information see http://www.genivi.org/. +# @licence end@ +####### + # Starts the DLT Daemon # # chkconfig: 2345 21 87 diff --git a/testscripts/Ubuntu/dlt-daemon.cmake b/testscripts/Ubuntu/dlt-daemon.cmake index 24b10fb..b0bb9b0 100755 --- a/testscripts/Ubuntu/dlt-daemon.cmake +++ b/testscripts/Ubuntu/dlt-daemon.cmake @@ -1,4 +1,22 @@ #!/bin/sh + +####### +# @licence app begin@ +# SPDX license identifier: MPL-2.0 +# +# Copyright (C) 2011-2015, BMW AG" +# +# This file is part of GENIVI Project DLT - Diagnostic Log and Trace. +# +# This Source Code Form is subject to the terms of the +# Mozilla Public License (MPL), v. 2.0. +# If a copy of the MPL was not distributed with this file, +# You can obtain one at http://mozilla.org/MPL/2.0/. +# +# For further information see http://www.genivi.org/. +# @licence end@ +####### + ### BEGIN INIT INFO # Provides: dlt-daemon # Required-Start: $network $local_fs -- cgit v1.2.1