summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt6
-rwxr-xr-xReleaseNotes.txt2
-rw-r--r--doc/dlt_book.txt14
-rw-r--r--doc/dlt_extended_network_trace.txt15
-rw-r--r--doc/dlt_filetransfer.txt9
5 files changed, 29 insertions, 17 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d177d9..b29a5f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,7 +26,7 @@ set( DLT_MAJOR_VERSION 2)
set( DLT_MINOR_VERSION 9)
set( DLT_PATCH_LEVEL 0)
set( DLT_VERSION ${DLT_MAJOR_VERSION}.${DLT_MINOR_VERSION}.${DLT_PATCH_LEVEL})
-set( DLT_VERSION_STATE RELEASE )
+set( DLT_VERSION_STATE STABLE )
set( DLT_REVISION "")
execute_process(COMMAND git describe --tags WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
@@ -94,8 +94,8 @@ endif(WITH_DLT_SHM_ENABLE)
if(WITH_GPROF)
SET(CMAKE_C_FLAGS "-pg")
endif(WITH_GPROF)
-
-add_definitions( "-Wall" )
+
+add_definitions( "-Wall" )
add_definitions( "-Wextra" )
configure_file(${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.spec.in ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.spec)
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index bfafd2b..a84bb59 100755
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -4,7 +4,7 @@ Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>
Version
-------
-2.9.0 RELEASE
+2.9.0
Changes
-------
diff --git a/doc/dlt_book.txt b/doc/dlt_book.txt
index ecbf744..e883b57 100644
--- a/doc/dlt_book.txt
+++ b/doc/dlt_book.txt
@@ -1,7 +1,7 @@
DLT Documentation
=================
Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>
-0.0.1, 2012/10/10: Initial version
+0.0.1, 2012/10/12: Initial version
image::images/genivi_chrome_1_transparent.png[width=128]
@@ -15,7 +15,9 @@ Information
:leveloffset: 1
include::../README.txt[]
+
include::../INSTALL.txt[]
+
include::../ReleaseNotes.txt[]
:leveloffset: 0
@@ -26,10 +28,15 @@ Manpages
:leveloffset: 1
include::dlt-daemon.1.txt[]
+
include::dlt.conf.5.txt[]
+
include::dlt-system.1.txt[]
+
include::dlt-system.conf.5.txt[]
+
include::dlt-convert.1.txt[]
+
include::dlt-receive.1.txt[]
:leveloffset: 0
@@ -40,7 +47,12 @@ Manuals
:leveloffset: 1
include::dlt_user_manual.txt[]
+
include::dlt_cheatsheet.txt[]
+
include::dlt_design_specification.txt[]
+
include::dlt_filetransfer.txt[]
+include::dlt_extended_network_trace.txt[]
+
diff --git a/doc/dlt_extended_network_trace.txt b/doc/dlt_extended_network_trace.txt
index 9b07dcd..dd45a91 100644
--- a/doc/dlt_extended_network_trace.txt
+++ b/doc/dlt_extended_network_trace.txt
@@ -1,17 +1,15 @@
Extended Network Trace
-=====================
+======================
Lassi Marttala <Lassi.LM.Marttala@partner.bmw.de>
0.0.1, 2012/10/11: Initial version
image::images/genivi_chrome_1_transparent.png[width=128]
== Introduction
-
The extended network trace allows the user to send or truncate network trace messages
that are larger than the normal maximum size of a DLT message.
== Protocol
-
When truncation of messages is allowed, the truncated messages will be wrapped into a special message which indicates
that a network trace message was truncated and what was the original size of the message.
@@ -21,9 +19,8 @@ Each segment contains the stream handle, segment sequence number, the data and d
Finally after sending all the data segments, one more packet is sent to indicate the end of the stream.
== Truncated package
-
Truncated message can be sent using the following function:
-[source,c]
+
----
int dlt_user_trace_network_truncated(DltContext *handle, DltNetworkTraceType nw_trace_type, uint16_t header_len, void *header, uint16_t payload_len, void *payload, int allow_truncate)
----
@@ -39,24 +36,26 @@ This will send a packet in the following format:
== Segmented messages
User can send a segmented network trace message asynchronously using:
-[source,c]
+
----
void dlt_user_trace_network_segmented(DltContext *handle, DltNetworkTraceType nw_trace_type, uint16_t header_len, void *header, uint16_t payload_len, void *payload)
----
+
This will start a background thread and return immediately.
User can also send all the required packages one by one using:
-[source,c]
----
int dlt_user_trace_network_segmented_start(unsigned int *id, DltContext *handle, DltNetworkTraceType nw_trace_type, uint16_t header_len, void *header, uint16_t payload_len)
int dlt_user_trace_network_segmented_segment(int id, DltContext *handle, DltNetworkTraceType nw_trace_type, int sequence, uint16_t payload_len, void *payload)
int dlt_user_trace_network_segmented_end(int id, DltContext *handle, DltNetworkTraceType nw_trace_type)
----
+
It is not recommended to use these functions unless you really have to.
== Segmented start packet
The first packet in the stream is the header:
+
|==================================================================
| NWST | Package identifier. STRING
| streamhandle | Unique identifier for all packages in the stream. UINT
@@ -68,6 +67,7 @@ The first packet in the stream is the header:
== Data segment
After the header, follows a stream of data segments.
+
|==================================================================
| NWCH | Package identifier. STRING
| streamhandle | Unique identifier for all packages in the stream. UINT
@@ -77,6 +77,7 @@ After the header, follows a stream of data segments.
== End packet
After all the segments have been sent, an End identifier is sent.
+
|==================================================================
| NWEN | Package identifier. STRING
| streamhandle | Unique identifier for all packages in the stream. UINT
diff --git a/doc/dlt_filetransfer.txt b/doc/dlt_filetransfer.txt
index f1878c4..27124ae 100644
--- a/doc/dlt_filetransfer.txt
+++ b/doc/dlt_filetransfer.txt
@@ -1,5 +1,5 @@
DLT Filetransfer
-==============
+================
Christian Muck <Christian.Muck@bmw.de>
0.0.1, 2012/10/11: Initial version
@@ -15,7 +15,7 @@ Introduction to DLT Filetransfer
---------------------------------
With DLT Filetransfer it is possible store the binary data of a file to the automotive dlt log.
The file will be read in binary mode and put as several chunks to a DLT_INFO log. With a special plugin of the dlt viewer, you can extract the embedded files from the trace and save them.
-It can be used for smaller files, e.g. HMI screenshots or little coredumps
+It can be used for smaller files, e.g. HMI screenshots or little coredumps.
Protocol
---------
@@ -25,7 +25,6 @@ The file transfer is at least one single transaction. This transaction consist o
* one or more data packages
* end package
-
Header Package
~~~~~~~~~~~~~~
Every filetransfer must begin with the header package using:
@@ -65,7 +64,6 @@ Data Data Package Protocol:
| FLDA | Package flag
|==================================================================
-
End Package
~~~~~~~~~~~
After all data packages were sent, the end package must be sent to indicate that the filetransfer is over using:
@@ -82,7 +80,6 @@ End Package Protocol:
| FLFI | Package flag
|==================================================================
-
File information
~~~~~~~~~~~~~~~~
The library offers the user the possibility to log informations about a file using the following method without transferring the file itself using:
@@ -105,6 +102,7 @@ File Information Protocol:
File transfer error
~~~~~~~~~~~~~~~~~~~
+
----
//! Error code for dlt_user_log_file_complete
#define ERROR_FILE_COMPLETE -300
@@ -248,3 +246,4 @@ Test the file transfer with the condition that the transferred file does not exi
Test the file transfer with the condition that the transferred file does not exist using single package transfer
* testFile3Run3
Test which logs some information about the file.
+
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 13:43:06 +0000