Răsfoiți Sursa

git-svn-id: https://svn.code.sf.net/p/openv2g/code/trunk@59 d9f2db14-54d0-4bde-b00c-16405c910529

daniel_peintner 14 ani în urmă
părinte
comite
e0a30233ba
5 a modificat fișierele cu 15 adăugiri și 5 ștergeri
  1. 1 1
      .cproject
  2. 1 1
      .project
  3. 4 2
      src/test/main.c
  4. 8 0
      src/test/main.h
  5. 1 1
      src/test/main_codec.c

+ 1 - 1
.cproject

@@ -594,7 +594,7 @@
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/OpenV2G/src/service}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/OpenV2G/src/test}&quot;"/>
 								</option>
-								<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.option.optimization.level.899621054" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" valueType="enumerated"/>
+								<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.option.optimization.level.899621054" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" value="gnu.c.optimization.level.most" valueType="enumerated"/>
 								<option id="gnu.c.compiler.option.debugging.level.1251127335" name="Debug Level" superClass="gnu.c.compiler.option.debugging.level" value="gnu.c.debugging.level.none" valueType="enumerated"/>
 								<option id="gnu.c.compiler.option.misc.ansi.496561434" name="Support ANSI programs (-ansi)" superClass="gnu.c.compiler.option.misc.ansi" value="true" valueType="boolean"/>
 								<option id="gnu.c.compiler.option.warnings.pedantic.289278524" name="Pedantic (-pedantic)" superClass="gnu.c.compiler.option.warnings.pedantic" value="true" valueType="boolean"/>

+ 1 - 1
.project

@@ -27,7 +27,7 @@
 				</dictionary>
 				<dictionary>
 					<key>org.eclipse.cdt.make.core.buildLocation</key>
-					<value>${workspace_loc:/OpenV2G/Debug}</value>
+					<value>${workspace_loc:/OpenV2G/Release}</value>
 				</dictionary>
 				<dictionary>
 					<key>org.eclipse.cdt.make.core.contents</key>

+ 4 - 2
src/test/main.c

@@ -32,11 +32,13 @@
 #include "main.h"
 
 int main(int argc, char *argv[]) {
+#if CODE_VERSION == CODE_VERSION_EXI
 	/* EXI codec only */
-	/*return main_codec(argc, argv);*/
-
+	return main_codec(argc, argv);
+#elif CODE_VERSION == CODE_VERSION_SERVICE
 	/* V2G client / service example scenario */
 	return main_service(argc, argv);
+#endif
 
 }
 

+ 8 - 0
src/test/main.h

@@ -25,10 +25,18 @@
  *
  ********************************************************************/
 
+
+#define CODE_VERSION_EXI 1
+#define CODE_VERSION_SERVICE 2
+#define CODE_VERSION CODE_VERSION_SERVICE
+
 #ifndef MAIN_H_
 #define MAIN_H_
 
+#if CODE_VERSION == CODE_VERSION_EXI
 int main_codec(int argc, char *argv[]);
+#elif CODE_VERSION == CODE_VERSION_SERVICE
 int main_service(int argc, char *argv[]);
+#endif
 
 #endif

+ 1 - 1
src/test/main_codec.c

@@ -47,7 +47,7 @@
 #if EXI_STREAM == BYTE_ARRAY
 /* 64 kilobytes = 65 536 bytes */
 /* 1 megabyte = 1 048 576 bytes*/
-#define BUFFER_SIZE 200
+#define BUFFER_SIZE 1048576
 uint8_t bufferIn[BUFFER_SIZE];
 uint8_t bufferOut[BUFFER_SIZE];
 #endif /* EXI_STREAM == BYTE_ARRAY */