github-mirrors/OpenV2G
1
0
Fork 0
mirror of https://github.com/Martin-P/OpenV2G.git synced 2024-11-18 12:53:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix issue with #defines pointing to wrong ISO version (ISO2 instead of ISO1)

Browse source 
git-svn-id: https://svn.code.sf.net/p/openv2g/code/trunk@102 d9f2db14-54d0-4bde-b00c-16405c910529
This commit is contained in:
daniel_peintner 2017-09-04 13:12:44 +00:00 committed by Martin-P
parent e152daafc9
commit 7f084bb662
6 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/iso1/iso1EXIDatatypes.c
View file

@ -38,7 +38,7 @@
#ifndef EXI_iso1_DATATYPES_C #ifndef EXI_iso1_DATATYPES_C
#define EXI_iso1_DATATYPES_C #define EXI_iso1_DATATYPES_C
#if DEPLOY_ISO2_CODEC == SUPPORT_YES #if DEPLOY_ISO1_CODEC == SUPPORT_YES
void init_iso1EXIDocument(struct iso1EXIDocument* exiDoc) { void init_iso1EXIDocument(struct iso1EXIDocument* exiDoc) {
@ -982,7 +982,7 @@ void init_iso1PhysicalValueType(struct iso1PhysicalValueType* iso1PhysicalValueT
#endif /* DEPLOY_ISO2_CODEC */ #endif /* DEPLOY_ISO1_CODEC */
#endif #endif

8
src/iso1/iso1EXIDatatypes.h
View file

@ -44,10 +44,10 @@ extern "C" {
#define SUPPORT_YES 1 #define SUPPORT_YES 1
#define SUPPORT_NO 2 #define SUPPORT_NO 2
#define DEPLOY_ISO2_CODEC SUPPORT_NO #define DEPLOY_ISO1_CODEC SUPPORT_NO
#define DEPLOY_ISO2_CODEC_FRAGMENT SUPPORT_YES #define DEPLOY_ISO1_CODEC_FRAGMENT SUPPORT_YES
#if DEPLOY_ISO2_CODEC == SUPPORT_YES #if DEPLOY_ISO1_CODEC == SUPPORT_YES
#include <stdint.h> #include <stdint.h>
@ -2922,7 +2922,7 @@ void init_iso1TransformType(struct iso1TransformType* iso1TransformType);
void init_iso1PhysicalValueType(struct iso1PhysicalValueType* iso1PhysicalValueType); void init_iso1PhysicalValueType(struct iso1PhysicalValueType* iso1PhysicalValueType);
#endif /* DEPLOY_ISO2_CODEC */ #endif /* DEPLOY_ISO1_CODEC */
#ifdef __cplusplus #ifdef __cplusplus
} }

8
src/iso1/iso1EXIDatatypesDecoder.c
View file

@ -41,7 +41,7 @@
#ifndef EXI_iso1_DATATYPES_DECODER_C #ifndef EXI_iso1_DATATYPES_DECODER_C
#define EXI_iso1_DATATYPES_DECODER_C #define EXI_iso1_DATATYPES_DECODER_C
#if DEPLOY_ISO2_CODEC == SUPPORT_YES #if DEPLOY_ISO1_CODEC == SUPPORT_YES
/** event-code */ /** event-code */
static uint32_t eventCode; static uint32_t eventCode;
@ -15684,7 +15684,7 @@ int decode_iso1ExiDocument(bitstream_t* stream, struct iso1EXIDocument* exiDoc)
return errn; return errn;
} }
#if DEPLOY_ISO2_CODEC_FRAGMENT == SUPPORT_YES #if DEPLOY_ISO1_CODEC_FRAGMENT == SUPPORT_YES
int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag) { int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag) {
errn = readEXIHeader(stream); errn = readEXIHeader(stream);
@ -17762,10 +17762,10 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
return errn; return errn;
} }
#endif /* DEPLOY_ISO2_CODEC_FRAGMENT */ #endif /* DEPLOY_ISO1_CODEC_FRAGMENT */
#endif /* DEPLOY_ISO2_CODEC */ #endif /* DEPLOY_ISO1_CODEC */
#endif #endif

8
src/iso1/iso1EXIDatatypesDecoder.h
View file

@ -42,7 +42,7 @@
extern "C" { extern "C" {
#endif #endif
#if DEPLOY_ISO2_CODEC == SUPPORT_YES #if DEPLOY_ISO1_CODEC == SUPPORT_YES
#include <stdint.h> #include <stdint.h>
@ -51,11 +51,11 @@ extern "C" {
int decode_iso1ExiDocument(bitstream_t* stream, struct iso1EXIDocument* exiDoc); int decode_iso1ExiDocument(bitstream_t* stream, struct iso1EXIDocument* exiDoc);
#if DEPLOY_ISO2_CODEC_FRAGMENT == SUPPORT_YES #if DEPLOY_ISO1_CODEC_FRAGMENT == SUPPORT_YES
int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag); int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag);
#endif /* DEPLOY_ISO2_CODEC_FRAGMENT */ #endif /* DEPLOY_ISO1_CODEC_FRAGMENT */
#endif /* DEPLOY_ISO2_CODEC */ #endif /* DEPLOY_ISO1_CODEC */
#ifdef __cplusplus #ifdef __cplusplus
} }

8
src/iso1/iso1EXIDatatypesEncoder.c
View file

@ -41,7 +41,7 @@
#ifndef EXI_iso1_DATATYPES_ENCODER_C #ifndef EXI_iso1_DATATYPES_ENCODER_C
#define EXI_iso1_DATATYPES_ENCODER_C #define EXI_iso1_DATATYPES_ENCODER_C
#if DEPLOY_ISO2_CODEC == SUPPORT_YES #if DEPLOY_ISO1_CODEC == SUPPORT_YES
static int errn; static int errn;
@ -11383,7 +11383,7 @@ int encode_iso1ExiDocument(bitstream_t* stream, struct iso1EXIDocument* exiDoc)
return errn; return errn;
} }
#if DEPLOY_ISO2_CODEC_FRAGMENT == SUPPORT_YES #if DEPLOY_ISO1_CODEC_FRAGMENT == SUPPORT_YES
int encode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag) { int encode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag) {
errn = writeEXIHeader(stream); errn = writeEXIHeader(stream);
@ -13243,10 +13243,10 @@ int encode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
return errn; return errn;
} }
#endif /* DEPLOY_ISO2_CODEC_FRAGMENT */ #endif /* DEPLOY_ISO1_CODEC_FRAGMENT */
#endif /* DEPLOY_ISO2_CODEC */ #endif /* DEPLOY_ISO1_CODEC */
#endif #endif

8
src/iso1/iso1EXIDatatypesEncoder.h
View file

@ -42,7 +42,7 @@
extern "C" { extern "C" {
#endif #endif
#if DEPLOY_ISO2_CODEC == SUPPORT_YES #if DEPLOY_ISO1_CODEC == SUPPORT_YES
#include <stdint.h> #include <stdint.h>
@ -52,12 +52,12 @@ extern "C" {
int encode_iso1ExiDocument(bitstream_t* stream, struct iso1EXIDocument* exiDoc); int encode_iso1ExiDocument(bitstream_t* stream, struct iso1EXIDocument* exiDoc);
#if DEPLOY_ISO2_CODEC_FRAGMENT == SUPPORT_YES #if DEPLOY_ISO1_CODEC_FRAGMENT == SUPPORT_YES
int encode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag); int encode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag);
#endif /* DEPLOY_ISO2_CODEC_FRAGMENT */ #endif /* DEPLOY_ISO1_CODEC_FRAGMENT */
#endif /* DEPLOY_ISO2_CODEC */ #endif /* DEPLOY_ISO1_CODEC */
#ifdef __cplusplus #ifdef __cplusplus
} }