--- a/nuc-fw/riviera/rvm/rvm_i.h	Tue Oct 29 07:03:45 2013 +0000
+++ b/nuc-fw/riviera/rvm/rvm_i.h	Wed Oct 30 23:19:21 2013 +0000
@@ -21,16 +21,16 @@
 #ifndef __RVM_I_H_
 #define __RVM_I_H_
 
-#ifndef _WINDOWS
+#if 0 //#ifndef _WINDOWS
   #include "config/rv.cfg"
   #include "config/debug.cfg"
 #endif
 
-#include "rvf/rvf_api.h"
-#include "rvm/rvm_api.h"
-#include "rvm/rvm_gen.h"
+#include "../rvf/rvf_api.h"
+#include "rvm_api.h"
+#include "rvm_gen.h"
 //#include "rvf/rvf_pool_size.h"
-#include "rvm/rvm_pool_size.h"
+#include "rvm_pool_size.h"
 //#include "rv_general.h"  //??
 
 
@@ -90,16 +90,16 @@
 typedef enum {
     SWE_NOT_STARTED			= 0,
     SWE_RUNNING				= 1,
-	SWE_STOPPING			= 2,
-	SWE_KILLED				= 3
+    SWE_STOPPING			= 2,
+    SWE_KILLED				= 3
 }T_RVM_SWE_STATE;
 
 
 /* structure of message  */
 typedef struct {
-	T_RV_HDR			header;
+	T_RV_HDR		header;
 	T_RV_RETURN_PATH	rp;
-	UINT8		swe_num;
+	UINT8			swe_num;
 }T_RVM_MSG;
 
 
@@ -107,28 +107,28 @@
    This is static information and is built at RVM initialization */
 typedef struct
 {	
-	T_RVM_NAME				swe_name;
+	T_RVM_NAME			swe_name;
 	T_RVM_USE_ID			swe_use_id;
 	T_RVM_GET_INFO_FUNC		swe_get_info;			/* pointer to its get_info function */
 	T_RVM_SWE_TYPE			swe_type;				/* type of the SWE */
 	T_RVF_G_ADDR_ID			swe_addr_id;			/* unique address id of the SWE */
-	UINT16					group_index;			/* for type 2 SWE, index of the hosting group in the group array. */
-	UINT16					swe_stack_size;			/* size of the task stack */
-	UINT8					swe_priority;			/* priority of the SWE */
+	UINT16				group_index;			/* for type 2 SWE, index of the hosting group in the group array. */
+	UINT16				swe_stack_size;			/* size of the task stack */
+	UINT8				swe_priority;			/* priority of the SWE */
 	T_RVM_SWE_STATE			swe_state;				/* state of the SWE */
 	T_RVF_BUFFER*			stack_ptr;			/* pointer to the stack of the task */
-	UINT8					nb_using_appli;			/* nb of application which uses this SWE */
-	UINT8					using_appli[RVM_MAX_SWE_USING]; /* pointer to each application which use this SWE */
+	UINT8				nb_using_appli;			/* nb of application which uses this SWE */
+	UINT8				using_appli[RVM_MAX_SWE_USING]; /* pointer to each application which use this SWE */
 	T_RV_RETURN_PATH		swe_return_path;
 	T_RV_RETURN_PATH		mmi_return_path;
 }T_RVM_KNOWN_SWE;
 
 typedef struct
 {	T_RVM_SWE_STATE		host_state;
-	UINT8				task_id;
-	UINT16				nb_hosted_swe;
-	UINT16				stack_size;
-	UINT8				task_priority;
+	UINT8			task_id;
+	UINT16			nb_hosted_swe;
+	UINT16			stack_size;
+	UINT8			task_priority;
 }	T_RVM_GROUP_INFO; /* DEPRECATED! */
 
 
@@ -153,15 +153,15 @@
 	This information is dynamic and lives during start or stop process only*/
 typedef struct _t_rvm_processing_swe
 {
-	UINT8							swe_id; // From known SWE array index
-	T_RVM_SWE_TYPE					swe_type;
-	UINT16							stack_size;
-	UINT8							priority;
-	UINT8							nb_requested_mb;
-	UINT8							nb_created_mb;
-	T_RVM_APPLI_MB_PARAMS			swe_mem_bank[RVM_MAX_NB_MEM_BK];
-	T_RVM_SWE_FUNCTIONS				rvm_functions;
-	T_RVF_MB_ID						bk_id_table[RVM_MAX_NB_MEM_BK];
+	UINT8				swe_id; // From known SWE array index
+	T_RVM_SWE_TYPE			swe_type;
+	UINT16				stack_size;
+	UINT8				priority;
+	UINT8				nb_requested_mb;
+	UINT8				nb_created_mb;
+	T_RVM_APPLI_MB_PARAMS		swe_mem_bank[RVM_MAX_NB_MEM_BK];
+	T_RVM_SWE_FUNCTIONS		rvm_functions;
+	T_RVF_MB_ID			bk_id_table[RVM_MAX_NB_MEM_BK];
 	struct _t_rvm_processing_swe	*next_swe;
 } T_RVM_PROCESSING_SWE;
 
@@ -196,12 +196,12 @@
 
 typedef struct {
 	T_RVM_SWE_STATE		host_state;
-	T_RVF_GD_ID			group_directive;
+	T_RVF_GD_ID		group_directive;
 	T_RVF_G_ADDR_ID		host_task_addr;
-//	UINT16				hosted_swe_addr[10];
-	UINT8				hosted_swe_db_index[MAX_PARASITES];  // to do ..... constant!
-	UINT16				stack_size;
-	UINT8				task_priority;
+//	UINT16			hosted_swe_addr[10];
+	UINT8			hosted_swe_db_index[MAX_PARASITES];  // to do ..... constant!
+	UINT16			stack_size;
+	UINT8			task_priority;
 }	T_RVM_GROUP_DIRECTIVE;
 
 T_RV_RET rvm_t2_proxy(void);
@@ -209,15 +209,15 @@
 //typedef TASKPTR rvm_proxy;
 
 /* definitions related to the RVM as a RVF task */
-#define RVM_TASK_ID			(0)
+#define RVM_TASK_ID		(0)
 #define RVM_PRIORITY		(220)
 
 /* To do ... should correspond to RVF definitions   */
-#define RVM_TASK			0			/* A-M-E-N-D-E-D !	*/
+#define RVM_TASK		0			/* A-M-E-N-D-E-D !	*/
 #define ET2_HOST_TASK		1
-#define ET3_TASK			3
-#define ET4_TASK			4
-#define ET2_VTASK			5
+#define ET3_TASK		3
+#define ET4_TASK		4
+#define ET2_VTASK		5
 #define PRE_RV_INIT_TASK	10
 
 
@@ -269,20 +269,20 @@
 							T_RVM_ERROR_TYPE error_type, T_RVM_STRING error_msg);
 
 
-void			rvm_task (UINT32 param);
+void		rvm_task (UINT32 param);
 
-void			rvm_launch_appli( T_RVM_MSG * msg_Ptr);
+void		rvm_launch_appli( T_RVM_MSG * msg_Ptr);
 
-void			rvm_stop_appli( T_RVM_STOP_MSG * msg_Ptr);
+void		rvm_stop_appli( T_RVM_STOP_MSG * msg_Ptr);
 
-void			rvm_swe_has_stopped(T_RVM_STOP_MSG* p_msg);
+void		rvm_swe_has_stopped(T_RVM_STOP_MSG* p_msg);
 T_RVM_RETURN	rvm_dup_stop_msg(T_RVM_STOP_MSG* i_msg, T_RVM_STOP_MSG* o_msg) ;
-void			rvm_suspend_swe(UINT8 swe_index);
+void		rvm_suspend_swe(UINT8 swe_index);
 T_RVM_RETURN	rvm_kill_swe(UINT8 swe_index);
-UINT8			rvm_get_mb_level(UINT8 swe_index) ;
+UINT8		rvm_get_mb_level(UINT8 swe_index) ;
 
-void			rvm_shut_down_appli( T_RVM_MSG * msg_Ptr);
-void			rvm_shutdown_swe(UINT8 index) ;
+void		rvm_shut_down_appli( T_RVM_MSG * msg_Ptr);
+void		rvm_shutdown_swe(UINT8 index) ;
 
 T_RVM_TASK_ID rvm_allocate_task_id(UINT8 isRealTask);
 
@@ -348,4 +348,3 @@
 
 
 #endif /* __RVM_I_H_ */
-