Uploading protected shared objects functionality

[frescor/frsh-include.git] / frsh_fosa_opaque.h

diff --git a/frsh_fosa_opaque.h b/frsh_fosa_opaque.h
index fdc9dd424e0e98197c8126580c46718c5363d210..28ed4cf72db893ab06d67bb3bbff34ca1e5d78a2 100644 (file)
--- a/frsh_fosa_opaque.h
+++ b/frsh_fosa_opaque.h
@@ -104,7 +104,12 @@ typedef struct {
 
 #else  /* !AQuoSA, MARTE_OS, RT_LINUX */
 
+#ifdef MARTE_OS
 typedef pthread_t FOSA_THREAD_ID_T_OPAQUE;
+#else
+//#define FOSA_MUTEX_T_OPAQUE pthread_mutex_t
+#define FOSA_THREAD_ID_T_OPAQUE pthread_t
+#endif
 
 #endif /* AQuoSA */
 
@@ -112,7 +117,6 @@ typedef pthread_attr_t FOSA_THREAD_ATTR_T_OPAQUE;
 
 typedef int FOSA_SIGNAL_T_OPAQUE;
 
-
 typedef pthread_mutex_t FOSA_MUTEX_T_OPAQUE;
 
 // The minimum and maximum signal numbers that may be used by the FRSH
@@ -136,10 +140,15 @@ typedef pthread_mutex_t FOSA_MUTEX_T_OPAQUE;
 #define FOSA_EAGAIN   EAGAIN
 
 /** FOSA ADS errors **/
+#ifdef MARTE_OS
+#define EREJECT   201 /* (for linux_lib_arch) Appsched has rejected object */
+#endif
+
 #define FOSA_EREJECT   EREJECT
 #define FOSA_EMASKED   -2
 #define FOSA_EPOLICY   -3
 
+#define FOSA_ETIMEDOUT ETIMEDOUT
 
 
 #endif /* MARTE_OS || RT_LINUX || AQuoSA */
@@ -149,8 +158,7 @@ typedef pthread_mutex_t FOSA_MUTEX_T_OPAQUE;
 ////////////////////////// VIRTUAL TIME    //////////////////////////////////////
 
 #if defined(VIRTUAL_TIME)
-#include <fosa.h>
-#include <vt_ose.h>
+#include <fosa_vt.h>
 
 #define FOSA_THREAD_ID_T_OPAQUE   vt_posix_process_t