Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2014-10-24 03:45:46 -0400
committerHenrik Rentz-Reichert2014-10-24 03:45:46 -0400
commit9e2151aa9bb4c47ef8f88661b540b23a07d39bda (patch)
treed11044be7012f014aaa53422d6ea94c84b4c85b1 /runtime/org.eclipse.etrice.runtime.c
parent4c29322ab895e249ffa1871bee226ff32d062545 (diff)
downloadorg.eclipse.etrice-9e2151aa9bb4c47ef8f88661b540b23a07d39bda.tar.gz
org.eclipse.etrice-9e2151aa9bb4c47ef8f88661b540b23a07d39bda.tar.xz
org.eclipse.etrice-9e2151aa9bb4c47ef8f88661b540b23a07d39bda.zip
[generator, runtime.c, runtime.cpp] TRUE/FALSE -> ET_TRUE/ET_FALSE
Diffstat (limited to 'runtime/org.eclipse.etrice.runtime.c')
-rw-r--r--runtime/org.eclipse.etrice.runtime.c/src/common/messaging/etMessageService.c4
-rw-r--r--runtime/org.eclipse.etrice.runtime.c/src/common/modelbase/etActor.c2
-rw-r--r--runtime/org.eclipse.etrice.runtime.c/src/common/runtime/etRuntime.c4
-rw-r--r--runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_POSIX_GENERIC_GCC/etSema.c6
-rw-r--r--runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_POSIX_GENERIC_GCC/etTcpSockets.c2
-rw-r--r--runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_POSIX_GENERIC_GCC/etTimer.c16
-rw-r--r--runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_WIN_MinGW/etSema.c2
-rw-r--r--runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_WIN_MinGW/etTcpSockets.c2
-rw-r--r--runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_WIN_MinGW/etTimer.c4
-rw-r--r--runtime/org.eclipse.etrice.runtime.c/src/platforms/ST_CoretexM3_Euros_GCCELF_SK_FM3_176PMC_Ethernet/etTimer.c12
-rw-r--r--runtime/org.eclipse.etrice.runtime.c/src/platforms/ST_MSP430_F5438_CCS5_EXP430F5438/etTimer.c12
-rw-r--r--runtime/org.eclipse.etrice.runtime.c/src/platforms/ST_MSP430_G2553_CCS5_LaunchPad/etTimer.c12
12 files changed, 39 insertions, 39 deletions
diff --git a/runtime/org.eclipse.etrice.runtime.c/src/common/messaging/etMessageService.c b/runtime/org.eclipse.etrice.runtime.c/src/common/messaging/etMessageService.c
index 6108170a7..346e199a1 100644
--- a/runtime/org.eclipse.etrice.runtime.c/src/common/messaging/etMessageService.c
+++ b/runtime/org.eclipse.etrice.runtime.c/src/common/messaging/etMessageService.c
@@ -168,12 +168,12 @@ void etMessageService_returnMessageBuffer(etMessageService* self, etMessage* buf
static void etMessageService_deliverAllMessages(etMessageService* self){
ET_MSC_LOGGER_SYNC_ENTRY("etMessageService", "deliverAllMessages")
{
- etBool cont = TRUE;
+ etBool cont = ET_TRUE;
while (cont){
while (etMessageQueue_isNotEmpty(&self->messageQueue) && cont){
etMessage* msg = etMessageService_popMessage(self);
if (!self->msgDispatcher(msg))
- cont = FALSE;
+ cont = ET_FALSE;
etMessageService_returnMessageBuffer(self, msg);
}
if (cont)
diff --git a/runtime/org.eclipse.etrice.runtime.c/src/common/modelbase/etActor.c b/runtime/org.eclipse.etrice.runtime.c/src/common/modelbase/etActor.c
index dff077dbe..9b15a73ff 100644
--- a/runtime/org.eclipse.etrice.runtime.c/src/common/modelbase/etActor.c
+++ b/runtime/org.eclipse.etrice.runtime.c/src/common/modelbase/etActor.c
@@ -14,5 +14,5 @@
etBool handleSystemEvent(InterfaceItemBase* ifitem, int evt, void* generic_data) {
/* TODO */
- return FALSE;
+ return ET_FALSE;
}
diff --git a/runtime/org.eclipse.etrice.runtime.c/src/common/runtime/etRuntime.c b/runtime/org.eclipse.etrice.runtime.c/src/common/runtime/etRuntime.c
index 31dbd125e..b2c54d9ee 100644
--- a/runtime/org.eclipse.etrice.runtime.c/src/common/runtime/etRuntime.c
+++ b/runtime/org.eclipse.etrice.runtime.c/src/common/runtime/etRuntime.c
@@ -17,10 +17,10 @@
static etSema terminateSemaphore;
etSema* etRuntime_getTerminateSemaphore() {
- static etBool initialized = FALSE;
+ static etBool initialized = ET_FALSE;
if (!initialized) {
- initialized = TRUE;
+ initialized = ET_TRUE;
etSema_construct(&terminateSemaphore);
}
diff --git a/runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_POSIX_GENERIC_GCC/etSema.c b/runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_POSIX_GENERIC_GCC/etSema.c
index 0f735f77f..8eb5660f2 100644
--- a/runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_POSIX_GENERIC_GCC/etSema.c
+++ b/runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_POSIX_GENERIC_GCC/etSema.c
@@ -60,17 +60,17 @@ void etSema_wakeup(etSema* self){
void etSema_waitForWakeup(etSema* self){
ET_MSC_LOGGER_SYNC_ENTRY("etSema", "waitForWakeup")
{
- int again = FALSE;
+ int again = ET_FALSE;
#ifdef DEBUG_SEMA
printf("etSema_waitForWakeup: %p wait %ld\n", (void*)self, pthread_self()); fflush(stdout);
#endif
do {
errno = 0;
- again = FALSE;
+ again = ET_FALSE;
if (sem_wait(&(self->osData))==-1) {
if (errno==EINTR) {
- again = TRUE;
+ again = ET_TRUE;
#ifdef DEBUG_SEMA
printf("etSema_waitForWakeup: %p interrupted - again %ld (val=%d)\n", (void*)self, pthread_self(), sval); fflush(stdout);
#endif
diff --git a/runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_POSIX_GENERIC_GCC/etTcpSockets.c b/runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_POSIX_GENERIC_GCC/etTcpSockets.c
index a2ec51053..d68aa84f3 100644
--- a/runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_POSIX_GENERIC_GCC/etTcpSockets.c
+++ b/runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_POSIX_GENERIC_GCC/etTcpSockets.c
@@ -63,7 +63,7 @@ static void readThreadFunc(void* threadData) {
int len, retval;
int8* buffer = (self->data.bufferProvider)(self->data.userData, &len);
- while (TRUE) {
+ while (ET_TRUE) {
retval = recv(self->socket, buffer, len, 0);
if (retval<=0) {
/* TODO: call WSAGetLastError and do error handling */
diff --git a/runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_POSIX_GENERIC_GCC/etTimer.c b/runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_POSIX_GENERIC_GCC/etTimer.c
index 094d252c2..0907f7fa4 100644
--- a/runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_POSIX_GENERIC_GCC/etTimer.c
+++ b/runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_POSIX_GENERIC_GCC/etTimer.c
@@ -46,7 +46,7 @@
static etTimer* timers = NULL;
/* control initialization */
-static etBool timer_initialized = FALSE;
+static etBool timer_initialized = ET_FALSE;
/* thread calling the timer functions */
#define TIMER_THREAD_STACK_SIZE 1024
@@ -61,10 +61,10 @@ static etSema timer_sema;
static etMutex timer_mutex;
static void timerThreadFunction(void* data) {
- while (TRUE) {
+ while (ET_TRUE) {
etTimer* it;
int idx;
- int signaled = FALSE;
+ int signaled = ET_FALSE;
#ifdef DEBUG_TIMER
printf("timerThreadFunction: waiting\n"); fflush(stdout);
@@ -81,9 +81,9 @@ static void timerThreadFunction(void* data) {
#ifdef DEBUG_TIMER
printf("timerThreadFunction: signaled %d, calling user fct %p\n", idx, (void*)it->timerFunction); fflush(stdout);
#endif
- it->osTimerData.signaled = FALSE;
+ it->osTimerData.signaled = ET_FALSE;
it->timerFunction(it->timerFunctionData);
- signaled = TRUE;
+ signaled = ET_TRUE;
}
}
etMutex_leave(&timer_mutex);
@@ -99,7 +99,7 @@ static void timerHandler(int sig, siginfo_t *si, void *uc) {
int sval = 0;
etMutex_enter(&timer_mutex);
- timer->osTimerData.signaled = TRUE;
+ timer->osTimerData.signaled = ET_TRUE;
etMutex_leave(&timer_mutex);
sem_getvalue(&(timer_sema.osData), &sval);
@@ -116,7 +116,7 @@ void etTimer_construct(etTimer* self, etTime* timerInterval, etTimerFunction tim
self->timerInterval.nSec = timerInterval->nSec;
self->timerFunction = timerFunction;
self->timerFunctionData = timerFunctionData;
- self->osTimerData.signaled = FALSE;
+ self->osTimerData.signaled = ET_FALSE;
if (!timer_initialized) {
/*
@@ -125,7 +125,7 @@ void etTimer_construct(etTimer* self, etTime* timerInterval, etTimerFunction tim
*/
struct sigaction sa;
- timer_initialized = TRUE;
+ timer_initialized = ET_TRUE;
/* initialize our mutex and semaphore */
etMutex_construct(&timer_mutex);
diff --git a/runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_WIN_MinGW/etSema.c b/runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_WIN_MinGW/etSema.c
index 0f537a9fd..5d779ec26 100644
--- a/runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_WIN_MinGW/etSema.c
+++ b/runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_WIN_MinGW/etSema.c
@@ -24,7 +24,7 @@
void etSema_construct(etSema* self){
ET_MSC_LOGGER_SYNC_ENTRY("etSema", "construct")
- self->osData = CreateEvent( NULL, FALSE, FALSE, NULL );
+ self->osData = CreateEvent( NULL, ET_FALSE, ET_FALSE, NULL );
ET_MSC_LOGGER_SYNC_EXIT
}
void etSema_destruct(etSema* self){
diff --git a/runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_WIN_MinGW/etTcpSockets.c b/runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_WIN_MinGW/etTcpSockets.c
index 656ee099e..79a2ec85e 100644
--- a/runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_WIN_MinGW/etTcpSockets.c
+++ b/runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_WIN_MinGW/etTcpSockets.c
@@ -53,7 +53,7 @@ static void readThreadFunc(void* threadData) {
int len, retval;
int8* buffer = (self->data.bufferProvider)(self->data.userData, &len);
- while (TRUE) {
+ while (ET_TRUE) {
retval = recv(self->socket, buffer, len, 0);
if (retval<=0) {
/* TODO: call WSAGetLastError and do error handling
diff --git a/runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_WIN_MinGW/etTimer.c b/runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_WIN_MinGW/etTimer.c
index 8d2adc797..68fcec378 100644
--- a/runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_WIN_MinGW/etTimer.c
+++ b/runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_WIN_MinGW/etTimer.c
@@ -57,7 +57,7 @@ void etTimer_start(etTimer* self){
etLogger_logError("etTimer_start: no Timer Queue to create timer (NULL)");
}
else {
- if (CreateTimerQueueTimer( &(self->osTimerData), hTimerQueue, etTimer_callback, self, 0, elapse, 0) == FALSE){
+ if (CreateTimerQueueTimer( &(self->osTimerData), hTimerQueue, etTimer_callback, self, 0, elapse, 0) == ET_FALSE){
etLogger_logError("etTimer_start: Timer could not be created");
}
}
@@ -67,7 +67,7 @@ void etTimer_start(etTimer* self){
void etTimer_stop(etTimer* self){
ET_MSC_LOGGER_SYNC_ENTRY("etTimer", "stop")
- if (DeleteTimerQueueTimer(hTimerQueue, self->osTimerData, NULL) == FALSE){
+ if (DeleteTimerQueueTimer(hTimerQueue, self->osTimerData, NULL) == ET_FALSE){
etLogger_logError("etTimer_stop: Timer could not be stopped");
}
ET_MSC_LOGGER_SYNC_EXIT
diff --git a/runtime/org.eclipse.etrice.runtime.c/src/platforms/ST_CoretexM3_Euros_GCCELF_SK_FM3_176PMC_Ethernet/etTimer.c b/runtime/org.eclipse.etrice.runtime.c/src/platforms/ST_CoretexM3_Euros_GCCELF_SK_FM3_176PMC_Ethernet/etTimer.c
index d3fd107ab..2cb384ee7 100644
--- a/runtime/org.eclipse.etrice.runtime.c/src/platforms/ST_CoretexM3_Euros_GCCELF_SK_FM3_176PMC_Ethernet/etTimer.c
+++ b/runtime/org.eclipse.etrice.runtime.c/src/platforms/ST_CoretexM3_Euros_GCCELF_SK_FM3_176PMC_Ethernet/etTimer.c
@@ -5,7 +5,7 @@
static etTargetTime_t targetTime;
static etTargetTime_t lastTargetTime;
-static volatile etBool etTimer_executeFlag = FALSE;
+static volatile etBool etTimer_executeFlag = ET_FALSE;
void etTimer_init(void){
targetTime.nSec=0;
@@ -15,12 +15,12 @@ void etTimer_init(void){
}
etBool etTimer_executeNeeded(void){
- if (etTimer_executeFlag == TRUE){
- etTimer_executeFlag = FALSE;
- return TRUE;
+ if (etTimer_executeFlag == ET_TRUE){
+ etTimer_executeFlag = ET_FALSE;
+ return ET_TRUE;
}
else {
- return FALSE;
+ return ET_FALSE;
}
}
@@ -51,7 +51,7 @@ void wdt_isr(void) {
// this interrupt will be called every 15,625ms
static unsigned char secCounter = 0;
- etTimer_executeFlag = TRUE;
+ etTimer_executeFlag = ET_TRUE;
targetTime.nSec += 15625000L;
diff --git a/runtime/org.eclipse.etrice.runtime.c/src/platforms/ST_MSP430_F5438_CCS5_EXP430F5438/etTimer.c b/runtime/org.eclipse.etrice.runtime.c/src/platforms/ST_MSP430_F5438_CCS5_EXP430F5438/etTimer.c
index 60e983c46..03a797e5a 100644
--- a/runtime/org.eclipse.etrice.runtime.c/src/platforms/ST_MSP430_F5438_CCS5_EXP430F5438/etTimer.c
+++ b/runtime/org.eclipse.etrice.runtime.c/src/platforms/ST_MSP430_F5438_CCS5_EXP430F5438/etTimer.c
@@ -6,7 +6,7 @@
static etTargetTime_t targetTime;
static etTargetTime_t lastTargetTime;
-static volatile etBool etTimer_executeFlag = FALSE;
+static volatile etBool etTimer_executeFlag = ET_FALSE;
void etTimer_init(void){
targetTime.nSec=0;
@@ -16,12 +16,12 @@ void etTimer_init(void){
}
etBool etTimer_executeNeeded(void){
- if (etTimer_executeFlag == TRUE){
- etTimer_executeFlag = FALSE;
- return TRUE;
+ if (etTimer_executeFlag == ET_TRUE){
+ etTimer_executeFlag = ET_FALSE;
+ return ET_TRUE;
}
else {
- return FALSE;
+ return ET_FALSE;
}
}
@@ -93,7 +93,7 @@ void wdt_isr(void) {
// this interrupt will be called every 15,625ms
static unsigned char secCounter = 0;
- etTimer_executeFlag = TRUE;
+ etTimer_executeFlag = ET_TRUE;
targetTime.nSec += 15625000L;
diff --git a/runtime/org.eclipse.etrice.runtime.c/src/platforms/ST_MSP430_G2553_CCS5_LaunchPad/etTimer.c b/runtime/org.eclipse.etrice.runtime.c/src/platforms/ST_MSP430_G2553_CCS5_LaunchPad/etTimer.c
index d3fd107ab..2cb384ee7 100644
--- a/runtime/org.eclipse.etrice.runtime.c/src/platforms/ST_MSP430_G2553_CCS5_LaunchPad/etTimer.c
+++ b/runtime/org.eclipse.etrice.runtime.c/src/platforms/ST_MSP430_G2553_CCS5_LaunchPad/etTimer.c
@@ -5,7 +5,7 @@
static etTargetTime_t targetTime;
static etTargetTime_t lastTargetTime;
-static volatile etBool etTimer_executeFlag = FALSE;
+static volatile etBool etTimer_executeFlag = ET_FALSE;
void etTimer_init(void){
targetTime.nSec=0;
@@ -15,12 +15,12 @@ void etTimer_init(void){
}
etBool etTimer_executeNeeded(void){
- if (etTimer_executeFlag == TRUE){
- etTimer_executeFlag = FALSE;
- return TRUE;
+ if (etTimer_executeFlag == ET_TRUE){
+ etTimer_executeFlag = ET_FALSE;
+ return ET_TRUE;
}
else {
- return FALSE;
+ return ET_FALSE;
}
}
@@ -51,7 +51,7 @@ void wdt_isr(void) {
// this interrupt will be called every 15,625ms
static unsigned char secCounter = 0;
- etTimer_executeFlag = TRUE;
+ etTimer_executeFlag = ET_TRUE;
targetTime.nSec += 15625000L;

Back to the top