fix some more #define issues as reported in https://sourceforge.net/p/openv2g/tickets/7/

git-svn-id: https://svn.code.sf.net/p/openv2g/code/trunk@104 d9f2db14-54d0-4bde-b00c-16405c910529
This commit is contained in:
daniel_peintner 2017-09-05 08:38:43 +00:00
parent a4f803bb10
commit 90976ee871
8 changed files with 25369 additions and 24816 deletions

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2007-2015 Siemens AG
* Copyright (C) 2007-2017 Siemens AG
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
@ -18,8 +18,8 @@
/*******************************************************************
*
* @author Daniel.Peintner.EXT@siemens.com
* @version 0.9.3
* @contact Joerg.Heuer@siemens.com
* @version 2017-09-05
* @contact Richard.Kuntschke@siemens.com
*
* <p>Code generated by EXIdizer</p>
* <p>Schema: V2G_CI_MsgDef.xsd</p>
@ -41,9 +41,8 @@
#ifdef __cplusplus
extern "C" {
#endif
#include "dinEXIDatatypes.h"
#include "dinEXIDatatypes.h"
#if DEPLOY_DIN_CODEC == SUPPORT_YES
@ -52,10 +51,10 @@ extern "C" {
#include "EXITypes.h"
int decode_dinExiDocument(bitstream_t* stream, struct dinEXIDocument* exiDoc);
#if DEPLOY_DIN_CODEC_FRAGMENT == SUPPORT_YES
int decode_dinExiFragment(bitstream_t* stream, struct dinEXIFragment* exiFrag);
#endif /* DEPLOY_DIN_CODEC_FRAGMENT */
#endif /* DEPLOY_DIN_CODEC_FRAGMENT */
#endif /* DEPLOY_DIN_CODEC */

File diff suppressed because it is too large Load diff

View file

@ -1,5 +1,5 @@
/*
* Copyright (C) 2007-2015 Siemens AG
* Copyright (C) 2007-2017 Siemens AG
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
@ -18,8 +18,8 @@
/*******************************************************************
*
* @author Daniel.Peintner.EXT@siemens.com
* @version 0.9.3
* @contact Joerg.Heuer@siemens.com
* @version 2017-09-05
* @contact Richard.Kuntschke@siemens.com
*
* <p>Code generated by EXIdizer</p>
* <p>Schema: V2G_CI_MsgDef.xsd</p>
@ -41,8 +41,9 @@
#ifdef __cplusplus
extern "C" {
#endif
#include "dinEXIDatatypes.h"
#include "dinEXIDatatypes.h"
#if DEPLOY_DIN_CODEC == SUPPORT_YES
@ -52,10 +53,10 @@ extern "C" {
int encode_dinExiDocument(bitstream_t* stream, struct dinEXIDocument* exiDoc);
#if DEPLOY_DIN_CODEC_FRAGMENT == SUPPORT_YES
int encode_dinExiFragment(bitstream_t* stream, struct dinEXIFragment* exiFrag);
#endif /* DEPLOY_DIN_CODEC_FRAGMENT */
int encode_dinExiFragment(bitstream_t* stream, struct dinEXIFragment* exiFrag);
#endif /* DEPLOY_DIN_CODEC_FRAGMENT */
#endif /* DEPLOY_DIN_CODEC */

View file

@ -125,7 +125,7 @@ void init_iso1EXIDocument(struct iso1EXIDocument* exiDoc) {
}
#if DEPLOY_ISO2_CODEC_FRAGMENT == SUPPORT_YES
#if DEPLOY_ISO1_CODEC_FRAGMENT == SUPPORT_YES
void init_iso1EXIFragment(struct iso1EXIFragment* exiFrag) {
exiFrag->ChargingComplete_isUsed = 0u;
exiFrag->EVMaxVoltage_isUsed = 0u;
@ -428,7 +428,7 @@ void init_iso1EXIFragment(struct iso1EXIFragment* exiFrag) {
exiFrag->RequestedEnergyTransferMode_isUsed = 0u;
exiFrag->SessionID_isUsed = 0u;
}
#endif /* DEPLOY_ISO2_CODEC_FRAGMENT */
#endif /* DEPLOY_ISO1_CODEC_FRAGMENT */
void init_iso1IntervalType(struct iso1IntervalType* iso1IntervalType) {
(void)iso1IntervalType; /* avoid unused warning */

View file

@ -45,7 +45,7 @@ extern "C" {
#define SUPPORT_YES 1
#define SUPPORT_NO 2
#define DEPLOY_ISO1_CODEC SUPPORT_NO
#define DEPLOY_ISO1_CODEC_FRAGMENT SUPPORT_YES
#define DEPLOY_ISO1_CODEC_FRAGMENT SUPPORT_NO
#if DEPLOY_ISO1_CODEC == SUPPORT_YES
@ -2238,7 +2238,7 @@ struct iso1EXIDocument {
};
#if DEPLOY_ISO2_CODEC_FRAGMENT == SUPPORT_YES
#if DEPLOY_ISO1_CODEC_FRAGMENT == SUPPORT_YES
/* Possible elements of EXI Fragment */
struct iso1EXIFragment {
#if SAVE_MEMORY_WITH_UNNAMED_UNION == UNION_YES
@ -2805,15 +2805,15 @@ struct iso1EXIFragment {
int _warning_;
};
#endif /* DEPLOY_ISO2_CODEC_FRAGMENT */
#endif /* DEPLOY_ISO1_CODEC_FRAGMENT */
/* Initialization methods for structs */
void init_iso1EXIDocument(struct iso1EXIDocument* exiDoc);
#if DEPLOY_ISO2_CODEC_FRAGMENT == SUPPORT_YES
#if DEPLOY_ISO1_CODEC_FRAGMENT == SUPPORT_YES
void init_iso1EXIFragment(struct iso1EXIFragment* exiFrag);
#endif /* DEPLOY_ISO2_CODEC_FRAGMENT */
#endif /* DEPLOY_ISO1_CODEC_FRAGMENT */
void init_iso1IntervalType(struct iso1IntervalType* iso1IntervalType);
void init_iso1SASchedulesType(struct iso1SASchedulesType* iso1SASchedulesType);
void init_iso1PaymentOptionListType(struct iso1PaymentOptionListType* iso1PaymentOptionListType);