summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xAUTHORS6
-rw-r--r--CMakeLists.txt19
-rwxr-xr-xCOPYING14
-rw-r--r--INSTALL (renamed from INSTALL.txt)0
-rwxr-xr-xLICENSE (renamed from MPL.txt)0
-rwxr-xr-xLICENSE.txt12
-rw-r--r--README (renamed from README.txt)6
-rwxr-xr-xReleaseNotes.txt1
-rwxr-xr-xautomotive-dlt.pc.in17
-rw-r--r--automotive-dlt.spec.in17
-rw-r--r--cmake/CMakeLists.txt17
-rwxr-xr-xcmake/config.h.cmake17
-rwxr-xr-xcmake/dlt_version.h.cmake17
-rw-r--r--doc/CMakeLists.txt24
-rw-r--r--doc/dlt-convert.114
-rw-r--r--doc/dlt-convert.1.txt4
-rw-r--r--doc/dlt-daemon.111
-rw-r--r--doc/dlt-daemon.1.txt4
-rw-r--r--doc/dlt-receive.19
-rw-r--r--doc/dlt-receive.1.txt4
-rw-r--r--doc/dlt-system.19
-rw-r--r--doc/dlt-system.1.txt4
-rw-r--r--doc/dlt-system.conf.56
-rw-r--r--doc/dlt.conf.58
-rw-r--r--doc/dlt_book.txt19
-rw-r--r--doc/dlt_cheatsheet.txt15
-rw-r--r--doc/dlt_design_specification.txt15
-rw-r--r--doc/dlt_extended_network_trace.txt15
-rw-r--r--doc/dlt_filetransfer.txt15
-rw-r--r--doc/dlt_howto_debug.txt15
-rw-r--r--doc/dlt_user_manual.txt17
-rwxr-xr-xdoc/doxygen.cfg.cmake17
-rwxr-xr-xdoc/extended_network_trace_doxygen.cfg.cmake17
-rw-r--r--doc/mainpage.h24
-rw-r--r--examples/README.txt6
-rwxr-xr-xexamples/example1/CMakeLists.txt19
-rw-r--r--examples/example1/example1.c28
-rwxr-xr-xexamples/example2/CMakeLists.txt19
-rw-r--r--examples/example2/dlt_id.h17
-rw-r--r--examples/example2/example2.c28
-rwxr-xr-xexamples/example3/CMakeLists.txt19
-rw-r--r--examples/example3/dlt_id.h17
-rw-r--r--examples/example3/example3.c28
-rwxr-xr-xexamples/example4/CMakeLists.txt19
-rw-r--r--examples/example4/example4.c28
-rwxr-xr-xinclude/CMakeLists.txt19
-rw-r--r--include/dlt/CMakeLists.txt19
-rwxr-xr-xinclude/dlt/dlt.h28
-rwxr-xr-xinclude/dlt/dlt_client.h28
-rwxr-xr-xinclude/dlt/dlt_common.h28
-rw-r--r--include/dlt/dlt_common_api.h28
-rw-r--r--include/dlt/dlt_filetransfer.h25
-rw-r--r--include/dlt/dlt_offline_trace.h28
-rwxr-xr-xinclude/dlt/dlt_protocol.h28
-rw-r--r--include/dlt/dlt_shm.h28
-rwxr-xr-xinclude/dlt/dlt_types.h28
-rw-r--r--include/dlt/dlt_user.h27
-rw-r--r--include/dlt/dlt_user_macros.h28
-rw-r--r--src/CMakeLists.txt19
-rwxr-xr-xsrc/adaptor/CMakeLists.txt19
-rwxr-xr-xsrc/adaptor/dlt-adaptor-stdin.c28
-rwxr-xr-xsrc/adaptor/dlt-adaptor-udp.c28
-rwxr-xr-xsrc/console/CMakeLists.txt19
-rwxr-xr-xsrc/console/dlt-control.c28
-rwxr-xr-xsrc/console/dlt-convert.c27
-rwxr-xr-xsrc/console/dlt-receive.c28
-rwxr-xr-xsrc/daemon/CMakeLists.txt19
-rw-r--r--src/daemon/dlt-daemon.c26
-rwxr-xr-xsrc/daemon/dlt-daemon.h26
-rwxr-xr-xsrc/daemon/dlt-daemon_cfg.h27
-rw-r--r--src/daemon/dlt_daemon_client.c27
-rw-r--r--src/daemon/dlt_daemon_client.h28
-rw-r--r--src/daemon/dlt_daemon_common.c26
-rw-r--r--src/daemon/dlt_daemon_common.h26
-rwxr-xr-xsrc/daemon/dlt_daemon_common_cfg.h28
-rw-r--r--src/daemon/dlt_daemon_serial.c27
-rw-r--r--src/daemon/dlt_daemon_serial.h26
-rw-r--r--src/daemon/dlt_daemon_socket.c27
-rw-r--r--src/daemon/dlt_daemon_socket.h26
-rw-r--r--src/dbus/CMakeLists.txt19
-rw-r--r--src/dbus/dlt-dbus-options.c29
-rw-r--r--src/dbus/dlt-dbus.c27
-rw-r--r--src/dbus/dlt-dbus.h27
-rwxr-xr-xsrc/examples/CMakeLists.txt19
-rw-r--r--src/examples/dlt-example-filetransfer.c27
-rw-r--r--src/examples/dlt-example-user-common-api.c28
-rwxr-xr-xsrc/examples/dlt-example-user-func.c26
-rwxr-xr-xsrc/examples/dlt-example-user.c27
-rw-r--r--src/lib/CMakeLists.txt19
-rwxr-xr-xsrc/lib/dlt_client.c26
-rwxr-xr-xsrc/lib/dlt_client_cfg.h26
-rw-r--r--src/lib/dlt_filetransfer.c27
-rw-r--r--src/lib/dlt_user.c26
-rw-r--r--src/lib/dlt_user.c.rej62
-rwxr-xr-xsrc/lib/dlt_user_cfg.h27
-rw-r--r--src/lib/dlt_user_cfg.h.rej16
-rwxr-xr-xsrc/shared/dlt_common.c25
-rwxr-xr-xsrc/shared/dlt_common_cfg.h27
-rw-r--r--src/shared/dlt_offline_trace.c27
-rw-r--r--src/shared/dlt_shm.c26
-rwxr-xr-xsrc/shared/dlt_user_shared.c26
-rwxr-xr-xsrc/shared/dlt_user_shared.h26
-rwxr-xr-xsrc/shared/dlt_user_shared_cfg.h26
-rw-r--r--src/system/CMakeLists.txt19
-rw-r--r--src/system/dlt-system-filetransfer.c26
-rw-r--r--src/system/dlt-system-journal.c26
-rw-r--r--src/system/dlt-system-logfile.c26
-rw-r--r--src/system/dlt-system-options.c26
-rw-r--r--src/system/dlt-system-process-handling.c26
-rw-r--r--src/system/dlt-system-processes.c28
-rw-r--r--src/system/dlt-system-shell.c28
-rw-r--r--src/system/dlt-system-syslog.c28
-rw-r--r--src/system/dlt-system-watchdog.c27
-rw-r--r--src/system/dlt-system.c26
-rw-r--r--src/system/dlt-system.h28
-rw-r--r--src/tests/CMakeLists.txt20
-rwxr-xr-xsrc/tests/dlt-test-client.c26
-rw-r--r--src/tests/dlt-test-filetransfer.c26
-rw-r--r--src/tests/dlt-test-multi-process-client.c26
-rwxr-xr-xsrc/tests/dlt-test-multi-process.c26
-rw-r--r--src/tests/dlt-test-multi-process.h26
-rw-r--r--src/tests/dlt-test-stress-client.c26
-rw-r--r--src/tests/dlt-test-stress-user.c26
-rwxr-xr-xsrc/tests/dlt-test-stress.c26
-rwxr-xr-xsrc/tests/dlt-test-user.c26
-rw-r--r--systemd/CMakeLists.txt19
-rw-r--r--systemd/dlt-adaptor-udp.service.cmake19
-rwxr-xr-xsystemd/dlt-dbus.service.cmake19
-rw-r--r--systemd/dlt-example-user.service.cmake19
-rw-r--r--systemd/dlt-receive.service.cmake19
-rwxr-xr-xsystemd/dlt-system.service.cmake19
-rwxr-xr-xsystemd/dlt.service.cmake19
-rwxr-xr-xtestscripts/CMakeLists.txt19
-rwxr-xr-xtestscripts/Meego/dlt-daemon.cmake17
-rwxr-xr-xtestscripts/Ubuntu/dlt-daemon.cmake18
135 files changed, 1739 insertions, 1171 deletions
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 <Alexander.AW.Wenzel@bmw.de>
Christian Muck <christian.muck@bmw.de>
Mikko Rapeli <mikko.rapeli@bmw.de>
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 <alexander.aw.wenzel@bmw.de>
-#
-# 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.txt b/INSTALL
index 266fd46..266fd46 100644
--- a/INSTALL.txt
+++ b/INSTALL
diff --git a/MPL.txt b/LICENSE
index 52d1351..52d1351 100755
--- a/MPL.txt
+++ b/LICENSE
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 <alexander.aw.wenzel@bmw.de>
- #
- # 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/README.txt b/README
index a6d2c08..f8c6ca9 100644
--- a/README.txt
+++ b/README
@@ -26,14 +26,14 @@ applications and contexts registered in the DLT daemon.
Documentation
-------------
- DLT Release Notes: ReleaseNotes.txt
-- DLT Installation: INSTALL.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.txt regarding doxygen API documentation generation.
+See INSTALL regarding doxygen API documentation generation.
Manpages
--------
@@ -55,7 +55,7 @@ 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.
+Full information on the license for this software is available in the "LICENSE" file.
Source Code
-----------
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 <variable> sets #define <variable> [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 <alexander.aw.wenzel@bmw.de>
-#
-# 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 <http://docbook.sf.net/>
-.\" Date: 10/12/2012
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\" 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 <http://mozilla.org/MPL/2.0/>.
+
RESOURCES
---------
Main web site: <http://projects.genivi.org/diagnostic-log-trace> +
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 <http://docbook.sf.net/>
-.\" Date: 10/12/2012
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\" 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 <http://mozilla.org/MPL/2.0/>.
+
RESOURCES
---------
Main web site: <http://projects.genivi.org/diagnostic-log-trace> +
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 <http://docbook.sf.net/>
-.\" Date: 10/12/2012
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\" 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 <http://mozilla.org/MPL/2.0/>.
+
RESOURCES
---------
Main web site: <http://projects.genivi.org/diagnostic-log-trace> +
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 <http://docbook.sf.net/>
-.\" Date: 10/12/2012
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\" 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 <http://mozilla.org/MPL/2.0/>.
+
RESOURCES
---------
Main web site: <http://projects.genivi.org/diagnostic-log-trace> +
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 <http://docbook.sf.net/>
-.\" Date: 10/12/2012
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\" 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 <http://docbook.sf.net/>
-.\" Date: 10/12/2012
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\" 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 <Alexander.AW.Wenzel@bmw.de>
@@ -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 <Alexander.AW.Wenzel@bmw.de>
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 <Alexander.AW.Wenzel@bmw.de>
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 <Lassi.LM.Marttala@partner.bmw.de>
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 <Christian.Muck@bmw.de>
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 <Lassi.LM.Marttala@partner.bmw.de>
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 <Alexander.AW.Wenzel@bmw.de>
@@ -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 <alexander.aw.wenzel@bmw.de> 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 <alexander.aw.wenzel@bmw.de>
+\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 <alexander.aw.wenzel@bmw.de>
-#
-# 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 <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt-example-user.c
* For further information see http://www.genivi.org/.
* @licence end@
*/
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <alexander.aw.wenzel@bmw.de>
-#
-# 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 <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt-example-user.c
* For further information see http://www.genivi.org/.
* @licence end@
*/
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <alexander.aw.wenzel@bmw.de>
-#
-# 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 <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt-example-user.c
* For further information see http://www.genivi.org/.
* @licence end@
*/
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <alexander.aw.wenzel@bmw.de>
-#
-# 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 <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file example4.c
* For further information see http://www.genivi.org/.
* @licence end@
*/
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <alexander.aw.wenzel@bmw.de>
-#
-# 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 <alexander.aw.wenzel@bmw.de>
-#
-# 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 <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt.h
* For further information see http://www.genivi.org/.
* @licence end@
*/
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt_client.h
* For further information see http://www.genivi.org/.
* @licence end@
*/
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt_common.h
* For further information see http://www.genivi.org/.
* @licence end@
*/
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt_common_api.h
* For further information see http://www.genivi.org/.
* @licence end@
*/
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <limits.h> /* Needed for LONG_MAX */
#include <sys/stat.h> /* 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 <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt_offline_trace.h
* For further information see http://www.genivi.org/.
* @licence end@
*/
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <alexander.aw.wenzel@bmw.de> 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 <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt_shm.h
* For further information see http://www.genivi.org/.
* @licence end@
*/
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt_types.h
* For further information see http://www.genivi.org/.
* @licence end@
*/
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt_user.h
* For further information see http://www.genivi.org/.
* @licence end@
*/
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt_user_macros.h
* For further information see http://www.genivi.org/.
* @licence end@
*/
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <alexander.aw.wenzel@bmw.de>
-#
-# 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 <alexander.aw.wenzel@bmw.de>
-#
-# 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 <alexander.aw.wenzel@bmw.de> 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 <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt-adaptor-udp.c
* For further information see http://www.genivi.org/.
* @licence end@
*/
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <alexander.aw.wenzel@bmw.de>
-#
-# 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 <alexander.aw.wenzel@bmw.de> 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 <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt-convert.c
* For further information see http://www.genivi.org/.
* @licence end@
*/
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <alexander.aw.wenzel@bmw.de> 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 <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <alexander.aw.wenzel@bmw.de>
-#
-# 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 <alexander.aw.wenzel@bmw.de>
* Markus Klein <Markus.Klein@esk.fraunhofer.de>
* Mikko Rapeli <mikko.rapeli@bmw.de>
*
+ * \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 <netdb.h>
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 <alexander.aw.wenzel@bmw.de>
*
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> 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 <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt-daemon_cfg.h
* For further information see http://www.genivi.org/.
* @licence end@
*/
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <alexander.aw.wenzel@bmw.de>
* Markus Klein <Markus.Klein@esk.fraunhofer.de>
* Mikko Rapeli <mikko.rapeli@bmw.de>
*
+ * \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 <netdb.h>
#include <ctype.h>
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 <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt_daemon_client.h
* For further information see http://www.genivi.org/.
* @licence end@
*/
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <alexander.aw.wenzel@bmw.de>
*
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> 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 <alexander.aw.wenzel@bmw.de>
*
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> 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 <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt_daemon_common_cfg.h
* For further information see http://www.genivi.org/.
* @licence end@
*/
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <alexander.aw.wenzel@bmw.de>
*
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> 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 <alexander.aw.wenzel@bmw.de>
*
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> 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 <alexander.aw.wenzel@bmw.de>
* Markus Klein <Markus.Klein@esk.fraunhofer.de>
* Mikko Rapeli <mikko.rapeli@bmw.de>
*
+ * \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 <netdb.h>
#include <ctype.h>
#include <stdio.h> /* 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 <alexander.aw.wenzel@bmw.de>
*
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> 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 <alexander.aw.wenzel@bmw.de>
-#
-# 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 <alexander.wenzel@bmw.de>
+ * 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 <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <stdlib.h>
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 <alexander.wenzel@bmw.de>
- *
- * \file dlt-dbus.c
* For further information see http://www.genivi.org/.
* @licence end@
*/
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <stdio.h>
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 <alexander.wenzel@bmw.de>
- *
- * \file dlt-dbus.c
* For further information see http://www.genivi.org/.
* @licence end@
*/
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <alexander.aw.wenzel@bmw.de>
-#
-# 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 <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt-example-filetransfer.c
* For further information see http://www.genivi.org/.
* @licence end@
*/
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt-example-user.c
* For further information see http://www.genivi.org/.
* @licence end@
*/
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <alexander.aw.wenzel@bmw.de>
*
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> 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 <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt-example-user.c
* For further information see http://www.genivi.org/.
* @licence end@
*/
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <alexander.aw.wenzel@bmw.de>
-#
-# 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 <alexander.aw.wenzel@bmw.de>
*
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> 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 <alexander.aw.wenzel@bmw.de>
*
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> 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 <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt_filetransfer.c
* For further information see http://www.genivi.org/.
* @licence end@
*/
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <alexander.aw.wenzel@bmw.de>
* Markus Klein <Markus.Klein@esk.fraunhofer.de>
* Mikko Rapeli <mikko.rapeli@bmw.de>
*
+ * \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 <stdlib.h> /* 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 <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt_user_cfg.h
* For further information see http://www.genivi.org/.
* @licence end@
*/
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <alexander.aw.wenzel@bmw.de>
* Markus Klein <Markus.Klein@esk.fraunhofer.de>
* Mikko Rapeli <mikko.rapeli@bmw.de>
*
+ * \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 <stdio.h>
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 <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt_common_cfg.h
* For further information see http://www.genivi.org/.
* @licence end@
*/
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <alexander.aw.wenzel@bmw.de> BMW 2011-2012
- *
- * \file dlt_offline_trace.c
* For further information see http://www.genivi.org/.
* @licence end@
*/
+/*!
+ * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de>
+ *
+ * \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 <alexander.aw.wenzel@bmw.de>
*
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> 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 <alexander.aw.wenzel@bmw.de>
*
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> 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 <alexander.aw.wenzel@bmw.de>
*
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> 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 <alexander.aw.wenzel@bmw.de>
*
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> 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 <alexander.aw.wenzel@bmw.de>
-#
-# 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 <lassi.lm.marttala@partner.bmw.de>
* Alexander Wenzel <alexander.aw.wenzel@bmw.de>
* Markus Klein <Markus.Klein@esk.fraunhofer.de>
* Mikko Rapeli <mikko.rapeli@bmw.de>
*
+ * \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 <alexander.aw.wenzel@bmw.de>
*
- * \author Alexander Wenzel <Alexander.AW.Wenzel@bmw.de> 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 <lassi.lm.marttala@partner.bmw.de>
*
- * \author Lassi Marttala <lassi.lm.marttala@partner.bmw.de> 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 <lassi.lm.marttala@partner.bmw.de>
*
- * \author Lassi Marttala <lassi.lm.marttala@partner.bmw.de> 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 <lassi.lm.marttala@partner.bmw.de>
*
- * \author Lassi Marttala <lassi.lm.marttala@partner.bmw.de> 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 <lassi.lm.marttala@partner.bmw.de> BMW 2012
- *
- * \file dlt-system-logfile.c
* For further information see http://www.genivi.org/.
* @licence end@
*/
+/*!
+ * \author Lassi Marttala <lassi.lm.marttala@partner.bmw.de>
+ *
+ * \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 <lassi.lm.marttala@partner.bmw.de> BMW 2012
- *
- * \file dlt-system-logfile.c
* For further information see http://www.genivi.org/.
* @licence end@
*/
+/*!
+ * \author Lassi Marttala <lassi.lm.marttala@partner.bmw.de>
+ *
+ * \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 <lassi.lm.marttala@partner.bmw.de> BMW 2012
- *
- * \file dlt-system-logfile.c
* For further information see http://www.genivi.org/.
* @licence end@
*/
+/*!
+ * \author Lassi Marttala <lassi.lm.marttala@partner.bmw.de>
+ *
+ * \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 <lassi.lm.marttala@partner.bmw.de>
* Alexander Wenzel <alexander.aw.wenzel@bmw.de>
* Markus Klein <Markus.Klein@esk.fraunhofer.de>
* Mikko Rapeli <mikko.rapeli@bmw.de>
*
- * \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 <lassi.lm.marttala@partner.bmw.de>
*
- * \author Lassi Marttala <lassi.lm.marttala@partner.bmw.de> 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 <lassi.lm.marttala@partner.bmw.de> BMW 2012
- *
- * \file dlt-system.c
* For further information see http://www.genivi.org/.
* @licence end@
*/
+/*!
+ * \author Lassi Marttala <lassi.lm.marttala@partner.bmw.de>
+ *
+ * \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 <alexander.aw.wenzel@bmw.de>
-#
-# 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 <alexander.aw.wenzel@bmw.de>
*
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> 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 <alexander.aw.wenzel@bmw.de>
*
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> 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 <Lassi.LM.Marttala@partner.bmw.de>
*
- * \author Lassi Marttala <Lassi.LM.Marttala@partner.bmw.de> 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 <lassi.lm.marttala@partner.bmw.de>
*
- * \author Lassi Marttala <Lassi.LM.Marttala@partner.bmw.de> 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 <lassi.lm.marttala@partner.bmw.de>
*
- * \author Lassi Marttala <Lassi.LM.Marttala@partner.bmw.de> 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 <alexander.aw.wenzel@bmw.de>
*
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> 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 <alexander.aw.wenzel@bmw.de>
*
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> 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 <alexander.aw.wenzel@bmw.de>
*
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> 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 <alexander.aw.wenzel@bmw.de>
*
- * \author Alexander Wenzel <alexander.aw.wenzel@bmw.de> 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 <alexander.aw.wenzel@bmw.de>
-#
-# 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 <alexander.aw.wenzel@bmw.de>
-#
-# 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 <alexander.aw.wenzel@bmw.de>
-#
-# 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 <alexander.aw.wenzel@bmw.de>
-#
-# 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 <alexander.aw.wenzel@bmw.de>
-#
-# 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 <alexander.aw.wenzel@bmw.de>
-#
-# 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 <alexander.aw.wenzel@bmw.de>
-#
-# 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 <alexander.aw.wenzel@bmw.de>
-#
-# 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