# HG changeset patch
# User Michael Spacefalcon <msokolov@ivan.Harhan.ORG>
# Date 1383175161 0
# Node ID dd56546ad9e08fdaa7bab5b9fc4efab2b1958df3
# Parent  21de8d8e6ea769b7343874ef4a230fc7e9218e54
starting to compile RVF

diff -r 21de8d8e6ea7 -r dd56546ad9e0 nuc-fw/Makefile
--- a/nuc-fw/Makefile	Tue Oct 29 07:03:45 2013 +0000
+++ b/nuc-fw/Makefile	Wed Oct 30 23:19:21 2013 +0000
@@ -1,4 +1,4 @@
-SUBDIR=	bsp finlink include nucdemo nucleus sprintf sysglue
+SUBDIR=	bsp finlink include nucdemo nucleus serial sprintf sysglue
 
 default:	config.stamp
 	${MAKE} ${MFLAGS} -f Makefile.build $@
diff -r 21de8d8e6ea7 -r dd56546ad9e0 nuc-fw/nucleus/nucleus.h
--- a/nuc-fw/nucleus/nucleus.h	Tue Oct 29 07:03:45 2013 +0000
+++ b/nuc-fw/nucleus/nucleus.h	Wed Oct 30 23:19:21 2013 +0000
@@ -135,20 +135,22 @@
 typedef int                     INT;
 typedef unsigned long *         UNSIGNED_PTR;
 typedef unsigned char *         BYTE_PTR;
-typedef DATA_ELEMENT            BOOLEAN;
 typedef unsigned int            UNSIGNED_INT;
 
 #define VOID void
 #define HUGE
 #define FAR
 
-typedef char    INT8;  
-typedef unsigned char  UINT8; 
-typedef signed short   INT16; 
-typedef unsigned short UINT16;
-typedef signed long    INT32; 
-typedef unsigned long  UINT32;
-
+/* need to avoid conflict with Riviera - do what the LoCosto src does */
+#ifndef GENERAL_H
+typedef DATA_ELEMENT	BOOLEAN;
+typedef char		INT8;  
+typedef unsigned char	UINT8; 
+typedef signed short	INT16; 
+typedef unsigned short	UINT16;
+typedef signed long	INT32; 
+typedef unsigned long	UINT32;
+#endif
 
 /* Define register defines.  R1, R2, R3, and R4 are used in the Nucleus PLUS
    source code in front of variables that are referenced often.  In some
diff -r 21de8d8e6ea7 -r dd56546ad9e0 nuc-fw/riviera/rv/rv_defined_swe.h
--- a/nuc-fw/riviera/rv/rv_defined_swe.h	Tue Oct 29 07:03:45 2013 +0000
+++ b/nuc-fw/riviera/rv/rv_defined_swe.h	Wed Oct 30 23:19:21 2013 +0000
@@ -29,19 +29,21 @@
 #ifndef _RV_DEFINED_SWE_H_
 #define _RV_DEFINED_SWE_H_
 
-#ifndef _WINDOWS
-   #include "config/l1sw.cfg"
-   #include "config/rv.cfg"
-   #include "config/swconfig.cfg"
-   #include "config/debug.cfg"
-#endif
+#include "../../include/config.h"
+#include "../../L1/include/l1_confg.h"
 
 /*
  * rv_swe.h is generated before build from System/env.mak
  * It is used both for RivieraTool and Target.
+ *
+ * FreeCalypso note: we won't be generating a separate rv_swe.h
+ * file; instead our configuration mechanism will emit the
+ * necessary #define lines into config.h along with all other
+ * definitions.
  */
+#if 0
 #include "rv_swe.h"
-
+#endif
 
 /* ------------------------------------------------------------------
  * Grouped SWEs
diff -r 21de8d8e6ea7 -r dd56546ad9e0 nuc-fw/riviera/rv/rv_general.h
--- a/nuc-fw/riviera/rv/rv_general.h	Tue Oct 29 07:03:45 2013 +0000
+++ b/nuc-fw/riviera/rv/rv_general.h	Wed Oct 30 23:19:21 2013 +0000
@@ -29,8 +29,8 @@
 #ifndef _RV_GENERAL_H_
 #define _RV_GENERAL_H_
 
-#include "rv/general.h"
-#include "rv/rv_trace.h"
+#include "general.h"
+#include "rv_trace.h"
 
 /**
  * Task IDentifiers: A-M-E-N-D-E-D!
@@ -97,9 +97,9 @@
  * Generic header of messages used in Riviera.
  */
 typedef struct {
-    UINT32			msg_id;
-	void			(*callback_func)(void *);
-    T_RVF_ADDR_ID	src_addr_id;
+	UINT32		msg_id;
+	void		(*callback_func)(void *);
+	T_RVF_ADDR_ID	src_addr_id;
 	T_RVF_ADDR_ID	dest_addr_id;
 } T_RV_HDR;
 
@@ -121,4 +121,3 @@
 typedef UINT8 T_RV_BUFFER;
 
 #endif /* _RV_GENERAL_H_ */
-
diff -r 21de8d8e6ea7 -r dd56546ad9e0 nuc-fw/riviera/rvf/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nuc-fw/riviera/rvf/Makefile	Wed Oct 30 23:19:21 2013 +0000
@@ -0,0 +1,9 @@
+CC=	arm-elf-gcc
+CFLAGS=	-O2 -fno-builtin -mthumb-interwork -mthumb
+
+OBJS=	rvf_buffer.o
+
+all:	${OBJS}
+
+clean:
+	rm -f *.[oa] *errs
diff -r 21de8d8e6ea7 -r dd56546ad9e0 nuc-fw/riviera/rvf/rvf_api.h
--- a/nuc-fw/riviera/rvf/rvf_api.h	Tue Oct 29 07:03:45 2013 +0000
+++ b/nuc-fw/riviera/rvf/rvf_api.h	Wed Oct 30 23:19:21 2013 +0000
@@ -22,11 +22,10 @@
 #ifndef _RVF_API_H
 #define _RVF_API_H
 
-#include "rv/general.h"
-#include "rv/rv_general.h"
-#include "rvf/rvf_target.h"
+#include "../rv/rv_general.h"
+#include "rvf_target.h"
 
-#ifndef _WINDOWS
+#if 0 //#ifndef _WINDOWS
   #include "config/swconfig.cfg"
 #endif
 
@@ -55,11 +54,11 @@
 /* return parameters definition */
 typedef T_RV_RET T_RVF_RET;
 
-#define	RVF_OK					RV_OK				
-#define	RVF_NOT_SUPPORTED		RV_NOT_SUPPORTED		
-#define	RVF_NOT_READY			RV_NOT_READY			
-#define	RVF_MEMORY_ERR			RV_MEMORY_ERR			
-#define	RVF_INTERNAL_ERR		RV_INTERNAL_ERR		
+#define	RVF_OK			RV_OK				
+#define	RVF_NOT_SUPPORTED	RV_NOT_SUPPORTED		
+#define	RVF_NOT_READY		RV_NOT_READY			
+#define	RVF_MEMORY_ERR		RV_MEMORY_ERR			
+#define	RVF_INTERNAL_ERR	RV_INTERNAL_ERR		
 #define	RVF_INVALID_PARAMETER	RV_INVALID_PARAMETER	
 
 /* memeory bank state definition */
@@ -345,7 +344,7 @@
 T_RVF_BUFFER * rvf_wait_for_specific_msg(UINT16 msg_code, UINT8 mbox, UINT32 timeout);
 
 /* Trace definitions */
-#define NULL_PARAM 4294967295 /* this value will not be displayed in rvf_send_trace function */
+#define NULL_PARAM 0xFFFFFFFFU /* this value will not be displayed in rvf_send_trace function */
 #define TRACE_MB_ID		(RVF_MAX_REAL_MB -1)
 
 #ifdef __cplusplus
@@ -353,4 +352,3 @@
 #endif
 
 #endif	/* _RVF_API_H */
-
diff -r 21de8d8e6ea7 -r dd56546ad9e0 nuc-fw/riviera/rvf/rvf_buffer.c
--- a/nuc-fw/riviera/rvf/rvf_buffer.c	Tue Oct 29 07:03:45 2013 +0000
+++ b/nuc-fw/riviera/rvf/rvf_buffer.c	Wed Oct 30 23:19:21 2013 +0000
@@ -20,16 +20,15 @@
 /* (C) Copyright 1999 by Texas Instruments Incorporated, All Rights Reserved*/
 /****************************************************************************/
 
-#ifndef _WINDOWS
-#include "config/board.cfg"
-#endif
+#include "../../include/config.h"
 
-#include "nucleus.h"
-#include "rvm/rvm_use_id_list.h"
-#include "rvf/rvf_api.h"
-#include "rvf/rvf_i.h"
-#include "support/exception.h"
-#include "rvf/rvf_pool_size.h"
+#include "../rvm/rvm_use_id_list.h"
+#include "rvf_api.h"
+#include "rvf_i.h"
+#include "../support/exception.h"
+#include "rvf_pool_size.h"
+
+#include "../../nucleus/nucleus.h"
 
 #include <string.h>
 #include <stdio.h>
@@ -41,7 +40,7 @@
 #endif
 #endif
 
-#include "rv/rv_defined_swe.h"
+#include "../rv/rv_defined_swe.h"
 
 #ifdef RVM_DAR_SWE
 	#include "dar/dar_api.h"
diff -r 21de8d8e6ea7 -r dd56546ad9e0 nuc-fw/riviera/rvf/rvf_cust.h
--- a/nuc-fw/riviera/rvf/rvf_cust.h	Tue Oct 29 07:03:45 2013 +0000
+++ b/nuc-fw/riviera/rvf/rvf_cust.h	Wed Oct 30 23:19:21 2013 +0000
@@ -20,7 +20,7 @@
 #define _RVF_CUST_H
 
 
-#include "rv/general.h"
+#include "../rv/general.h"
 
 
 /* RVF will managed at most 2 pools of memory for dynamic allocation */
diff -r 21de8d8e6ea7 -r dd56546ad9e0 nuc-fw/riviera/rvf/rvf_env.h
--- a/nuc-fw/riviera/rvf/rvf_env.h	Tue Oct 29 07:03:45 2013 +0000
+++ b/nuc-fw/riviera/rvf/rvf_env.h	Wed Oct 30 23:19:21 2013 +0000
@@ -18,7 +18,7 @@
 #ifndef _RVF_ENV_H
 #define _RVF_ENV_H
 
-#include "rvf/rvf_api.h"
+#include "rvf_api.h"
 
 
 
@@ -43,4 +43,3 @@
 
 
 #endif	/* _RVF_ENV_H */
-
diff -r 21de8d8e6ea7 -r dd56546ad9e0 nuc-fw/riviera/rvf/rvf_i.h
--- a/nuc-fw/riviera/rvf/rvf_i.h	Tue Oct 29 07:03:45 2013 +0000
+++ b/nuc-fw/riviera/rvf/rvf_i.h	Wed Oct 30 23:19:21 2013 +0000
@@ -24,10 +24,10 @@
 #define _RVF_I_H
 
 
-#include "rv/general.h"
-#include "rvf/rvf_api.h"
-#include "nucleus.h" 	/* A-M-E-N-D-E-D! */
-#include "rvm/rvm_i.h"
+#include "../rv/general.h"
+#include "rvf_api.h"
+#include "../../nucleus/nucleus.h" 	/* A-M-E-N-D-E-D! */
+#include "../rvm/rvm_i.h"
 
 /********************************************************************/
 /**  Buffer Management Data Structures                             **/
diff -r 21de8d8e6ea7 -r dd56546ad9e0 nuc-fw/riviera/rvf/rvf_pool_size.h
--- a/nuc-fw/riviera/rvf/rvf_pool_size.h	Tue Oct 29 07:03:45 2013 +0000
+++ b/nuc-fw/riviera/rvf/rvf_pool_size.h	Wed Oct 30 23:19:21 2013 +0000
@@ -30,7 +30,7 @@
 #ifndef _RVF_POOL_SIZE_H
 #define _RVF_POOL_SIZE_H
 
-#ifndef _WINDOWS
+#if 0 //#ifndef _WINDOWS
   #include "config/r2d.cfg"
   #include "config/rv.cfg"
   #include "config/debug.cfg"
@@ -39,8 +39,8 @@
   #include "config/swconfig.cfg"
 #endif
 
-#include "rv/rv_defined_swe.h"
-#include "config/mdc.cfg"
+#include "../rv/rv_defined_swe.h"
+//#include "config/mdc.cfg"
 
 
 /* 
@@ -423,7 +423,7 @@
  * RVM SWE; This SWE is of course always enabled.
  * TO CLEAN??
  */
-#include "rvm/rvm_pool_size.h"
+#include "../rvm/rvm_pool_size.h"
 
 
 /*
@@ -452,7 +452,7 @@
  * TRACE SWE
  */
 #ifdef RVM_RVT_SWE
-  #include "rvt/rvt_pool_size.h"
+  #include "../rvt/rvt_pool_size.h"
   #define RVF_TRACE_POOL_SIZE  (TRACE_POOL_SIZE)
 #else
   #define RVF_TRACE_POOL_SIZE  (0)
diff -r 21de8d8e6ea7 -r dd56546ad9e0 nuc-fw/riviera/rvf/rvf_target.h
--- a/nuc-fw/riviera/rvf/rvf_target.h	Tue Oct 29 07:03:45 2013 +0000
+++ b/nuc-fw/riviera/rvf/rvf_target.h	Wed Oct 30 23:19:21 2013 +0000
@@ -28,11 +28,12 @@
 #ifndef _RVF_TARGET_H
 #define _RVF_TARGET_H
 
-#ifndef _WINDOWS
+#if 0 //#ifndef _WINDOWS
 	#include "config/rv.cfg"
 	#include "config/swconfig.cfg"
 #endif
 
+#include "../../include/config.h"
 
 /* optimizations */
 #ifdef _WINDOWS
diff -r 21de8d8e6ea7 -r dd56546ad9e0 nuc-fw/riviera/rvm/rvm_api.h
--- a/nuc-fw/riviera/rvm/rvm_api.h	Tue Oct 29 07:03:45 2013 +0000
+++ b/nuc-fw/riviera/rvm/rvm_api.h	Wed Oct 30 23:19:21 2013 +0000
@@ -22,7 +22,7 @@
 #ifndef __RVM_API_H_
 #define __RVM_API_H_
 
-#include "rv/rv_general.h"
+#include "../rv/rv_general.h"
 //#include "rvf_i.h"
 
 
@@ -47,11 +47,11 @@
 
 
 /* RVM return parameters definition */
-#define	RVM_OK					RV_OK				
-#define	RVM_NOT_SUPPORTED		RV_NOT_SUPPORTED		
-#define	RVM_NOT_READY			RV_NOT_READY			
-#define	RVM_MEMORY_ERR			RV_MEMORY_ERR			
-#define	RVM_INTERNAL_ERR		RV_INTERNAL_ERR		
+#define	RVM_OK			RV_OK				
+#define	RVM_NOT_SUPPORTED	RV_NOT_SUPPORTED		
+#define	RVM_NOT_READY		RV_NOT_READY			
+#define	RVM_MEMORY_ERR		RV_MEMORY_ERR			
+#define	RVM_INTERNAL_ERR	RV_INTERNAL_ERR		
 #define	RVM_INVALID_PARAMETER	RV_INVALID_PARAMETER	
 
 
@@ -90,11 +90,11 @@
 /* structure of RVM returned message to appli */
 typedef struct
 {
-	T_RV_HDR			header;		// event field will be RVM_EVT_TO_APPLI
+	T_RV_HDR		header;		// event field will be RVM_EVT_TO_APPLI
 	T_RV_RETURN_PATH	rp;
 	T_RVM_APPLI_ACTION	action;		// Indicates if the result is coming from a rvm_start or a rvm_stop function call
-	T_RVM_NAME			swe_name;	// Name of the SW entity
-	UINT8				swe_index;	// Number of the SW entity
+	T_RVM_NAME		swe_name;	// Name of the SW entity
+	UINT8			swe_index;	// Number of the SW entity
 	T_RVM_RETURN		result;
 } T_RVM_APPLI_RESULT;
 
@@ -106,7 +106,7 @@
 /***************************************/
 
 /* enable init at boot up   */
-BOOLEAN			rvm_init(void);
+BOOLEAN		rvm_init(void);
 /* launch the creation process to start the specified SWE */
 T_RVM_RETURN	rvm_start_swe( T_RVM_USE_ID swe_id, T_RV_RETURN_PATH return_path);
 
diff -r 21de8d8e6ea7 -r dd56546ad9e0 nuc-fw/riviera/rvm/rvm_ext_use_id_list.h
--- a/nuc-fw/riviera/rvm/rvm_ext_use_id_list.h	Tue Oct 29 07:03:45 2013 +0000
+++ b/nuc-fw/riviera/rvm/rvm_ext_use_id_list.h	Wed Oct 30 23:19:21 2013 +0000
@@ -26,30 +26,6 @@
 #define __RVM_EXT_USE_ID_LIST_H_
 
 
-#include "rvm/rvm_use_id_list.h"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+#include "rvm_use_id_list.h"
 
 #endif  /* __RVM_EXT_USE_ID_LIST_H_ */
-
-
diff -r 21de8d8e6ea7 -r dd56546ad9e0 nuc-fw/riviera/rvm/rvm_gen.h
--- a/nuc-fw/riviera/rvm/rvm_gen.h	Tue Oct 29 07:03:45 2013 +0000
+++ b/nuc-fw/riviera/rvm/rvm_gen.h	Wed Oct 30 23:19:21 2013 +0000
@@ -23,12 +23,12 @@
 #ifndef __RVM_GEN_H_
 #define __RVM_GEN_H_
 
-#ifndef _WINDOWS
+#if 0 //#ifndef _WINDOWS
   #include "config/rv.cfg"
 #endif
 
-#include "rvf/rvf_api.h" /* for memory bank related definitions & GD*/
-#include "rvm/rvm_api.h"
+#include "../rvf/rvf_api.h" /* for memory bank related definitions & GD*/
+#include "rvm_api.h"
 
 
 #ifdef __cplusplus
@@ -87,12 +87,12 @@
 /* Type1 SWE info */
 typedef struct
 {
-	T_RVM_NAME				swe_name;
+	T_RVM_NAME			swe_name;
 	T_RVM_USE_ID			swe_use_id;
-	UINT32					version;
-	UINT8					nb_mem_bank;
+	UINT32				version;
+	UINT8				nb_mem_bank;
 	T_RVM_BK_INFO			mem_bank[RVM_MAX_NB_MEM_BK];
-	UINT8					nb_linked_swe;
+	UINT8				nb_linked_swe;
 	T_RVM_USE_ID			linked_swe_id[RVM_MAX_NB_LINKED_SWE];
 	T_RV_RETURN_PATH		return_path;
 	T_RVM_RETURN  (* set_info) (T_RVF_ADDR_ID	addr_id,
@@ -108,17 +108,17 @@
 /* Type2 SWE info */
 typedef struct
 {
-	T_RVM_NAME				swe_name;
+	T_RVM_NAME			swe_name;
 	T_RVM_USE_ID			swe_use_id;
-	UINT16					stack_size;
-	UINT8					priority;
-	UINT32					version;
-	UINT8					nb_mem_bank;
+	UINT16				stack_size;
+	UINT8				priority;
+	UINT32				version;
+	UINT8				nb_mem_bank;
 	T_RVM_BK_INFO			mem_bank[RVM_MAX_NB_MEM_BK];
-	UINT8					nb_linked_swe;
+	UINT8				nb_linked_swe;
 	T_RVM_USE_ID			linked_swe_id[RVM_MAX_NB_LINKED_SWE];
 	T_RV_RETURN_PATH		return_path;
-	T_RVF_GD_ID				swe_group_directive;				/* A-M-E-N-D-E-D! */
+	T_RVF_GD_ID			swe_group_directive;				/* A-M-E-N-D-E-D! */
 	T_RVM_RETURN  (* set_info) (T_RVF_ADDR_ID	addr_id,
 								T_RV_RETURN_PATH return_path[],
 								T_RVF_MB_ID		bk_id_table[],  /* A-M-E-N-E-D-E-D! is table or list??*/
@@ -134,14 +134,14 @@
 /* Type3 SWE info */
 typedef struct
 {
-	T_RVM_NAME				swe_name;
+	T_RVM_NAME			swe_name;
 	T_RVM_USE_ID			swe_use_id;
-	UINT16					stack_size;
-	UINT8					priority;
-	UINT32					version;
-	UINT8					nb_mem_bank;
+	UINT16				stack_size;
+	UINT8				priority;
+	UINT32				version;
+	UINT8				nb_mem_bank;
 	T_RVM_BK_INFO			mem_bank[RVM_MAX_NB_MEM_BK];
-	UINT8					nb_linked_swe;
+	UINT8				nb_linked_swe;
 	T_RVM_USE_ID			linked_swe_id[RVM_MAX_NB_LINKED_SWE];
 	T_RV_RETURN_PATH		return_path;
 	T_RVM_RETURN  (* set_info) (T_RVF_ADDR_ID	addr_id,
@@ -159,14 +159,14 @@
 /* Type4 SWE info */
 typedef struct
 {
-	T_RVM_NAME				swe_name;
+	T_RVM_NAME			swe_name;
 	T_RVM_USE_ID			swe_use_id;
-	UINT16					stack_size;
-	UINT8					priority;
-	UINT32					version;
-	UINT8					nb_mem_bank;
+	UINT16				stack_size;
+	UINT8				priority;
+	UINT32				version;
+	UINT8				nb_mem_bank;
 	T_RVM_BK_INFO			mem_bank[RVM_MAX_NB_MEM_BK];
-	UINT8					nb_linked_swe;
+	UINT8				nb_linked_swe;
 	T_RVM_USE_ID			linked_swe_id[RVM_MAX_NB_LINKED_SWE];
 	T_RV_RETURN_PATH		return_path;
 	T_RVM_RETURN  (* set_info) (T_RVF_ADDR_ID	addr_id,
@@ -187,7 +187,7 @@
 
 	union
 	{	T_RVM_SWE_PASSIVE_INFO		type1;
-		T_RVM_SWE_GROUP_MEMBER_INFO type2;
+		T_RVM_SWE_GROUP_MEMBER_INFO	type2;
 		T_RVM_SWE_SINGLE_INFO		type3;
 		T_RVM_SWE_SELF_MADE_INFO	type4;
 	} type_info;
@@ -212,4 +212,3 @@
 
 
 #endif /* __RVM_GEN_H_ */
-
diff -r 21de8d8e6ea7 -r dd56546ad9e0 nuc-fw/riviera/rvm/rvm_i.h
--- 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_ */
-
diff -r 21de8d8e6ea7 -r dd56546ad9e0 nuc-fw/riviera/rvm/rvm_pool_size.h
--- a/nuc-fw/riviera/rvm/rvm_pool_size.h	Tue Oct 29 07:03:45 2013 +0000
+++ b/nuc-fw/riviera/rvm/rvm_pool_size.h	Wed Oct 30 23:19:21 2013 +0000
@@ -26,7 +26,7 @@
 #define __RVM_POOL_SIZE_H_
 
 
-#ifndef _WINDOWS
+#if 0 //#ifndef _WINDOWS
   #include "rv.cfg"	     // TEST
   #include "debug.cfg" 	 // TI_PROFILER, TI_NUC_MONITOR
   #include "board.cfg"    // BOARD
diff -r 21de8d8e6ea7 -r dd56546ad9e0 nuc-fw/riviera/rvm/rvm_priorities.h
--- a/nuc-fw/riviera/rvm/rvm_priorities.h	Tue Oct 29 07:03:45 2013 +0000
+++ b/nuc-fw/riviera/rvm/rvm_priorities.h	Wed Oct 30 23:19:21 2013 +0000
@@ -22,7 +22,7 @@
 #define __RVM_PRIORITIES_H_
 
 
-#include "rvm/rvm_ext_priorities.h"
+#include "rvm_ext_priorities.h"
 
 /* PRIORITIES SETTING:                        */
 /* All user priority should be set under 250: */
@@ -91,4 +91,3 @@
 
 #define		RVM_TMS_TASK_PRIORITY			(200) /* A-M-E-N-D-E-D! */
 #endif /* __RVM_PRIORITIES_H_ */
-
diff -r 21de8d8e6ea7 -r dd56546ad9e0 nuc-fw/riviera/rvm/rvm_use_id_list.h
--- a/nuc-fw/riviera/rvm/rvm_use_id_list.h	Tue Oct 29 07:03:45 2013 +0000
+++ b/nuc-fw/riviera/rvm/rvm_use_id_list.h	Wed Oct 30 23:19:21 2013 +0000
@@ -359,4 +359,3 @@
 
 
 #endif  /* __RVM_USE_ID_LIST_H_ */
-
diff -r 21de8d8e6ea7 -r dd56546ad9e0 nuc-fw/riviera/rvt/rvt_pool_size.h
--- a/nuc-fw/riviera/rvt/rvt_pool_size.h	Tue Oct 29 07:03:45 2013 +0000
+++ b/nuc-fw/riviera/rvt/rvt_pool_size.h	Wed Oct 30 23:19:21 2013 +0000
@@ -24,7 +24,7 @@
 #define __RVT_POOL_SIZE_H_
 
 
-#ifndef _WINDOWS
+#if 0 //#ifndef _WINDOWS
   #include "rv.cfg"
   #include "swconfig.cfg"
 #endif
diff -r 21de8d8e6ea7 -r dd56546ad9e0 nuc-fw/riviera/support/exception.h
--- a/nuc-fw/riviera/support/exception.h	Tue Oct 29 07:03:45 2013 +0000
+++ b/nuc-fw/riviera/support/exception.h	Wed Oct 30 23:19:21 2013 +0000
@@ -17,8 +17,8 @@
 #ifndef RVF_EXCEPTION_H
 #define RVF_EXCEPTION_H
 
-#include "rvf/rvf_api.h"
-#include "rvf/rvf_target.h"
+#include "../rvf/rvf_api.h"
+#include "../rvf/rvf_target.h"
 
 #include <string.h>