diff options
| author | Henrik Rentz-Reichert | 2013-05-08 08:33:11 +0000 |
|---|---|---|
| committer | Henrik Rentz-Reichert | 2013-05-08 08:33:11 +0000 |
| commit | a3f7c5d90bd5a67d8d99a33d1521f309ae17a67e (patch) | |
| tree | c2999d9add0ed780d4adacbf6dfb13ef71fa82a4 | |
| parent | 129108f8287b5657d3e8da2171aea2aed8f84a21 (diff) | |
| download | org.eclipse.etrice-a3f7c5d90bd5a67d8d99a33d1521f309ae17a67e.tar.gz org.eclipse.etrice-a3f7c5d90bd5a67d8d99a33d1521f309ae17a67e.tar.xz org.eclipse.etrice-a3f7c5d90bd5a67d8d99a33d1521f309ae17a67e.zip | |
[modellib.c] some adjustments to changed runtime
| -rw-r--r-- | runtime/org.eclipse.etrice.modellib.c/model/TcpService.room | 2 | ||||
| -rw-r--r-- | runtime/org.eclipse.etrice.modellib.c/model/TimingService.room | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/runtime/org.eclipse.etrice.modellib.c/model/TcpService.room b/runtime/org.eclipse.etrice.modellib.c/model/TcpService.room index 1b42cd9fa..e3e4b34d3 100644 --- a/runtime/org.eclipse.etrice.modellib.c/model/TcpService.room +++ b/runtime/org.eclipse.etrice.modellib.c/model/TcpService.room @@ -10,7 +10,7 @@ RoomModel room.basic.service.tcp { }
Structure {
usercode1 {
- "#include \"platform/etTcpSockets.h\""
+ "#include \"osal/etTcpSockets.h\""
}
usercode3 {
"/* user code 3 */"
diff --git a/runtime/org.eclipse.etrice.modellib.c/model/TimingService.room b/runtime/org.eclipse.etrice.modellib.c/model/TimingService.room index 125d999e5..de4663ce5 100644 --- a/runtime/org.eclipse.etrice.modellib.c/model/TimingService.room +++ b/runtime/org.eclipse.etrice.modellib.c/model/TimingService.room @@ -9,12 +9,12 @@ RoomModel room.basic.service.timing { Structure {
usercode1 {
"
- #include \"platform/etTimer.h\"
+ #include \"osal/etTime.h\"
#define ET_NB_OF_TCBS 30
typedef struct etTCB etTimerControlBlock;
struct etTCB {
- etTargetTime_t expTime;
- etTargetTime_t pTime;
+ etTime expTime;
+ etTime pTime;
int32 portIdx;
etTimerControlBlock* next;
};
@@ -151,7 +151,7 @@ RoomModel room.basic.service.timing { }
action {
"etTimerControlBlock* timer = getTcb();"
- "etTargetTime_t t;"
+ "etTime t;"
"if (timer!= 0){"
"\tt.sec=time/1000;"
"\tt.nSec=(time%1000)*1000000L;"
@@ -170,7 +170,7 @@ RoomModel room.basic.service.timing { }
action {
"etTimerControlBlock* timer = getTcb();"
- "etTargetTime_t t;"
+ "etTime t;"
"if (timer!= 0){"
"\tt.sec=time/1000;"
"\tt.nSec=(time%1000)*1000000L;"
@@ -196,7 +196,7 @@ RoomModel room.basic.service.timing { } do {
"/* maintain timers */"
"etTimerControlBlock* temp;"
- "etTargetTime_t t;"
+ "etTime t;"
""
"getTimeFromTarget(&t);"
"while (usedTcbsRoot !=0 ){"
@@ -280,7 +280,7 @@ RoomModel room.basic.service.timing { }
}
ExternalType tcb -> etTimerControlBlock
- ExternalType targetTime -> etTargetTime_t
+ ExternalType targetTime -> etTime
}
\ No newline at end of file |