From 1ff2b808f479dab106545cc90cfb37e84bab204a Mon Sep 17 00:00:00 2001 From: Jens Bocklage Date: Mon, 27 Apr 2015 16:41:01 +0200 Subject: Unified all line endings to UNIX style. Signed-off-by: Alexander Wenzel --- include/dlt/dlt.h | 94 +++++----- include/dlt/dlt_client.h | 286 ++++++++++++++-------------- include/dlt/dlt_common_api.h | 434 +++++++++++++++++++++---------------------- include/dlt/dlt_protocol.h | 372 ++++++++++++++++++------------------- include/dlt/dlt_types.h | 80 ++++---- 5 files changed, 633 insertions(+), 633 deletions(-) (limited to 'include') diff --git a/include/dlt/dlt.h b/include/dlt/dlt.h index 5c2d118..e4bc367 100755 --- a/include/dlt/dlt.h +++ b/include/dlt/dlt.h @@ -1,29 +1,29 @@ -/** - * @licence app begin@ - * Copyright (C) 2012 BMW AG - * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. - * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. - * - * \copyright - * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * - * \author Alexander Wenzel BMW 2011-2012 - * - * \file dlt.h - * For further information see http://www.genivi.org/. - * @licence end@ - */ - -/******************************************************************************* -** ** -** SRC-MODULE: dlt.h ** -** ** +/** + * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * This Source Code Form is subject to the terms of the + * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with + * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file dlt.h + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/******************************************************************************* +** ** +** SRC-MODULE: dlt.h ** +** ** ** TARGET : linux ** ** ** ** PROJECT : DLT ** @@ -49,25 +49,25 @@ ** -------- ------------------------- ---------------------------------- ** ** aw Alexander Wenzel BMW ** ** mk Markus Klein Fraunhofer ESK ** -*******************************************************************************/ - -/******************************************************************************* -** Revision Control History ** -*******************************************************************************/ - -/* - * $LastChangedRevision: 1670 $ - * $LastChangedDate: 2011-04-08 15:12:06 +0200 (Fr, 08. Apr 2011) $ - * $LastChangedBy$ - Initials Date Comment - aw 13.01.2010 initial - */ - -#ifndef DLT_H -#define DLT_H +*******************************************************************************/ + +/******************************************************************************* +** Revision Control History ** +*******************************************************************************/ + +/* + * $LastChangedRevision: 1670 $ + * $LastChangedDate: 2011-04-08 15:12:06 +0200 (Fr, 08. Apr 2011) $ + * $LastChangedBy$ + Initials Date Comment + aw 13.01.2010 initial + */ + +#ifndef DLT_H +#define DLT_H + +#include "dlt_common.h" +#include "dlt_user.h" + +#endif /* DLT_H */ -#include "dlt_common.h" -#include "dlt_user.h" - -#endif /* DLT_H */ - diff --git a/include/dlt/dlt_client.h b/include/dlt/dlt_client.h index ac9d61e..29c7c1b 100755 --- a/include/dlt/dlt_client.h +++ b/include/dlt/dlt_client.h @@ -1,30 +1,30 @@ -/** - * @licence app begin@ - * Copyright (C) 2012 BMW AG - * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. - * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. - * - * \copyright - * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * - * \author Alexander Wenzel BMW 2011-2012 - * - * \file dlt_client.h - * For further information see http://www.genivi.org/. - * @licence end@ - */ - - -/******************************************************************************* -** ** -** SRC-MODULE: dlt_client.h ** -** ** +/** + * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * This Source Code Form is subject to the terms of the + * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with + * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file dlt_client.h + * For further information see http://www.genivi.org/. + * @licence end@ + */ + + +/******************************************************************************* +** ** +** SRC-MODULE: dlt_client.h ** +** ** ** TARGET : linux ** ** ** ** PROJECT : DLT ** @@ -50,44 +50,44 @@ ** -------- ------------------------- ---------------------------------- ** ** aw Alexander Wenzel BMW ** ** mk Markus Klein Fraunhofer ESK ** -*******************************************************************************/ - -/******************************************************************************* -** Revision Control History ** -*******************************************************************************/ - -/* - * $LastChangedRevision$ - * $LastChangedDate$ - * $LastChangedBy$ - */ - -#ifndef DLT_CLIENT_H -#define DLT_CLIENT_H - -/** - \defgroup clientapi DLT Client API - \addtogroup clientapi - \{ -*/ - -#include "dlt_types.h" -#include "dlt_common.h" - -typedef struct -{ - DltReceiver receiver; /**< receiver pointer to dlt receiver structure */ - int sock; /**< sock Connection handle/socket */ - char *servIP; /**< servIP IP adress/Hostname of TCP/IP interface */ - char *serialDevice; /**< serialDevice Devicename of serial device */ - speed_t baudrate; /**< baudrate Baudrate of serial interface, as speed_t */ - int serial_mode; /**< serial_mode Serial mode enabled =1, disabled =0 */ -} DltClient; - -#ifdef __cplusplus -extern "C" { -#endif - +*******************************************************************************/ + +/******************************************************************************* +** Revision Control History ** +*******************************************************************************/ + +/* + * $LastChangedRevision$ + * $LastChangedDate$ + * $LastChangedBy$ + */ + +#ifndef DLT_CLIENT_H +#define DLT_CLIENT_H + +/** + \defgroup clientapi DLT Client API + \addtogroup clientapi + \{ +*/ + +#include "dlt_types.h" +#include "dlt_common.h" + +typedef struct +{ + DltReceiver receiver; /**< receiver pointer to dlt receiver structure */ + int sock; /**< sock Connection handle/socket */ + char *servIP; /**< servIP IP adress/Hostname of TCP/IP interface */ + char *serialDevice; /**< serialDevice Devicename of serial device */ + speed_t baudrate; /**< baudrate Baudrate of serial interface, as speed_t */ + int serial_mode; /**< serial_mode Serial mode enabled =1, disabled =0 */ +} DltClient; + +#ifdef __cplusplus +extern "C" { +#endif + void dlt_client_register_message_callback(int (*registerd_callback) (DltMessage *message, void *data)); /** @@ -95,21 +95,21 @@ void dlt_client_register_message_callback(int (*registerd_callback) (DltMessage * @param client pointer to dlt client structure * @param verbose if set to true verbose information is printed out. * @return negative value if there was an error - */ + */ int dlt_client_init(DltClient *client, int verbose); /** * Connect to dlt daemon using the information from the dlt client structure * @param client pointer to dlt client structure * @param verbose if set to true verbose information is printed out. * @return negative value if there was an error - */ + */ int dlt_client_connect(DltClient *client, int verbose); /** * Cleanup dlt client structure * @param client pointer to dlt client structure * @param verbose if set to true verbose information is printed out. * @return negative value if there was an error - */ + */ int dlt_client_cleanup(DltClient *client, int verbose); /** * Main Loop of dlt client application @@ -117,18 +117,18 @@ int dlt_client_cleanup(DltClient *client, int verbose); * @param data pointer to data to be provided to the main loop * @param verbose if set to true verbose information is printed out. * @return negative value if there was an error - */ + */ int dlt_client_main_loop(DltClient *client, void *data, int verbose); -/** - * Send ancontrol message to the dlt daemon - * @param client pointer to dlt client structure - * @param apid application id - * @param ctid context id - * @param payload Buffer filled with control message data - * @param size Size of control message data - * @return negative value if there was an error - */ -int dlt_client_send_ctrl_msg(DltClient *client, char *apid, char *ctid, uint8_t *payload, uint32_t size); +/** + * Send ancontrol message to the dlt daemon + * @param client pointer to dlt client structure + * @param apid application id + * @param ctid context id + * @param payload Buffer filled with control message data + * @param size Size of control message data + * @return negative value if there was an error + */ +int dlt_client_send_ctrl_msg(DltClient *client, char *apid, char *ctid, uint8_t *payload, uint32_t size); /** * Send an injection message to the dlt daemon * @param client pointer to dlt client structure @@ -138,74 +138,74 @@ int dlt_client_send_ctrl_msg(DltClient *client, char *apid, char *ctid, uint8_t * @param buffer Buffer filled with injection message data * @param size Size of injection data within buffer * @return negative value if there was an error - */ + */ int dlt_client_send_inject_msg(DltClient *client, char *apid, char *ctid, uint32_t serviceID, uint8_t *buffer, uint32_t size); -/** - * Send an set log level message to the dlt daemon - * @param client pointer to dlt client structure - * @param apid application id - * @param ctid context id - * @param SendLogLevel Log Level - * @return negative value if there was an error - */ -int dlt_client_send_log_level(DltClient *client, char *apid, char *ctid, uint8_t logLevel); -/** - * Send a set trace status message to the dlt daemon - * @param client pointer to dlt client structure - * @param apid application id - * @param ctid context id - * @param defaultTraceStatus Default Trace Status - * @return negative value if there was an error - */ -int dlt_client_send_trace_status(DltClient *client, char *apid, char *ctid, uint8_t traceStatus); -/** - * Send the default log level to the dlt daemon - * @param client pointer to dlt client structure - * @param defaultLogLevel Default Log Level - * @return negative value if there was an error - */ -int dlt_client_send_default_log_level(DltClient *client, uint8_t defaultLogLevel); -/** - * Send the default trace status to the dlt daemon - * @param client pointer to dlt client structure - * @param defaultTraceStatus Default Trace Status - * @return negative value if there was an error - */ -int dlt_client_send_default_trace_status(DltClient *client, uint8_t defaultTraceStatus); -/** - * Send the timing pakets status to the dlt daemon - * @param client pointer to dlt client structure - * @param timingPakets Timing pakets enabled - * @return negative value if there was an error - */ -int dlt_client_send_timing_pakets(DltClient *client, uint8_t timingPakets); -/** - * Send the store config command to the dlt daemon - * @param client pointer to dlt client structure - * @return negative value if there was an error - */ -int dlt_client_send_store_config(DltClient *client); -/** - * Send the reset to factory default command to the dlt daemon - * @param client pointer to dlt client structure - * @return negative value if there was an error - */ -int dlt_client_send_reset_to_factory_default(DltClient *client); - +/** + * Send an set log level message to the dlt daemon + * @param client pointer to dlt client structure + * @param apid application id + * @param ctid context id + * @param SendLogLevel Log Level + * @return negative value if there was an error + */ +int dlt_client_send_log_level(DltClient *client, char *apid, char *ctid, uint8_t logLevel); +/** + * Send a set trace status message to the dlt daemon + * @param client pointer to dlt client structure + * @param apid application id + * @param ctid context id + * @param defaultTraceStatus Default Trace Status + * @return negative value if there was an error + */ +int dlt_client_send_trace_status(DltClient *client, char *apid, char *ctid, uint8_t traceStatus); +/** + * Send the default log level to the dlt daemon + * @param client pointer to dlt client structure + * @param defaultLogLevel Default Log Level + * @return negative value if there was an error + */ +int dlt_client_send_default_log_level(DltClient *client, uint8_t defaultLogLevel); +/** + * Send the default trace status to the dlt daemon + * @param client pointer to dlt client structure + * @param defaultTraceStatus Default Trace Status + * @return negative value if there was an error + */ +int dlt_client_send_default_trace_status(DltClient *client, uint8_t defaultTraceStatus); +/** + * Send the timing pakets status to the dlt daemon + * @param client pointer to dlt client structure + * @param timingPakets Timing pakets enabled + * @return negative value if there was an error + */ +int dlt_client_send_timing_pakets(DltClient *client, uint8_t timingPakets); +/** + * Send the store config command to the dlt daemon + * @param client pointer to dlt client structure + * @return negative value if there was an error + */ +int dlt_client_send_store_config(DltClient *client); +/** + * Send the reset to factory default command to the dlt daemon + * @param client pointer to dlt client structure + * @return negative value if there was an error + */ +int dlt_client_send_reset_to_factory_default(DltClient *client); + /** * Set baudrate within dlt client structure * @param client pointer to dlt client structure * @param baudrate Baudrate * @return negative value if there was an error */ -int dlt_client_setbaudrate(DltClient *client, int baudrate); - -#ifdef __cplusplus -} -#endif - -/** - \} -*/ - -#endif /* DLT_CLIENT_H */ +int dlt_client_setbaudrate(DltClient *client, int baudrate); + +#ifdef __cplusplus +} +#endif + +/** + \} +*/ + +#endif /* DLT_CLIENT_H */ diff --git a/include/dlt/dlt_common_api.h b/include/dlt/dlt_common_api.h index f849567..c6670b5 100644 --- a/include/dlt/dlt_common_api.h +++ b/include/dlt/dlt_common_api.h @@ -1,29 +1,29 @@ -/** - * @licence app begin@ - * Copyright (C) 2014 BMW AG - * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. - * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. - * - * \copyright - * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * - * \author Alexander Wenzel BMW 2011-2012 - * - * \file dlt_common_api.h - * For further information see http://www.genivi.org/. - * @licence end@ - */ - -/******************************************************************************* -** ** -** SRC-MODULE: dlt_commpn_api.h ** -** ** +/** + * @licence app begin@ + * Copyright (C) 2014 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * This Source Code Form is subject to the terms of the + * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with + * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file dlt_common_api.h + * For further information see http://www.genivi.org/. + * @licence end@ + */ + +/******************************************************************************* +** ** +** SRC-MODULE: dlt_commpn_api.h ** +** ** ** TARGET : linux ** ** ** ** PROJECT : DLT ** @@ -47,195 +47,195 @@ ** Initials Name Company ** ** -------- ------------------------- ---------------------------------- ** ** aw Alexander Wenzel BMW ** -*******************************************************************************/ - -#ifndef DLT_COMMON_API_H -#define DLT_COMMON_API_H +*******************************************************************************/ + +#ifndef DLT_COMMON_API_H +#define DLT_COMMON_API_H + +#include "dlt.h" + +/** + * Create an object for a new context. + * Common API with DLT Embedded + * This macro has to be called first for every. + * @param CONTEXT object containing information about one special logging context + */ +/* #define DLT_DECLARE_CONTEXT(CONTEXT) */ +/* UNCHANGED */ + +/** + * Use an object of a new context created in another module. + * Common API with DLT Embedded + * This macro has to be called first for every. + * @param CONTEXT object containing information about one special logging context + */ +/* #define DLT_IMPORT_CONTEXT(CONTEXT) */ +/* UNCHANGED */ + +/** + * Register application. + * Common API with DLT Embedded + * @param APPID application id with maximal four characters + * @param DESCRIPTION ASCII string containing description + */ +/* #define DLT_REGISTER_APP(APPID,DESCRIPTION) */ +/* UNCHANGED */ + +/** + * Register context including application (with default log level and default trace status) + * Common API with DLT Embedded + * @param CONTEXT object containing information about one special logging context + * @param CONTEXTID context id with maximal four characters + * @param APPID context id with maximal four characters + * @param DESCRIPTION ASCII string containing description + */ +#define DLT_REGISTER_CONTEXT_APP(CONTEXT,CONTEXTID,APPID,DESCRIPTION) \ + DLT_REGISTER_CONTEXT(CONTEXT,CONTEXTID,DESCRIPTION) + +/** + * Send log message with variable list of messages (intended for verbose mode) + * Common API with DLT Embedded + * @param CONTEXT object containing information about one special logging context + * @param LOGLEVEL the log level of the log message + * @param ARGS variable list of arguments + */ +/*****************************************/ +#define DLT_LOG0(CONTEXT,LOGLEVEL) \ + DLT_LOG(CONTEXT, LOGLEVEL ) +/*****************************************/ +#define DLT_LOG1(CONTEXT,LOGLEVEL, ARGS1) \ + DLT_LOG(CONTEXT, LOGLEVEL, ARGS1) +/*****************************************/ +#define DLT_LOG2(CONTEXT,LOGLEVEL, ARGS1, ARGS2) \ + DLT_LOG(CONTEXT, LOGLEVEL, ARGS1, ARGS2) +/*****************************************/ +#define DLT_LOG3(CONTEXT,LOGLEVEL, ARGS1, ARGS2, ARGS3) \ + DLT_LOG(CONTEXT, LOGLEVEL, ARGS1, ARGS2, ARGS3) +/*****************************************/ +#define DLT_LOG4(CONTEXT,LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4) \ + DLT_LOG(CONTEXT, LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4) +/*****************************************/ +#define DLT_LOG5(CONTEXT,LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5) \ + DLT_LOG(CONTEXT, LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5) +/*****************************************/ +#define DLT_LOG6(CONTEXT,LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6) \ + DLT_LOG(CONTEXT, LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6) +/*****************************************/ +#define DLT_LOG7(CONTEXT,LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7) \ + DLT_LOG(CONTEXT, LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7) +/*****************************************/ +#define DLT_LOG8(CONTEXT,LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8) \ + DLT_LOG(CONTEXT, LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8) +/*****************************************/ +#define DLT_LOG9(CONTEXT,LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9) \ + DLT_LOG(CONTEXT, LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9) +/*****************************************/ +#define DLT_LOG10(CONTEXT,LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10) \ + DLT_LOG(CONTEXT, LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10) +/*****************************************/ +#define DLT_LOG11(CONTEXT,LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11) \ + DLT_LOG(CONTEXT, LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11) +/*****************************************/ +#define DLT_LOG12(CONTEXT,LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12) \ + DLT_LOG(CONTEXT, LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12) +/*****************************************/ +#define DLT_LOG13(CONTEXT,LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12, ARGS13) \ + DLT_LOG(CONTEXT, LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12, ARGS13) +/*****************************************/ +#define DLT_LOG14(CONTEXT,LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12, ARGS13, ARGS14) \ + DLT_LOG(CONTEXT, LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12, ARGS13, ARGS14) +/*****************************************/ +#define DLT_LOG15(CONTEXT,LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12, ARGS13, ARGS14, ARGS15) \ + DLT_LOG(CONTEXT, LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12, ARGS13, ARGS14, ARGS15) +/*****************************************/ +#define DLT_LOG16(CONTEXT,LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12, ARGS13, ARGS14, ARGS15, ARGS16) \ + DLT_LOG(CONTEXT, LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12, ARGS13, ARGS14, ARGS15, ARGS16) + +/** + * Send log message with variable list of messages (intended for non-verbose mode) + * Common API with DLT Embedded + * @param CONTEXT object containing information about one special logging context + * @param LOGLEVEL the log level of the log message + * @param MSGID the message id of log message + * @param ARGS variable list of arguments: + calls to DLT_STRING(), DLT_BOOL(), DLT_FLOAT32(), DLT_FLOAT64(), + DLT_INT(), DLT_UINT(), DLT_RAW() + */ +/*****************************************/ +#define DLT_LOG_ID0(CONTEXT,LOGLEVEL,MSGID) \ + DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID ) +/*****************************************/ +#define DLT_LOG_ID1(CONTEXT,LOGLEVEL,MSGID, ARGS1) \ + DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID, ARGS1) +/*****************************************/ +#define DLT_LOG_ID2(CONTEXT,LOGLEVEL,MSGID, ARGS1, ARGS2) \ + DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID, ARGS1, ARGS2) +/*****************************************/ +#define DLT_LOG_ID3(CONTEXT,LOGLEVEL,MSGID, ARGS1, ARGS2, ARGS3) \ + DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID, ARGS1, ARGS2, ARGS3) +/*****************************************/ +#define DLT_LOG_ID4(CONTEXT,LOGLEVEL,MSGID, ARGS1, ARGS2, ARGS3, ARGS4) \ + DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID, ARGS1, ARGS2, ARGS3, ARGS4) +/*****************************************/ +#define DLT_LOG_ID5(CONTEXT,LOGLEVEL,MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5) \ + DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5) +/*****************************************/ +#define DLT_LOG_ID6(CONTEXT,LOGLEVEL,MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6) \ + DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6) +/*****************************************/ +#define DLT_LOG_ID7(CONTEXT,LOGLEVEL,MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7) \ + DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7) +/*****************************************/ +#define DLT_LOG_ID8(CONTEXT,LOGLEVEL,MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8) \ + DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8) +/*****************************************/ +#define DLT_LOG_ID9(CONTEXT,LOGLEVEL,MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9) \ + DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9) +/*****************************************/ +#define DLT_LOG_ID10(CONTEXT,LOGLEVEL,MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10) \ + DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10) +/*****************************************/ +#define DLT_LOG_ID11(CONTEXT,LOGLEVEL,MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11) \ + DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11) +/*****************************************/ +#define DLT_LOG_ID12(CONTEXT,LOGLEVEL,MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12) \ + DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12) +/*****************************************/ +#define DLT_LOG_ID13(CONTEXT,LOGLEVEL,MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12, ARGS13) \ + DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12, ARGS13) +/*****************************************/ +#define DLT_LOG_ID14(CONTEXT,LOGLEVEL,MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12, ARGS13, ARGS14) \ + DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12, ARGS13, ARGS14) +/*****************************************/ +#define DLT_LOG_ID15(CONTEXT,LOGLEVEL,MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12, ARGS13, ARGS14, ARGS15) \ + DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12, ARGS13, ARGS14, ARGS15) +/*****************************************/ +#define DLT_LOG_ID16(CONTEXT,LOGLEVEL,MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12, ARGS13, ARGS14, ARGS15, ARGS16) \ + DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12, ARGS13, ARGS14, ARGS15, ARGS16) + +/** + * Unregister context. + * Common API with DLT Embedded + * @param CONTEXT object containing information about one special logging context + */ +/* #define DLT_UNREGISTER_CONTEXT(CONTEXT) */ +/* UNCHANGED */ + +/** + * Unregister application. + * Common API with DLT Embedded + */ +/* #define DLT_UNREGISTER_APP() */ +/* UNCHANGED */ + +/** + * Add string parameter to the log messsage. + * Common API with DLT Embedded + * In the future in none verbose mode the string will not be sent via DLT message. + * @param TEXT ASCII string + */ +/* #define DLT_CSTRING(TEXT) */ +/* UNCHANGED */ + +#endif /* DLT_COMMON_API_H */ -#include "dlt.h" - -/** - * Create an object for a new context. - * Common API with DLT Embedded - * This macro has to be called first for every. - * @param CONTEXT object containing information about one special logging context - */ -/* #define DLT_DECLARE_CONTEXT(CONTEXT) */ -/* UNCHANGED */ - -/** - * Use an object of a new context created in another module. - * Common API with DLT Embedded - * This macro has to be called first for every. - * @param CONTEXT object containing information about one special logging context - */ -/* #define DLT_IMPORT_CONTEXT(CONTEXT) */ -/* UNCHANGED */ - -/** - * Register application. - * Common API with DLT Embedded - * @param APPID application id with maximal four characters - * @param DESCRIPTION ASCII string containing description - */ -/* #define DLT_REGISTER_APP(APPID,DESCRIPTION) */ -/* UNCHANGED */ - -/** - * Register context including application (with default log level and default trace status) - * Common API with DLT Embedded - * @param CONTEXT object containing information about one special logging context - * @param CONTEXTID context id with maximal four characters - * @param APPID context id with maximal four characters - * @param DESCRIPTION ASCII string containing description - */ -#define DLT_REGISTER_CONTEXT_APP(CONTEXT,CONTEXTID,APPID,DESCRIPTION) \ - DLT_REGISTER_CONTEXT(CONTEXT,CONTEXTID,DESCRIPTION) - -/** - * Send log message with variable list of messages (intended for verbose mode) - * Common API with DLT Embedded - * @param CONTEXT object containing information about one special logging context - * @param LOGLEVEL the log level of the log message - * @param ARGS variable list of arguments - */ -/*****************************************/ -#define DLT_LOG0(CONTEXT,LOGLEVEL) \ - DLT_LOG(CONTEXT, LOGLEVEL ) -/*****************************************/ -#define DLT_LOG1(CONTEXT,LOGLEVEL, ARGS1) \ - DLT_LOG(CONTEXT, LOGLEVEL, ARGS1) -/*****************************************/ -#define DLT_LOG2(CONTEXT,LOGLEVEL, ARGS1, ARGS2) \ - DLT_LOG(CONTEXT, LOGLEVEL, ARGS1, ARGS2) -/*****************************************/ -#define DLT_LOG3(CONTEXT,LOGLEVEL, ARGS1, ARGS2, ARGS3) \ - DLT_LOG(CONTEXT, LOGLEVEL, ARGS1, ARGS2, ARGS3) -/*****************************************/ -#define DLT_LOG4(CONTEXT,LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4) \ - DLT_LOG(CONTEXT, LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4) -/*****************************************/ -#define DLT_LOG5(CONTEXT,LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5) \ - DLT_LOG(CONTEXT, LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5) -/*****************************************/ -#define DLT_LOG6(CONTEXT,LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6) \ - DLT_LOG(CONTEXT, LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6) -/*****************************************/ -#define DLT_LOG7(CONTEXT,LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7) \ - DLT_LOG(CONTEXT, LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7) -/*****************************************/ -#define DLT_LOG8(CONTEXT,LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8) \ - DLT_LOG(CONTEXT, LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8) -/*****************************************/ -#define DLT_LOG9(CONTEXT,LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9) \ - DLT_LOG(CONTEXT, LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9) -/*****************************************/ -#define DLT_LOG10(CONTEXT,LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10) \ - DLT_LOG(CONTEXT, LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10) -/*****************************************/ -#define DLT_LOG11(CONTEXT,LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11) \ - DLT_LOG(CONTEXT, LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11) -/*****************************************/ -#define DLT_LOG12(CONTEXT,LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12) \ - DLT_LOG(CONTEXT, LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12) -/*****************************************/ -#define DLT_LOG13(CONTEXT,LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12, ARGS13) \ - DLT_LOG(CONTEXT, LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12, ARGS13) -/*****************************************/ -#define DLT_LOG14(CONTEXT,LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12, ARGS13, ARGS14) \ - DLT_LOG(CONTEXT, LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12, ARGS13, ARGS14) -/*****************************************/ -#define DLT_LOG15(CONTEXT,LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12, ARGS13, ARGS14, ARGS15) \ - DLT_LOG(CONTEXT, LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12, ARGS13, ARGS14, ARGS15) -/*****************************************/ -#define DLT_LOG16(CONTEXT,LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12, ARGS13, ARGS14, ARGS15, ARGS16) \ - DLT_LOG(CONTEXT, LOGLEVEL, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12, ARGS13, ARGS14, ARGS15, ARGS16) - -/** - * Send log message with variable list of messages (intended for non-verbose mode) - * Common API with DLT Embedded - * @param CONTEXT object containing information about one special logging context - * @param LOGLEVEL the log level of the log message - * @param MSGID the message id of log message - * @param ARGS variable list of arguments: - calls to DLT_STRING(), DLT_BOOL(), DLT_FLOAT32(), DLT_FLOAT64(), - DLT_INT(), DLT_UINT(), DLT_RAW() - */ -/*****************************************/ -#define DLT_LOG_ID0(CONTEXT,LOGLEVEL,MSGID) \ - DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID ) -/*****************************************/ -#define DLT_LOG_ID1(CONTEXT,LOGLEVEL,MSGID, ARGS1) \ - DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID, ARGS1) -/*****************************************/ -#define DLT_LOG_ID2(CONTEXT,LOGLEVEL,MSGID, ARGS1, ARGS2) \ - DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID, ARGS1, ARGS2) -/*****************************************/ -#define DLT_LOG_ID3(CONTEXT,LOGLEVEL,MSGID, ARGS1, ARGS2, ARGS3) \ - DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID, ARGS1, ARGS2, ARGS3) -/*****************************************/ -#define DLT_LOG_ID4(CONTEXT,LOGLEVEL,MSGID, ARGS1, ARGS2, ARGS3, ARGS4) \ - DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID, ARGS1, ARGS2, ARGS3, ARGS4) -/*****************************************/ -#define DLT_LOG_ID5(CONTEXT,LOGLEVEL,MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5) \ - DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5) -/*****************************************/ -#define DLT_LOG_ID6(CONTEXT,LOGLEVEL,MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6) \ - DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6) -/*****************************************/ -#define DLT_LOG_ID7(CONTEXT,LOGLEVEL,MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7) \ - DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7) -/*****************************************/ -#define DLT_LOG_ID8(CONTEXT,LOGLEVEL,MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8) \ - DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8) -/*****************************************/ -#define DLT_LOG_ID9(CONTEXT,LOGLEVEL,MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9) \ - DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9) -/*****************************************/ -#define DLT_LOG_ID10(CONTEXT,LOGLEVEL,MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10) \ - DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10) -/*****************************************/ -#define DLT_LOG_ID11(CONTEXT,LOGLEVEL,MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11) \ - DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11) -/*****************************************/ -#define DLT_LOG_ID12(CONTEXT,LOGLEVEL,MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12) \ - DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12) -/*****************************************/ -#define DLT_LOG_ID13(CONTEXT,LOGLEVEL,MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12, ARGS13) \ - DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12, ARGS13) -/*****************************************/ -#define DLT_LOG_ID14(CONTEXT,LOGLEVEL,MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12, ARGS13, ARGS14) \ - DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12, ARGS13, ARGS14) -/*****************************************/ -#define DLT_LOG_ID15(CONTEXT,LOGLEVEL,MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12, ARGS13, ARGS14, ARGS15) \ - DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12, ARGS13, ARGS14, ARGS15) -/*****************************************/ -#define DLT_LOG_ID16(CONTEXT,LOGLEVEL,MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12, ARGS13, ARGS14, ARGS15, ARGS16) \ - DLT_LOG_ID(CONTEXT, LOGLEVEL, MSGID, ARGS1, ARGS2, ARGS3, ARGS4, ARGS5, ARGS6, ARGS7, ARGS8, ARGS9, ARGS10, ARGS11, ARGS12, ARGS13, ARGS14, ARGS15, ARGS16) - -/** - * Unregister context. - * Common API with DLT Embedded - * @param CONTEXT object containing information about one special logging context - */ -/* #define DLT_UNREGISTER_CONTEXT(CONTEXT) */ -/* UNCHANGED */ - -/** - * Unregister application. - * Common API with DLT Embedded - */ -/* #define DLT_UNREGISTER_APP() */ -/* UNCHANGED */ - -/** - * Add string parameter to the log messsage. - * Common API with DLT Embedded - * In the future in none verbose mode the string will not be sent via DLT message. - * @param TEXT ASCII string - */ -/* #define DLT_CSTRING(TEXT) */ -/* UNCHANGED */ - -#endif /* DLT_COMMON_API_H */ - diff --git a/include/dlt/dlt_protocol.h b/include/dlt/dlt_protocol.h index 7bf8b1c..df5a33d 100755 --- a/include/dlt/dlt_protocol.h +++ b/include/dlt/dlt_protocol.h @@ -1,30 +1,30 @@ -/** - * @licence app begin@ - * Copyright (C) 2012 BMW AG - * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. - * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. - * - * \copyright - * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * - * \author Alexander Wenzel BMW 2011-2012 - * - * \file dlt_protocal.h - * For further information see http://www.genivi.org/. - * @licence end@ - */ - - -/******************************************************************************* -** ** -** SRC-MODULE: dlt_protocol.h ** -** ** +/** + * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * This Source Code Form is subject to the terms of the + * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with + * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file dlt_protocal.h + * For further information see http://www.genivi.org/. + * @licence end@ + */ + + +/******************************************************************************* +** ** +** SRC-MODULE: dlt_protocol.h ** +** ** ** TARGET : linux ** ** ** ** PROJECT : DLT ** @@ -50,167 +50,167 @@ ** -------- ------------------------- ---------------------------------- ** ** aw Alexander Wenzel BMW ** ** mk Markus Klein Fraunhofer ESK ** -*******************************************************************************/ - -/******************************************************************************* -** Revision Control History ** -*******************************************************************************/ - -/* - * $LastChangedRevision$ - * $LastChangedDate$ - * $LastChangedBy$ - Initials Date Comment - aw 13.01.2010 initial - */ -#ifndef DLT_PROTOCOL_H -#define DLT_PROTOCOL_H - -/** - \defgroup protocolapi DLT Protocol API - \addtogroup protocolapi - \{ -*/ - -/* - * Definitions of the htyp parameter in standard header. - */ -#define DLT_HTYP_UEH 0x01 /**< use extended header */ -#define DLT_HTYP_MSBF 0x02 /**< MSB first */ -#define DLT_HTYP_WEID 0x04 /**< with ECU ID */ -#define DLT_HTYP_WSID 0x08 /**< with session ID */ -#define DLT_HTYP_WTMS 0x10 /**< with timestamp */ -#define DLT_HTYP_VERS 0xe0 /**< version number, 0x1 */ - -#define DLT_IS_HTYP_UEH(htyp) ((htyp) & DLT_HTYP_UEH) -#define DLT_IS_HTYP_MSBF(htyp) ((htyp) & DLT_HTYP_MSBF) -#define DLT_IS_HTYP_WEID(htyp) ((htyp) & DLT_HTYP_WEID) -#define DLT_IS_HTYP_WSID(htyp) ((htyp) & DLT_HTYP_WSID) -#define DLT_IS_HTYP_WTMS(htyp) ((htyp) & DLT_HTYP_WTMS) - -#define DLT_HTYP_PROTOCOL_VERSION1 (1<<5) - -/* - * Definitions of msin parameter in extended header. - */ -#define DLT_MSIN_VERB 0x01 /**< verbose */ -#define DLT_MSIN_MSTP 0x0e /**< message type */ -#define DLT_MSIN_MTIN 0xf0 /**< message type info */ - -#define DLT_MSIN_MSTP_SHIFT 1 /**< shift right offset to get mstp value */ -#define DLT_MSIN_MTIN_SHIFT 4 /**< shift right offset to get mtin value */ - -#define DLT_IS_MSIN_VERB(msin) ((msin) & DLT_MSIN_VERB) -#define DLT_GET_MSIN_MSTP(msin) (((msin) & DLT_MSIN_MSTP) >> DLT_MSIN_MSTP_SHIFT) -#define DLT_GET_MSIN_MTIN(msin) (((msin) & DLT_MSIN_MTIN) >> DLT_MSIN_MTIN_SHIFT) - -/* - * Definitions of mstp parameter in extended header. - */ -#define DLT_TYPE_LOG 0x00 /**< Log message type */ -#define DLT_TYPE_APP_TRACE 0x01 /**< Application trace message type */ -#define DLT_TYPE_NW_TRACE 0x02 /**< Network trace message type */ -#define DLT_TYPE_CONTROL 0x03 /**< Control message type */ - -/* - * Definitions of msti parameter in extended header. - */ -#define DLT_TRACE_VARIABLE 0x01 /**< tracing of a variable */ -#define DLT_TRACE_FUNCTION_IN 0x02 /**< tracing of function calls */ -#define DLT_TRACE_FUNCTION_OUT 0x03 /**< tracing of function return values */ -#define DLT_TRACE_STATE 0x04 /**< tracing of states of a state machine */ -#define DLT_TRACE_VFB 0x05 /**< tracing of virtual function bus */ - -/* - * Definitions of msbi parameter in extended header. +*******************************************************************************/ + +/******************************************************************************* +** Revision Control History ** +*******************************************************************************/ + +/* + * $LastChangedRevision$ + * $LastChangedDate$ + * $LastChangedBy$ + Initials Date Comment + aw 13.01.2010 initial + */ +#ifndef DLT_PROTOCOL_H +#define DLT_PROTOCOL_H + +/** + \defgroup protocolapi DLT Protocol API + \addtogroup protocolapi + \{ +*/ + +/* + * Definitions of the htyp parameter in standard header. + */ +#define DLT_HTYP_UEH 0x01 /**< use extended header */ +#define DLT_HTYP_MSBF 0x02 /**< MSB first */ +#define DLT_HTYP_WEID 0x04 /**< with ECU ID */ +#define DLT_HTYP_WSID 0x08 /**< with session ID */ +#define DLT_HTYP_WTMS 0x10 /**< with timestamp */ +#define DLT_HTYP_VERS 0xe0 /**< version number, 0x1 */ + +#define DLT_IS_HTYP_UEH(htyp) ((htyp) & DLT_HTYP_UEH) +#define DLT_IS_HTYP_MSBF(htyp) ((htyp) & DLT_HTYP_MSBF) +#define DLT_IS_HTYP_WEID(htyp) ((htyp) & DLT_HTYP_WEID) +#define DLT_IS_HTYP_WSID(htyp) ((htyp) & DLT_HTYP_WSID) +#define DLT_IS_HTYP_WTMS(htyp) ((htyp) & DLT_HTYP_WTMS) + +#define DLT_HTYP_PROTOCOL_VERSION1 (1<<5) + +/* + * Definitions of msin parameter in extended header. + */ +#define DLT_MSIN_VERB 0x01 /**< verbose */ +#define DLT_MSIN_MSTP 0x0e /**< message type */ +#define DLT_MSIN_MTIN 0xf0 /**< message type info */ + +#define DLT_MSIN_MSTP_SHIFT 1 /**< shift right offset to get mstp value */ +#define DLT_MSIN_MTIN_SHIFT 4 /**< shift right offset to get mtin value */ + +#define DLT_IS_MSIN_VERB(msin) ((msin) & DLT_MSIN_VERB) +#define DLT_GET_MSIN_MSTP(msin) (((msin) & DLT_MSIN_MSTP) >> DLT_MSIN_MSTP_SHIFT) +#define DLT_GET_MSIN_MTIN(msin) (((msin) & DLT_MSIN_MTIN) >> DLT_MSIN_MTIN_SHIFT) + +/* + * Definitions of mstp parameter in extended header. + */ +#define DLT_TYPE_LOG 0x00 /**< Log message type */ +#define DLT_TYPE_APP_TRACE 0x01 /**< Application trace message type */ +#define DLT_TYPE_NW_TRACE 0x02 /**< Network trace message type */ +#define DLT_TYPE_CONTROL 0x03 /**< Control message type */ + +/* + * Definitions of msti parameter in extended header. + */ +#define DLT_TRACE_VARIABLE 0x01 /**< tracing of a variable */ +#define DLT_TRACE_FUNCTION_IN 0x02 /**< tracing of function calls */ +#define DLT_TRACE_FUNCTION_OUT 0x03 /**< tracing of function return values */ +#define DLT_TRACE_STATE 0x04 /**< tracing of states of a state machine */ +#define DLT_TRACE_VFB 0x05 /**< tracing of virtual function bus */ + +/* + * Definitions of msbi parameter in extended header. */ /* see file dlt_user.h */ - -/* - * Definitions of msci parameter in extended header. - */ -#define DLT_CONTROL_REQUEST 0x01 /**< Request message */ -#define DLT_CONTROL_RESPONSE 0x02 /**< Response to request message */ -#define DLT_CONTROL_TIME 0x03 /**< keep-alive message */ - -#define DLT_MSIN_CONTROL_REQUEST ((DLT_TYPE_CONTROL << DLT_MSIN_MSTP_SHIFT) | (DLT_CONTROL_REQUEST << DLT_MSIN_MTIN_SHIFT)) + +/* + * Definitions of msci parameter in extended header. + */ +#define DLT_CONTROL_REQUEST 0x01 /**< Request message */ +#define DLT_CONTROL_RESPONSE 0x02 /**< Response to request message */ +#define DLT_CONTROL_TIME 0x03 /**< keep-alive message */ + +#define DLT_MSIN_CONTROL_REQUEST ((DLT_TYPE_CONTROL << DLT_MSIN_MSTP_SHIFT) | (DLT_CONTROL_REQUEST << DLT_MSIN_MTIN_SHIFT)) #define DLT_MSIN_CONTROL_RESPONSE ((DLT_TYPE_CONTROL << DLT_MSIN_MSTP_SHIFT) | (DLT_CONTROL_RESPONSE << DLT_MSIN_MTIN_SHIFT)) -#define DLT_MSIN_CONTROL_TIME ((DLT_TYPE_CONTROL << DLT_MSIN_MSTP_SHIFT) | (DLT_CONTROL_TIME << DLT_MSIN_MTIN_SHIFT)) - -/* - * Definitions of types of arguments in payload. - */ -#define DLT_TYPE_INFO_TYLE 0x0000000f /**< Length of standard data: 1 = 8bit, 2 = 16bit, 3 = 32 bit, 4 = 64 bit, 5 = 128 bit */ -#define DLT_TYPE_INFO_BOOL 0x00000010 /**< Boolean data */ -#define DLT_TYPE_INFO_SINT 0x00000020 /**< Signed integer data */ -#define DLT_TYPE_INFO_UINT 0x00000040 /**< Unsigned integer data */ -#define DLT_TYPE_INFO_FLOA 0x00000080 /**< Float data */ -#define DLT_TYPE_INFO_ARAY 0x00000100 /**< Array of standard types */ -#define DLT_TYPE_INFO_STRG 0x00000200 /**< String */ -#define DLT_TYPE_INFO_RAWD 0x00000400 /**< Raw data */ -#define DLT_TYPE_INFO_VARI 0x00000800 /**< Set, if additional information to a variable is available */ -#define DLT_TYPE_INFO_FIXP 0x00001000 /**< Set, if quantization and offset are added */ -#define DLT_TYPE_INFO_TRAI 0x00002000 /**< Set, if additional trace information is added */ -#define DLT_TYPE_INFO_STRU 0x00004000 /**< Struct */ -#define DLT_TYPE_INFO_SCOD 0x00038000 /**< coding of the type string: 0 = ASCII, 1 = UTF-8 */ - -#define DLT_TYLE_8BIT 0x00000001 -#define DLT_TYLE_16BIT 0x00000002 -#define DLT_TYLE_32BIT 0x00000003 -#define DLT_TYLE_64BIT 0x00000004 -#define DLT_TYLE_128BIT 0x00000005 - -#define DLT_SCOD_ASCII 0x00000000 -#define DLT_SCOD_UTF8 0x00008000 -#define DLT_SCOD_HEX 0x00010000 -#define DLT_SCOD_BIN 0x00018000 - -/* - * Definitions of DLT services. - */ -#define DLT_SERVICE_ID_SET_LOG_LEVEL 0x01 /**< Service ID: Set log level */ -#define DLT_SERVICE_ID_SET_TRACE_STATUS 0x02 /**< Service ID: Set trace status */ -#define DLT_SERVICE_ID_GET_LOG_INFO 0x03 /**< Service ID: Get log info */ -#define DLT_SERVICE_ID_GET_DEFAULT_LOG_LEVEL 0x04 /**< Service ID: Get dafault log level */ -#define DLT_SERVICE_ID_STORE_CONFIG 0x05 /**< Service ID: Store configuration */ -#define DLT_SERVICE_ID_RESET_TO_FACTORY_DEFAULT 0x06 /**< Service ID: Reset to factory defaults */ -#define DLT_SERVICE_ID_SET_COM_INTERFACE_STATUS 0x07 /**< Service ID: Set communication interface status */ -#define DLT_SERVICE_ID_SET_COM_INTERFACE_MAX_BANDWIDTH 0x08 /**< Service ID: Set communication interface maximum bandwidth */ -#define DLT_SERVICE_ID_SET_VERBOSE_MODE 0x09 /**< Service ID: Set verbose mode */ -#define DLT_SERVICE_ID_SET_MESSAGE_FILTERING 0x0A /**< Service ID: Set message filtering */ -#define DLT_SERVICE_ID_SET_TIMING_PACKETS 0x0B /**< Service ID: Set timing packets */ -#define DLT_SERVICE_ID_GET_LOCAL_TIME 0x0C /**< Service ID: Get local time */ -#define DLT_SERVICE_ID_USE_ECU_ID 0x0D /**< Service ID: Use ECU id */ -#define DLT_SERVICE_ID_USE_SESSION_ID 0x0E /**< Service ID: Use session id */ -#define DLT_SERVICE_ID_USE_TIMESTAMP 0x0F /**< Service ID: Use timestamp */ -#define DLT_SERVICE_ID_USE_EXTENDED_HEADER 0x10 /**< Service ID: Use extended header */ -#define DLT_SERVICE_ID_SET_DEFAULT_LOG_LEVEL 0x11 /**< Service ID: Set default log level */ -#define DLT_SERVICE_ID_SET_DEFAULT_TRACE_STATUS 0x12 /**< Service ID: Set default trace status */ -#define DLT_SERVICE_ID_GET_SOFTWARE_VERSION 0x13 /**< Service ID: Get software version */ -#define DLT_SERVICE_ID_MESSAGE_BUFFER_OVERFLOW 0x14 /**< Service ID: Message buffer overflow */ +#define DLT_MSIN_CONTROL_TIME ((DLT_TYPE_CONTROL << DLT_MSIN_MSTP_SHIFT) | (DLT_CONTROL_TIME << DLT_MSIN_MTIN_SHIFT)) + +/* + * Definitions of types of arguments in payload. + */ +#define DLT_TYPE_INFO_TYLE 0x0000000f /**< Length of standard data: 1 = 8bit, 2 = 16bit, 3 = 32 bit, 4 = 64 bit, 5 = 128 bit */ +#define DLT_TYPE_INFO_BOOL 0x00000010 /**< Boolean data */ +#define DLT_TYPE_INFO_SINT 0x00000020 /**< Signed integer data */ +#define DLT_TYPE_INFO_UINT 0x00000040 /**< Unsigned integer data */ +#define DLT_TYPE_INFO_FLOA 0x00000080 /**< Float data */ +#define DLT_TYPE_INFO_ARAY 0x00000100 /**< Array of standard types */ +#define DLT_TYPE_INFO_STRG 0x00000200 /**< String */ +#define DLT_TYPE_INFO_RAWD 0x00000400 /**< Raw data */ +#define DLT_TYPE_INFO_VARI 0x00000800 /**< Set, if additional information to a variable is available */ +#define DLT_TYPE_INFO_FIXP 0x00001000 /**< Set, if quantization and offset are added */ +#define DLT_TYPE_INFO_TRAI 0x00002000 /**< Set, if additional trace information is added */ +#define DLT_TYPE_INFO_STRU 0x00004000 /**< Struct */ +#define DLT_TYPE_INFO_SCOD 0x00038000 /**< coding of the type string: 0 = ASCII, 1 = UTF-8 */ + +#define DLT_TYLE_8BIT 0x00000001 +#define DLT_TYLE_16BIT 0x00000002 +#define DLT_TYLE_32BIT 0x00000003 +#define DLT_TYLE_64BIT 0x00000004 +#define DLT_TYLE_128BIT 0x00000005 + +#define DLT_SCOD_ASCII 0x00000000 +#define DLT_SCOD_UTF8 0x00008000 +#define DLT_SCOD_HEX 0x00010000 +#define DLT_SCOD_BIN 0x00018000 + +/* + * Definitions of DLT services. + */ +#define DLT_SERVICE_ID_SET_LOG_LEVEL 0x01 /**< Service ID: Set log level */ +#define DLT_SERVICE_ID_SET_TRACE_STATUS 0x02 /**< Service ID: Set trace status */ +#define DLT_SERVICE_ID_GET_LOG_INFO 0x03 /**< Service ID: Get log info */ +#define DLT_SERVICE_ID_GET_DEFAULT_LOG_LEVEL 0x04 /**< Service ID: Get dafault log level */ +#define DLT_SERVICE_ID_STORE_CONFIG 0x05 /**< Service ID: Store configuration */ +#define DLT_SERVICE_ID_RESET_TO_FACTORY_DEFAULT 0x06 /**< Service ID: Reset to factory defaults */ +#define DLT_SERVICE_ID_SET_COM_INTERFACE_STATUS 0x07 /**< Service ID: Set communication interface status */ +#define DLT_SERVICE_ID_SET_COM_INTERFACE_MAX_BANDWIDTH 0x08 /**< Service ID: Set communication interface maximum bandwidth */ +#define DLT_SERVICE_ID_SET_VERBOSE_MODE 0x09 /**< Service ID: Set verbose mode */ +#define DLT_SERVICE_ID_SET_MESSAGE_FILTERING 0x0A /**< Service ID: Set message filtering */ +#define DLT_SERVICE_ID_SET_TIMING_PACKETS 0x0B /**< Service ID: Set timing packets */ +#define DLT_SERVICE_ID_GET_LOCAL_TIME 0x0C /**< Service ID: Get local time */ +#define DLT_SERVICE_ID_USE_ECU_ID 0x0D /**< Service ID: Use ECU id */ +#define DLT_SERVICE_ID_USE_SESSION_ID 0x0E /**< Service ID: Use session id */ +#define DLT_SERVICE_ID_USE_TIMESTAMP 0x0F /**< Service ID: Use timestamp */ +#define DLT_SERVICE_ID_USE_EXTENDED_HEADER 0x10 /**< Service ID: Use extended header */ +#define DLT_SERVICE_ID_SET_DEFAULT_LOG_LEVEL 0x11 /**< Service ID: Set default log level */ +#define DLT_SERVICE_ID_SET_DEFAULT_TRACE_STATUS 0x12 /**< Service ID: Set default trace status */ +#define DLT_SERVICE_ID_GET_SOFTWARE_VERSION 0x13 /**< Service ID: Get software version */ +#define DLT_SERVICE_ID_MESSAGE_BUFFER_OVERFLOW 0x14 /**< Service ID: Message buffer overflow */ #define DLT_SERVICE_ID_LAST_ENTRY 0x15 /**< Service ID: Last entry to avoid any further modifications in dependent code */ -#define DLT_SERVICE_ID_UNREGISTER_CONTEXT 0xf01 /**< Service ID: Message unregister context */ -#define DLT_SERVICE_ID_CONNECTION_INFO 0xf02 /**< Service ID: Message connection info */ -#define DLT_SERVICE_ID_TIMEZONE 0xf03 /**< Service ID: Timezone */ -#define DLT_SERVICE_ID_MARKER 0xf04 /**< Service ID: Marker */ -#define DLT_SERVICE_ID_CALLSW_CINJECTION 0xFFF /**< Service ID: Message Injection (minimal ID) */ - -/* - * Definitions of DLT service response status - */ -#define DLT_SERVICE_RESPONSE_OK 0x00 /**< Control message response: OK */ -#define DLT_SERVICE_RESPONSE_NOT_SUPPORTED 0x01 /**< Control message response: Not supported */ -#define DLT_SERVICE_RESPONSE_ERROR 0x02 /**< Control message response: Error */ - -/* - * Definitions of DLT service connection state - */ -#define DLT_CONNECTION_STATUS_DISCONNECTED 0x01 /**< Client is disconnected */ -#define DLT_CONNECTION_STATUS_CONNECTED 0x02 /**< Client is connected */ - -/** - \} -*/ - -#endif /* DLT_PROTOCOL_H */ +#define DLT_SERVICE_ID_UNREGISTER_CONTEXT 0xf01 /**< Service ID: Message unregister context */ +#define DLT_SERVICE_ID_CONNECTION_INFO 0xf02 /**< Service ID: Message connection info */ +#define DLT_SERVICE_ID_TIMEZONE 0xf03 /**< Service ID: Timezone */ +#define DLT_SERVICE_ID_MARKER 0xf04 /**< Service ID: Marker */ +#define DLT_SERVICE_ID_CALLSW_CINJECTION 0xFFF /**< Service ID: Message Injection (minimal ID) */ + +/* + * Definitions of DLT service response status + */ +#define DLT_SERVICE_RESPONSE_OK 0x00 /**< Control message response: OK */ +#define DLT_SERVICE_RESPONSE_NOT_SUPPORTED 0x01 /**< Control message response: Not supported */ +#define DLT_SERVICE_RESPONSE_ERROR 0x02 /**< Control message response: Error */ + +/* + * Definitions of DLT service connection state + */ +#define DLT_CONNECTION_STATUS_DISCONNECTED 0x01 /**< Client is disconnected */ +#define DLT_CONNECTION_STATUS_CONNECTED 0x02 /**< Client is connected */ + +/** + \} +*/ + +#endif /* DLT_PROTOCOL_H */ diff --git a/include/dlt/dlt_types.h b/include/dlt/dlt_types.h index fd67fbc..b66e518 100755 --- a/include/dlt/dlt_types.h +++ b/include/dlt/dlt_types.h @@ -1,30 +1,30 @@ -/** - * @licence app begin@ - * Copyright (C) 2012 BMW AG - * - * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. - * - * Contributions are licensed to the GENIVI Alliance under one or more - * Contribution License Agreements. - * - * \copyright - * This Source Code Form is subject to the terms of the - * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with - * this file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * - * \author Alexander Wenzel BMW 2011-2012 - * - * \file dlt_types.h - * For further information see http://www.genivi.org/. - * @licence end@ - */ - - -/******************************************************************************* -** ** -** SRC-MODULE: dlt_types.h ** -** ** +/** + * @licence app begin@ + * Copyright (C) 2012 BMW AG + * + * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps. + * + * Contributions are licensed to the GENIVI Alliance under one or more + * Contribution License Agreements. + * + * \copyright + * This Source Code Form is subject to the terms of the + * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with + * this file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * + * \author Alexander Wenzel BMW 2011-2012 + * + * \file dlt_types.h + * For further information see http://www.genivi.org/. + * @licence end@ + */ + + +/******************************************************************************* +** ** +** SRC-MODULE: dlt_types.h ** +** ** ** TARGET : linux ** ** ** ** PROJECT : DLT ** @@ -55,19 +55,19 @@ #ifndef DLT_TYPES_H #define DLT_TYPES_H -#ifdef _MSC_VER - typedef __int64 int64_t; - typedef __int32 int32_t; - typedef __int16 int16_t; - typedef __int8 int8_t; - - typedef unsigned __int64 uint64_t; - typedef unsigned __int32 uint32_t; - typedef unsigned __int16 uint16_t; - typedef unsigned __int8 uint8_t; - - typedef int pid_t; - typedef unsigned int speed_t; +#ifdef _MSC_VER + typedef __int64 int64_t; + typedef __int32 int32_t; + typedef __int16 int16_t; + typedef __int8 int8_t; + + typedef unsigned __int64 uint64_t; + typedef unsigned __int32 uint32_t; + typedef unsigned __int16 uint16_t; + typedef unsigned __int8 uint8_t; + + typedef int pid_t; + typedef unsigned int speed_t; #define UINT16_MAX 0xFFFF -- cgit v1.2.1