From f23f9c3ecf40636f176107f6098c308f72fdbd5d Mon Sep 17 00:00:00 2001 From: christian mueller Date: Tue, 6 Mar 2012 20:11:13 +0100 Subject: * removed all documentation to new place * removed GENIVI copyright from headers * [GDLT-41] changed DLT dependency to 2.5.0 --- include/audiomanagertypes.h | 103 ++++++++++++++++++------------------ include/command/IAmCommandReceive.h | 11 ++-- include/command/IAmCommandSend.h | 11 ++-- include/control/IAmControlReceive.h | 11 ++-- include/control/IAmControlSend.h | 11 ++-- include/projecttypes.h | 2 +- include/routing/IAmRoutingReceive.h | 11 ++-- include/routing/IAmRoutingSend.h | 11 ++-- include/shared/CAmDbusWrapper.h | 4 +- include/shared/CAmDltWrapper.h | 91 +++++++++++++++---------------- include/shared/CAmSerializer.h | 4 +- include/shared/CAmSocketHandler.h | 4 +- 12 files changed, 132 insertions(+), 142 deletions(-) (limited to 'include') diff --git a/include/audiomanagertypes.h b/include/audiomanagertypes.h index c4a5954..a38e7e7 100644 --- a/include/audiomanagertypes.h +++ b/include/audiomanagertypes.h @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. @@ -15,13 +14,13 @@ * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 * - * \file CAmCommandReceiver.h + * \file * For further information see http://www.genivi.org/. * * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN */ -#if !defined(EA_F324BBAC_CA26_4b9b_8BE7_166AB6A61889__INCLUDED_) -#define EA_F324BBAC_CA26_4b9b_8BE7_166AB6A61889__INCLUDED_ +#if !defined(EA_FACD3063_1102_4d56_A616_6F63FAC9A011__INCLUDED_) +#define EA_FACD3063_1102_4d56_A616_6F63FAC9A011__INCLUDED_ #include #include "projecttypes.h" @@ -34,63 +33,63 @@ namespace am { /** * a domain ID * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ typedef uint16_t am_domainID_t; /** * a source ID * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ typedef uint16_t am_sourceID_t; /** * a sink ID * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ typedef uint16_t am_sinkID_t; /** * a gateway ID * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ typedef uint16_t am_gatewayID_t; /** * a crossfader ID * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ typedef uint16_t am_crossfaderID_t; /** * a connection ID * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ typedef uint16_t am_connectionID_t; /** * a mainConnection ID * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ typedef uint16_t am_mainConnectionID_t; /** * speed * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ typedef uint16_t am_speed_t; /** * The unit is 0.1 db steps,The smallest value -3000 (=AM_MUTE). The minimum and maximum can be limited by actual project. * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ typedef int16_t am_volume_t; @@ -98,40 +97,40 @@ namespace am { * This is the volume presented on the command interface. It is in the duty of the Controller to change the volumes given here into meaningful values on the routing interface. * The range of this type is customer specific. * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ typedef int16_t am_mainVolume_t; /** * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ typedef uint16_t am_sourceClass_t; /** * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ typedef uint16_t am_sinkClass_t; /** * time in ms! * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ typedef uint16_t am_time_t; /** * offset time that is introduced in milli seconds. * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ typedef int16_t am_timeSync_t; /** * with the help of this enum, sinks and sources can report their availability state * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ enum am_Availablility_e { @@ -153,7 +152,7 @@ namespace am { /** * represents the connection state * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ enum am_ConnectionState_e { @@ -183,7 +182,7 @@ namespace am { /** * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ enum am_DomainState_e { @@ -209,7 +208,7 @@ namespace am { /** * This enum characterizes the data of the EarlyData_t * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ enum am_EarlyDataType_e { @@ -239,7 +238,7 @@ namespace am { /** * the errors of the audiomanager. All possible errors are in here. This enum is used widely as return parameter. * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ enum am_Error_e { @@ -292,7 +291,7 @@ namespace am { /** * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ enum am_MuteState_e { @@ -314,7 +313,7 @@ namespace am { /** * The source state reflects the state of the source * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ enum am_SourceState_e { @@ -337,7 +336,7 @@ namespace am { /** * This enumeration is used to define the type of the action that is correlated to a handle. * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ enum am_Handle_e { @@ -357,7 +356,7 @@ namespace am { /** * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ enum am_InterruptState_e { @@ -379,7 +378,7 @@ namespace am { /** * describes the active sink of a crossfader. * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ enum am_HotSink_e { @@ -405,7 +404,7 @@ namespace am { /** * this describes the availability of a sink or a source together with the latest change * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ struct am_Availability_s { @@ -425,7 +424,7 @@ namespace am { /** * describes class properties * @author Christian Mueller - * @created 06-Mar-2012 9:46:44 AM + * @created 06-Mar-2012 8:01:03 PM */ struct am_ClassProperty_s { @@ -445,7 +444,7 @@ namespace am { /** * This struct describes the attribiutes of a crossfader. * @author Christian Mueller - * @created 06-Mar-2012 9:46:45 AM + * @created 06-Mar-2012 8:01:04 PM */ struct am_Crossfader_s { @@ -485,7 +484,7 @@ namespace am { /** * This struct describes the attributes of a gateway. * @author Christian Mueller - * @created 06-Mar-2012 9:46:45 AM + * @created 06-Mar-2012 8:01:04 PM */ struct am_Gateway_s { @@ -552,7 +551,7 @@ namespace am { /** * This represents one "hopp" in a route * @author Christian Mueller - * @created 06-Mar-2012 9:46:45 AM + * @created 06-Mar-2012 8:01:04 PM */ struct am_RoutingElement_s { @@ -580,7 +579,7 @@ namespace am { /** * a list of routing elements that lead from source to sink * @author Christian Mueller - * @created 06-Mar-2012 9:46:45 AM + * @created 06-Mar-2012 8:01:04 PM */ struct am_Route_s { @@ -604,7 +603,7 @@ namespace am { /** * struct describing the sound property * @author Christian Mueller - * @created 06-Mar-2012 9:46:45 AM + * @created 06-Mar-2012 8:01:04 PM */ struct am_SoundProperty_s { @@ -624,7 +623,7 @@ namespace am { /** * struct describing system properties * @author Christian Mueller - * @created 06-Mar-2012 9:46:45 AM + * @created 06-Mar-2012 8:01:04 PM */ struct am_SystemProperty_s { @@ -644,7 +643,7 @@ namespace am { /** * struct describing sinkclasses * @author Christian Mueller - * @created 06-Mar-2012 9:46:45 AM + * @created 06-Mar-2012 8:01:04 PM */ struct am_SinkClass_s { @@ -668,7 +667,7 @@ namespace am { /** * struct describing source classes * @author Christian Mueller - * @created 06-Mar-2012 9:46:46 AM + * @created 06-Mar-2012 8:01:04 PM */ struct am_SourceClass_s { @@ -692,7 +691,7 @@ namespace am { /** * this type holds all information of sources relevant to the HMI * @author Christian Mueller - * @created 06-Mar-2012 9:46:46 AM + * @created 06-Mar-2012 8:01:05 PM */ struct am_SourceType_s { @@ -720,7 +719,7 @@ namespace am { /** * this type holds all information of sinks relevant to the HMI * @author Christian Mueller - * @created 06-Mar-2012 9:46:46 AM + * @created 06-Mar-2012 8:01:05 PM */ struct am_SinkType_s { @@ -756,7 +755,7 @@ namespace am { /** * a handle is used for asynchronous operations and is uniquely assigned for each of this operations * @author Christian Mueller - * @created 06-Mar-2012 9:46:46 AM + * @created 06-Mar-2012 8:01:05 PM */ struct am_Handle_s { @@ -776,7 +775,7 @@ namespace am { /** * struct describung mainsound property * @author Christian Mueller - * @created 06-Mar-2012 9:46:46 AM + * @created 06-Mar-2012 8:01:05 PM */ struct am_MainSoundProperty_s { @@ -796,7 +795,7 @@ namespace am { /** * this type holds all information of connections relevant to the HMI * @author Christian Mueller - * @created 06-Mar-2012 9:46:46 AM + * @created 06-Mar-2012 8:01:05 PM */ struct am_MainConnectionType_s { @@ -828,7 +827,7 @@ namespace am { /** * struct that holds attribiutes of a mainconnection * @author Christian Mueller - * @created 06-Mar-2012 9:46:46 AM + * @created 06-Mar-2012 8:01:05 PM */ struct am_MainConnection_s { @@ -864,7 +863,7 @@ namespace am { /** * This struct describes the attribiutes of a sink * @author Christian Mueller - * @created 06-Mar-2012 9:46:46 AM + * @created 06-Mar-2012 8:01:05 PM */ struct am_Sink_s { @@ -927,7 +926,7 @@ namespace am { /** * This struct describes the attribiutes of a source * @author Christian Mueller - * @created 06-Mar-2012 9:46:47 AM + * @created 06-Mar-2012 8:01:06 PM */ struct am_Source_s { @@ -997,7 +996,7 @@ namespace am { /** * This struct describes the attribiutes of a domain * @author Christian Mueller - * @created 06-Mar-2012 9:46:47 AM + * @created 06-Mar-2012 8:01:06 PM */ struct am_Domain_s { @@ -1037,7 +1036,7 @@ namespace am { /** * a connection * @author Christian Mueller - * @created 06-Mar-2012 9:46:47 AM + * @created 06-Mar-2012 8:01:06 PM */ struct am_Connection_s { @@ -1071,7 +1070,7 @@ namespace am { * volume_t in case of ED_SOURCE_VOLUME, ED_SINK_VOLUME * soundProperty_t in case of ED_SOURCE_PROPERTY, ED_SINK_PROPERTY * @author Christian Mueller - * @created 06-Mar-2012 9:46:47 AM + * @created 06-Mar-2012 8:01:06 PM */ union am_EarlyData_u { @@ -1087,7 +1086,7 @@ namespace am { * sourceID in case of ED_SOURCE_VOLUME, ED_SOURCE_PROPERTY * sinkID in case of ED_SINK_VOLUME, ED_SINK_PROPERTY * @author Christian Mueller - * @created 06-Mar-2012 9:46:47 AM + * @created 06-Mar-2012 8:01:06 PM */ union am_DataType_u { @@ -1100,7 +1099,7 @@ namespace am { /** * @author Christian Mueller - * @created 06-Mar-2012 9:46:47 AM + * @created 06-Mar-2012 8:01:06 PM */ struct am_EarlyData_s { @@ -1112,4 +1111,4 @@ namespace am { }; } -#endif // !defined(EA_F324BBAC_CA26_4b9b_8BE7_166AB6A61889__INCLUDED_) +#endif // !defined(EA_FACD3063_1102_4d56_A616_6F63FAC9A011__INCLUDED_) diff --git a/include/command/IAmCommandReceive.h b/include/command/IAmCommandReceive.h index 0847aaa..fe32aba 100644 --- a/include/command/IAmCommandReceive.h +++ b/include/command/IAmCommandReceive.h @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. @@ -15,13 +14,13 @@ * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 * - * \file CAmCommandReceiver.h + * \file * For further information see http://www.genivi.org/. * * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN */ -#if !defined(EA_399CFD88_31F4_4806_9747_4F98FB938FFD__INCLUDED_) -#define EA_399CFD88_31F4_4806_9747_4F98FB938FFD__INCLUDED_ +#if !defined(EA_DA0CD257_9FA2_49b6_AE6D_548273E438E1__INCLUDED_) +#define EA_DA0CD257_9FA2_49b6_AE6D_548273E438E1__INCLUDED_ #include #include @@ -44,7 +43,7 @@ namespace am { * Violation these rules may lead to unexpected behavior! Nevertheless you can implement thread safe by using the deferred-call pattern described on the wiki which also helps to implement calls that are forbidden.\n * For more information, please check CAmSerializer * @author Christian Mueller - * @created 06-Mar-2012 9:46:48 AM + * @created 06-Mar-2012 8:01:07 PM */ class IAmCommandReceive { @@ -222,4 +221,4 @@ namespace am { }; } -#endif // !defined(EA_399CFD88_31F4_4806_9747_4F98FB938FFD__INCLUDED_) +#endif // !defined(EA_DA0CD257_9FA2_49b6_AE6D_548273E438E1__INCLUDED_) diff --git a/include/command/IAmCommandSend.h b/include/command/IAmCommandSend.h index 7832f61..93e195a 100644 --- a/include/command/IAmCommandSend.h +++ b/include/command/IAmCommandSend.h @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. @@ -15,13 +14,13 @@ * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 * - * \file CAmCommandReceiver.h + * \file * For further information see http://www.genivi.org/. * * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN */ -#if !defined(EA_0E8D4103_1F90_467a_8935_61E9B1448750__INCLUDED_) -#define EA_0E8D4103_1F90_467a_8935_61E9B1448750__INCLUDED_ +#if !defined(EA_7D83FF38_8EFF_42da_9D53_B196FE091604__INCLUDED_) +#define EA_7D83FF38_8EFF_42da_9D53_B196FE091604__INCLUDED_ #include #include @@ -45,7 +44,7 @@ namespace am { * Violation these rules may lead to unexpected behavior! Nevertheless you can implement thread safe by using the deferred-call pattern described on the wiki which also helps to implement calls that are forbidden.\n * For more information, please check CAmSerializer * @author Christian Mueller - * @created 06-Mar-2012 9:46:48 AM + * @created 06-Mar-2012 8:01:07 PM */ class IAmCommandSend { @@ -196,4 +195,4 @@ namespace am { }; } -#endif // !defined(EA_0E8D4103_1F90_467a_8935_61E9B1448750__INCLUDED_) +#endif // !defined(EA_7D83FF38_8EFF_42da_9D53_B196FE091604__INCLUDED_) diff --git a/include/control/IAmControlReceive.h b/include/control/IAmControlReceive.h index 630aeaa..fe899ba 100644 --- a/include/control/IAmControlReceive.h +++ b/include/control/IAmControlReceive.h @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. @@ -15,13 +14,13 @@ * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 * - * \file CAmCommandReceiver.h + * \file * For further information see http://www.genivi.org/. * * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN */ -#if !defined(EA_BB73C4DE_B91D_420d_B810_5DB4F937D21E__INCLUDED_) -#define EA_BB73C4DE_B91D_420d_B810_5DB4F937D21E__INCLUDED_ +#if !defined(EA_FC4DEA6F_95C3_409f_83CE_63BF9A997339__INCLUDED_) +#define EA_FC4DEA6F_95C3_409f_83CE_63BF9A997339__INCLUDED_ #include #include @@ -43,7 +42,7 @@ namespace am { * Violation these rules may lead to unexpected behavior! Nevertheless you can implement thread safe by using the deferred-call pattern described on the wiki which also helps to implement calls that are forbidden.\n * For more information, please check CAmSerializer * @author Christian Mueller - * @created 06-Mar-2012 9:46:48 AM + * @created 06-Mar-2012 8:01:07 PM */ class IAmControlReceive { @@ -616,4 +615,4 @@ namespace am { }; } -#endif // !defined(EA_BB73C4DE_B91D_420d_B810_5DB4F937D21E__INCLUDED_) +#endif // !defined(EA_FC4DEA6F_95C3_409f_83CE_63BF9A997339__INCLUDED_) diff --git a/include/control/IAmControlSend.h b/include/control/IAmControlSend.h index 11c3fdb..7f1cddc 100644 --- a/include/control/IAmControlSend.h +++ b/include/control/IAmControlSend.h @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. @@ -15,13 +14,13 @@ * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 * - * \file CAmCommandReceiver.h + * \file * For further information see http://www.genivi.org/. * * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN */ -#if !defined(EA_2C445078_D868_40cc_8990_F7D396812DB7__INCLUDED_) -#define EA_2C445078_D868_40cc_8990_F7D396812DB7__INCLUDED_ +#if !defined(EA_FB5AF069_7968_42a2_AB14_7C86BD1888E0__INCLUDED_) +#define EA_FB5AF069_7968_42a2_AB14_7C86BD1888E0__INCLUDED_ #include #include @@ -46,7 +45,7 @@ namespace am { * Violation these rules may lead to unexpected behavior! Nevertheless you can implement thread safe by using the deferred-call pattern described on the wiki which also helps to implement calls that are forbidden.\n * For more information, please check CAmSerializer * @author Christian Mueller - * @created 06-Mar-2012 9:46:49 AM + * @created 06-Mar-2012 8:01:08 PM */ class IAmControlSend { @@ -392,4 +391,4 @@ namespace am { }; } -#endif // !defined(EA_2C445078_D868_40cc_8990_F7D396812DB7__INCLUDED_) +#endif // !defined(EA_FB5AF069_7968_42a2_AB14_7C86BD1888E0__INCLUDED_) diff --git a/include/projecttypes.h b/include/projecttypes.h index e4b7cb4..3118f46 100644 --- a/include/projecttypes.h +++ b/include/projecttypes.h @@ -1,4 +1,4 @@ -/** Copyright (c) 2012 GENIVI Alliance +/** * Copyright (c) 2012 BMW * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 diff --git a/include/routing/IAmRoutingReceive.h b/include/routing/IAmRoutingReceive.h index 1f6604a..45097ab 100644 --- a/include/routing/IAmRoutingReceive.h +++ b/include/routing/IAmRoutingReceive.h @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. @@ -15,13 +14,13 @@ * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 * - * \file CAmCommandReceiver.h + * \file * For further information see http://www.genivi.org/. * * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN */ -#if !defined(EA_9D3B2457_92C4_44dd_81BF_0F54463031D5__INCLUDED_) -#define EA_9D3B2457_92C4_44dd_81BF_0F54463031D5__INCLUDED_ +#if !defined(EA_F3B2C6E5_FEAE_42a2_AEB2_59B2AE54EE05__INCLUDED_) +#define EA_F3B2C6E5_FEAE_42a2_AEB2_59B2AE54EE05__INCLUDED_ #include #include @@ -45,7 +44,7 @@ namespace am { * Violation these rules may lead to unexpected behavior! Nevertheless you can implement thread safe by using the deferred-call pattern described on the wiki which also helps to implement calls that are forbidden.\n * For more information, please check CAmSerializer * @author Christian Mueller - * @created 06-Mar-2012 9:46:49 AM + * @created 06-Mar-2012 8:01:08 PM */ class IAmRoutingReceive { @@ -350,4 +349,4 @@ namespace am { }; } -#endif // !defined(EA_9D3B2457_92C4_44dd_81BF_0F54463031D5__INCLUDED_) +#endif // !defined(EA_F3B2C6E5_FEAE_42a2_AEB2_59B2AE54EE05__INCLUDED_) diff --git a/include/routing/IAmRoutingSend.h b/include/routing/IAmRoutingSend.h index b08346c..4280931 100644 --- a/include/routing/IAmRoutingSend.h +++ b/include/routing/IAmRoutingSend.h @@ -1,5 +1,4 @@ /** - * Copyright (C) 2012, GENIVI Alliance, Inc. * Copyright (C) 2012, BMW AG * * This file is part of GENIVI Project AudioManager. @@ -15,13 +14,13 @@ * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 * - * \file CAmCommandReceiver.h + * \file * For further information see http://www.genivi.org/. * * THIS CODE HAS BEEN GENERATED BY ENTERPRISE ARCHITECT GENIVI MODEL. PLEASE CHANGE ONLY IN ENTERPRISE ARCHITECT AND GENERATE AGAIN */ -#if !defined(EA_8E1C613C_7F9E_41d0_B333_97EDB669B542__INCLUDED_) -#define EA_8E1C613C_7F9E_41d0_B333_97EDB669B542__INCLUDED_ +#if !defined(EA_39D31D03_9B43_4dfe_B134_B2A969767ECB__INCLUDED_) +#define EA_39D31D03_9B43_4dfe_B134_B2A969767ECB__INCLUDED_ #include #include @@ -45,7 +44,7 @@ namespace am { * Violation these rules may lead to unexpected behavior! Nevertheless you can implement thread safe by using the deferred-call pattern described on the wiki which also helps to implement calls that are forbidden.\n * For more information, please check CAmSerializer * @author Christian Mueller - * @created 06-Mar-2012 9:46:50 AM + * @created 06-Mar-2012 8:01:09 PM */ class IAmRoutingSend { @@ -206,4 +205,4 @@ namespace am { }; } -#endif // !defined(EA_8E1C613C_7F9E_41d0_B333_97EDB669B542__INCLUDED_) +#endif // !defined(EA_39D31D03_9B43_4dfe_B134_B2A969767ECB__INCLUDED_) diff --git a/include/shared/CAmDbusWrapper.h b/include/shared/CAmDbusWrapper.h index c89220f..6efbc9e 100644 --- a/include/shared/CAmDbusWrapper.h +++ b/include/shared/CAmDbusWrapper.h @@ -1,5 +1,5 @@ -/** Copyright (c) 2012 GENIVI Alliance - * Copyright (c) 2012 BMW +/** + * Copyright (C) 2012, BMW AG * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 * diff --git a/include/shared/CAmDltWrapper.h b/include/shared/CAmDltWrapper.h index f3d39cc..19f5257 100644 --- a/include/shared/CAmDltWrapper.h +++ b/include/shared/CAmDltWrapper.h @@ -1,5 +1,5 @@ -/** Copyright (c) 2012 GENIVI Alliance - * Copyright (c) 2012 BMW +/** + * Copyright (C) 2012, BMW AG * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 * @@ -24,63 +24,60 @@ #ifdef WITH_DLT #include +namespace am +{ #else - -#include +#include #include -namespace am +#define DLT_USER_BUF_MAX_SIZE 2048 + +/** + * This structure is used for every context used in an application. + */ +typedef struct { + char contextID[4]; /**< context id */ + int32_t log_level_pos; /**< offset in user-application context field */ +} DltContext; -#define DLT_USER_BUF_MAX_SIZE 2048 +/** + * Definitions of DLT log level + */ +typedef enum +{ + DLT_LOG_DEFAULT = -1, /**< Default log level */ + DLT_LOG_OFF = 0x00, /**< Log level off */ + DLT_LOG_FATAL = 0x01, /**< fatal system error */ + DLT_LOG_ERROR = 0x02, /**< error with impact to correct functionality */ + DLT_LOG_WARN = 0x03, /**< warning, correct behaviour could not be ensured */ + DLT_LOG_INFO = 0x04, /**< informational */ + DLT_LOG_DEBUG = 0x05, /**< debug */ + DLT_LOG_VERBOSE = 0x06 /**< highest grade of information */ +} DltLogLevelType; - /** - * This structure is used for every context used in an application. - */ - typedef struct - { - char contextID[4]; /**< context id */ - int32_t log_level_pos; /**< offset in user-application context field */ - }DltContext; - - /** - * Definitions of DLT log level - */ - typedef enum - { - DLT_LOG_DEFAULT = -1, /**< Default log level */ - DLT_LOG_OFF = 0x00, /**< Log level off */ - DLT_LOG_FATAL = 0x01, /**< fatal system error */ - DLT_LOG_ERROR = 0x02, /**< error with impact to correct functionality */ - DLT_LOG_WARN = 0x03, /**< warning, correct behaviour could not be ensured */ - DLT_LOG_INFO = 0x04, /**< informational */ - DLT_LOG_DEBUG = 0x05, /**< debug */ - DLT_LOG_VERBOSE = 0x06 /**< highest grade of information */ - }DltLogLevelType; - - /** - * This structure is used for context data used in an application. - */ - typedef struct - { - DltContext *handle; /**< pointer to DltContext */ - std::stringstream buffer; /**< buffer for building log message*/ - int32_t log_level; /**< log level */ - int32_t trace_status; /**< trace status */ - int32_t args_num; /**< number of arguments for extended header*/ - uint8_t mcnt; /**< message counter */ - char* context_description; /**< description of context */ - }DltContextData; +/** + * This structure is used for context data used in an application. + */ +typedef struct +{ + DltContext *handle; /**< pointer to DltContext */ + std::stringstream buffer; /**< buffer for building log message*/ + int32_t log_level; /**< log level */ + int32_t trace_status; /**< trace status */ + int32_t args_num; /**< number of arguments for extended header*/ + uint8_t mcnt; /**< message counter */ + char* context_description; /**< description of context */ +} DltContextData; #define DLT_DECLARE_CONTEXT(CONTEXT) \ DltContext CONTEXT; #define DLT_IMPORT_CONTEXT(CONTEXT) \ extern DltContext CONTEXT; - -#endif // WITH_DLT namespace am { +#endif // WITH_DLT /** * Wraps around the dlt. This class is instantiated as a singleton and offers a default @@ -114,8 +111,8 @@ public: private: CAmDltWrapper(const bool enableNoDLTDebug); //is private because of singleton pattern #ifndef WITH_DLT - template void appendNoDLT(T value); - bool mEnableNoDLTDebug; + template void appendNoDLT(T value); + bool mEnableNoDLTDebug; #endif DltContext mDltContext; //!< the default context DltContextData mDltContextData; //!< contextdata diff --git a/include/shared/CAmSerializer.h b/include/shared/CAmSerializer.h index 03935f4..ef6484f 100644 --- a/include/shared/CAmSerializer.h +++ b/include/shared/CAmSerializer.h @@ -1,5 +1,5 @@ -/** Copyright (c) 2012 GENIVI Alliance - * Copyright (c) 2012 BMW +/** + * Copyright (C) 2012, BMW AG * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 * diff --git a/include/shared/CAmSocketHandler.h b/include/shared/CAmSocketHandler.h index 8df6872..ba54b00 100644 --- a/include/shared/CAmSocketHandler.h +++ b/include/shared/CAmSocketHandler.h @@ -1,5 +1,5 @@ -/** Copyright (c) 2012 GENIVI Alliance - * Copyright (c) 2012 BMW +/** + * Copyright (C) 2012, BMW AG * * \author Christian Mueller, christian.ei.mueller@bmw.de BMW 2011,2012 * -- cgit v1.2.1