Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Haug2018-06-18 08:25:01 +0000
committerJuergen Haug2018-06-18 08:25:01 +0000
commit842d1ee0c1cb95148ba3815cc66024317e37eb2e (patch)
treee7ee889793d4cf5ec16419fbdc8a73889154361a /runtime
parent29873f1151bb915cf3044f21deca9c756d3f95e0 (diff)
parent3a0767800bb81a9f3f1f84024cfc3fcd5769df3f (diff)
downloadorg.eclipse.etrice-842d1ee0c1cb95148ba3815cc66024317e37eb2e.tar.gz
org.eclipse.etrice-842d1ee0c1cb95148ba3815cc66024317e37eb2e.tar.xz
org.eclipse.etrice-842d1ee0c1cb95148ba3815cc66024317e37eb2e.zip
Merge remote-tracking branch 'gerrit/master' into newfsmgen_finalize
Conflicts: plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateSupport.java plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TransitionSupport.java plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF pom.xml releng/org.eclipse.etrice.parent/pom.xml tests/org.eclipse.etrice.generator.c.tests/.gitignore tests/org.eclipse.etrice.generator.cpp.tests/.gitignore tests/org.eclipse.etrice.generator.java.tests/.gitignore Change-Id: I048e62574a0bca94bf86ed19bba6ed4325a37e81
Diffstat (limited to 'runtime')
-rw-r--r--runtime/org.eclipse.etrice.modellib.java/META-INF/MANIFEST.MF2
-rw-r--r--runtime/org.eclipse.etrice.runtime.c/src/common/container/etStaticDeque.c4
-rw-r--r--runtime/org.eclipse.etrice.runtime.c/src/common/container/etStaticDeque.h40
-rw-r--r--runtime/org.eclipse.etrice.runtime.java.aspects/META-INF/MANIFEST.MF2
-rw-r--r--runtime/org.eclipse.etrice.runtime.java/META-INF/MANIFEST.MF2
5 files changed, 25 insertions, 25 deletions
diff --git a/runtime/org.eclipse.etrice.modellib.java/META-INF/MANIFEST.MF b/runtime/org.eclipse.etrice.modellib.java/META-INF/MANIFEST.MF
index 3a8c00d71..4c281c9e2 100644
--- a/runtime/org.eclipse.etrice.modellib.java/META-INF/MANIFEST.MF
+++ b/runtime/org.eclipse.etrice.modellib.java/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: eTrice Java ModelLib
Bundle-SymbolicName: org.eclipse.etrice.modellib.java
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Bundle-Vendor: Eclipse eTrice
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/runtime/org.eclipse.etrice.runtime.c/src/common/container/etStaticDeque.c b/runtime/org.eclipse.etrice.runtime.c/src/common/container/etStaticDeque.c
index 763185dee..7c08cc716 100644
--- a/runtime/org.eclipse.etrice.runtime.c/src/common/container/etStaticDeque.c
+++ b/runtime/org.eclipse.etrice.runtime.c/src/common/container/etStaticDeque.c
@@ -14,11 +14,11 @@
#include <string.h>
-void etStaticDeque_construct(etStaticDeque* const self, void* memory, int size, int objectSize) {
+void etStaticDeque_construct(etStaticDeque* const self, void* memory, int memorySize, int objectSize) {
self->size = 0;
self->first = 0;
self->memory = memory;
- self->maxSize = size;
+ self->maxSize = memorySize / objectSize;
self->objectSize = objectSize;
etStaticDeque_clear(self);
diff --git a/runtime/org.eclipse.etrice.runtime.c/src/common/container/etStaticDeque.h b/runtime/org.eclipse.etrice.runtime.c/src/common/container/etStaticDeque.h
index 2333bb0dc..4ec186fd9 100644
--- a/runtime/org.eclipse.etrice.runtime.c/src/common/container/etStaticDeque.h
+++ b/runtime/org.eclipse.etrice.runtime.c/src/common/container/etStaticDeque.h
@@ -26,78 +26,78 @@ typedef struct etStaticDeque {
int first; /* index of the first object */
int size; /* current size of the queue */
int maxSize; /* the maximum size of the queue */
- int objectSize; /* the maximum size of the objects contained in this queue */
+ int objectSize; /* the size of the objects contained in this queue in bytes */
} etStaticDeque;
/**
* Constructs the Deque on the given memory with specified size and objectSize.
*
- * \param self the pointer to the StaticDeque
- * \param memory a pointer to the memory for the objects of the StaticDeque
- * \param size the maximum count of objects that fit into the specified memory
- * \param objectSize the size of the objects stored in the StaticDeque
+ * \param self The pointer to the StaticDeque
+ * \param memory A pointer to the memory for the objects of the StaticDeque
+ * \param memorySize The size of the memory in bytes
+ * \param objectSize The size of the objects stored in the StaticDeque in bytes
*/
-void etStaticDeque_construct(etStaticDeque* self, void* memory, int size, int objectSize);
+void etStaticDeque_construct(etStaticDeque* self, void* memory, int memorySize, int objectSize);
/**
* Clears the Deque, removes all objects.
*
- * \param self the pointer to the StaticDeque
+ * \param self The pointer to the StaticDeque
*/
void etStaticDeque_clear(etStaticDeque* self);
/**
* Returns a reference to an arbitrary object at the specified position.
*
- * \param self the pointer to the StaticDeque
- * \param position the position of the object to be returned
- * \return the object at the specified position
+ * \param self The pointer to the StaticDeque
+ * \param position The position of the object to be returned
+ * \return The object at the specified position
*/
void* etStaticDeque_get(const etStaticDeque* self, int position);
/**
* Copies the object and stores it at the front
*
- * \param self the pointer to the StaticDeque
- * \param object the object to push to the front of the queue
+ * \param self The pointer to the StaticDeque
+ * \param object The object to push to the front of the queue
*/
void etStaticDeque_push_front(etStaticDeque* self, void* object);
/**
* Copies the object and stores it at the end
*
- * \param self the pointer to the StaticDeque
- * \param object the object to push to the end of the queue
+ * \param self The pointer to the StaticDeque
+ * \param object The object to push to the end of the queue
*/
void etStaticDeque_push_back(etStaticDeque* self, void* object);
/**
* Removes the first object
*
- * \param self the pointer to the StaticDeque
+ * \param self The pointer to the StaticDeque
*/
void etStaticDeque_pop_front(etStaticDeque* self);
/**
* Removes the last element
*
- * \param self the pointer to the StaticDeque
+ * \param self The pointer to the StaticDeque
*/
void etStaticDeque_pop_back(etStaticDeque* self);
/**
* Returns a reference to the first object
*
- * \param self the pointer to the StaticDeque
- * \return the object at the front of the queue
+ * \param self The pointer to the StaticDeque
+ * \return The object at the front of the queue
*/
void* etStaticDeque_front(const etStaticDeque* self);
/**
* Returns a reference to the last object
*
- * \param self the pointer to the StaticDeque
- * \return the object at the end of the queue
+ * \param self The pointer to the StaticDeque
+ * \return The object at the end of the queue
*/
void* etStaticDeque_back(const etStaticDeque* self);
diff --git a/runtime/org.eclipse.etrice.runtime.java.aspects/META-INF/MANIFEST.MF b/runtime/org.eclipse.etrice.runtime.java.aspects/META-INF/MANIFEST.MF
index 51bd67dc3..8274e7993 100644
--- a/runtime/org.eclipse.etrice.runtime.java.aspects/META-INF/MANIFEST.MF
+++ b/runtime/org.eclipse.etrice.runtime.java.aspects/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: eTrice Java Runtime Aspects
Bundle-SymbolicName: org.eclipse.etrice.runtime.java.aspects
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Export-Package: org.eclipse.etrice.runtime.java.aspects
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/runtime/org.eclipse.etrice.runtime.java/META-INF/MANIFEST.MF b/runtime/org.eclipse.etrice.runtime.java/META-INF/MANIFEST.MF
index 162424d23..dc613744f 100644
--- a/runtime/org.eclipse.etrice.runtime.java/META-INF/MANIFEST.MF
+++ b/runtime/org.eclipse.etrice.runtime.java/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: eTrice Java Runtime
Bundle-SymbolicName: org.eclipse.etrice.runtime.java
-Bundle-Version: 1.1.1.qualifier
+Bundle-Version: 1.1.2.qualifier
Export-Package: org.eclipse.etrice.runtime.java.config,
org.eclipse.etrice.runtime.java.debugging,
org.eclipse.etrice.runtime.java.etunit,

Back to the top