# HG changeset patch
# User Michael Spacefalcon <msokolov@ivan.Harhan.ORG>
# Date 1383180914 0
# Node ID 15e972110527a08b3842bc1afcc287a3a201246e
# Parent  e7d4ec9c4c3200f22ec69751e9ba3480daa75624
RVM compiles

diff -r e7d4ec9c4c32 -r 15e972110527 nuc-fw/riviera/rvm/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/nuc-fw/riviera/rvm/Makefile	Thu Oct 31 00:55:14 2013 +0000
@@ -0,0 +1,10 @@
+CC=	arm-elf-gcc
+CFLAGS=	-O2 -fno-builtin -mthumb-interwork -mthumb
+
+OBJS=	rvm_api.o rvm_group_swe.o rvm_mem.o rvm_swe.o rvm_swe_db.o \
+	rvm_swe_hdlr.o rvm_task.o
+
+all:	${OBJS}
+
+clean:
+	rm -f *.[oa] *errs
diff -r e7d4ec9c4c32 -r 15e972110527 nuc-fw/riviera/rvm/rvm_api.c
--- a/nuc-fw/riviera/rvm/rvm_api.c	Thu Oct 31 00:17:12 2013 +0000
+++ b/nuc-fw/riviera/rvm/rvm_api.c	Thu Oct 31 00:55:14 2013 +0000
@@ -19,16 +19,14 @@
  */
 
 
-#ifndef _WINDOWS
-	#include "config/rv.cfg"
-#endif
+#include "../../include/config.h"
+
+#include "../rvf/rvf_env.h"
 
-#include "rvf/rvf_env.h"
-
-#include "rvm/rvm_gen.h"
-#include "rvm/rvm_api.h"
-#include "rvm/rvm_i.h"
-#include "rvm/rvm_use_id_list.h"
+#include "rvm_gen.h"
+#include "rvm_api.h"
+#include "rvm_i.h"
+#include "rvm_use_id_list.h"
 
 #include <string.h>
 
@@ -314,4 +312,3 @@
 
 	return RVM_OK;
 }
-
diff -r e7d4ec9c4c32 -r 15e972110527 nuc-fw/riviera/rvm/rvm_group_swe.c
--- a/nuc-fw/riviera/rvm/rvm_group_swe.c	Thu Oct 31 00:17:12 2013 +0000
+++ b/nuc-fw/riviera/rvm/rvm_group_swe.c	Thu Oct 31 00:55:14 2013 +0000
@@ -18,9 +18,9 @@
  */
 
 
-#include "rvm/rvm_gen.h"
-#include "rv/rv_defined_swe.h"
-#include "rvm/rvm_use_id_list.h"
+#include "rvm_gen.h"
+#include "../rv/rv_defined_swe.h"
+#include "rvm_use_id_list.h"
 
 
 const T_RVM_USE_ID group1[] =
@@ -29,4 +29,4 @@
 
 const T_RVM_USE_ID * RVM_TYPE2_SWE_GROUPS[] =
 {	NULL
-};
\ No newline at end of file
+};
diff -r e7d4ec9c4c32 -r 15e972110527 nuc-fw/riviera/rvm/rvm_mem.c
--- a/nuc-fw/riviera/rvm/rvm_mem.c	Thu Oct 31 00:17:12 2013 +0000
+++ b/nuc-fw/riviera/rvm/rvm_mem.c	Thu Oct 31 00:55:14 2013 +0000
@@ -17,11 +17,11 @@
  * (C) Copyright 2001 by Texas Instruments Incorporated, All Rights Reserved
  */
 
-#include "rvm/rvm_i.h"
-#include "rvm/rvm_gen.h"
-#include "rvm/rvm_api.h"
-#include "rvm/rvm_use_id_list.h"
-#include "rvf/rvf_env.h"
+#include "rvm_i.h"
+#include "rvm_gen.h"
+#include "rvm_api.h"
+#include "rvm_use_id_list.h"
+#include "../rvf/rvf_env.h"
 
 extern T_RVM_GET_INFO_FUNC RVM_SWE_GET_INFO_ARRAY[];
 
@@ -297,4 +297,3 @@
 	return RVM_OK;
 
 }
-
diff -r e7d4ec9c4c32 -r 15e972110527 nuc-fw/riviera/rvm/rvm_swe.c
--- a/nuc-fw/riviera/rvm/rvm_swe.c	Thu Oct 31 00:17:12 2013 +0000
+++ b/nuc-fw/riviera/rvm/rvm_swe.c	Thu Oct 31 00:55:14 2013 +0000
@@ -4,12 +4,15 @@
  * This file was generated by ./Scripts/gen_files.pl
  * See Tools/swe_builder/Readme.txt
 * xrashmic Manually edited to fix the MMS bug 
+ *
+ * FreeCalypso: manually edited further,
+ * but for now only to fix the include paths.
  */
 
-#include "rvm/rvm_gen.h"
-#include "rv/rv_defined_swe.h"
-#include "rvm/rvm_use_id_list.h"
-#include "rvm/rvm_ext_use_id_list.h"
+#include "rvm_gen.h"
+#include "../rv/rv_defined_swe.h"
+#include "rvm_use_id_list.h"
+#include "rvm_ext_use_id_list.h"
 
 
 
diff -r e7d4ec9c4c32 -r 15e972110527 nuc-fw/riviera/rvm/rvm_swe_db.c
--- a/nuc-fw/riviera/rvm/rvm_swe_db.c	Thu Oct 31 00:17:12 2013 +0000
+++ b/nuc-fw/riviera/rvm/rvm_swe_db.c	Thu Oct 31 00:55:14 2013 +0000
@@ -19,12 +19,12 @@
  * (C) Copyright 2001 by Texas Instruments Incorporated, All Rights Reserved
  */
 
-#include "rvf/rvf_env.h"
+#include "../rvf/rvf_env.h"
 
-#include "rvm/rvm_gen.h"
-#include "rvm/rvm_api.h"
-#include "rvm/rvm_i.h"
-#include "rvm/rvm_use_id_list.h"
+#include "rvm_gen.h"
+#include "rvm_api.h"
+#include "rvm_i.h"
+#include "rvm_use_id_list.h"
 
 #include <string.h>
 
@@ -744,4 +744,3 @@
 
 	return RVM_OK;
 }
-
diff -r e7d4ec9c4c32 -r 15e972110527 nuc-fw/riviera/rvm/rvm_swe_hdlr.c
--- a/nuc-fw/riviera/rvm/rvm_swe_hdlr.c	Thu Oct 31 00:17:12 2013 +0000
+++ b/nuc-fw/riviera/rvm/rvm_swe_hdlr.c	Thu Oct 31 00:55:14 2013 +0000
@@ -17,17 +17,17 @@
  * (C) Copyright 2001 by Texas Instruments Incorporated, All Rights Reserved
  */
 #include <stdio.h>
-#include "rvf/rvf_env.h"
-#include "rvm/rvm_gen.h"
-#include "rvm/rvm_api.h"
-#include "rvm/rvm_i.h"
+#include "../rvf/rvf_env.h"
+#include "rvm_gen.h"
+#include "rvm_api.h"
+#include "rvm_i.h"
 
-#include "rvf/rvf_i.h"			/* ET2 rvf private invocation API */
-#include "rvf/rvf_api.h"		/* A-M-E-N-D-E-D! */
+#include "../rvf/rvf_i.h"		/* ET2 rvf private invocation API */
+#include "../rvf/rvf_api.h"		/* A-M-E-N-D-E-D! */
 
 /* temporary inclusion for HCI pb on WINDOWS */
 /* TO DO: remove it. */
-#include "rvm/rvm_use_id_list.h"
+#include "rvm_use_id_list.h"
 
 #include <string.h>
 
diff -r e7d4ec9c4c32 -r 15e972110527 nuc-fw/riviera/rvm/rvm_task.c
--- a/nuc-fw/riviera/rvm/rvm_task.c	Thu Oct 31 00:17:12 2013 +0000
+++ b/nuc-fw/riviera/rvm/rvm_task.c	Thu Oct 31 00:55:14 2013 +0000
@@ -20,13 +20,13 @@
  */
 # include <stdio.h>
 
-#include "rvf/rvf_api.h"
+#include "../rvf/rvf_api.h"
 
-#include "rvm/rvm_gen.h"
-#include "rvm/rvm_api.h"
-#include "rvm/rvm_i.h"
-#include "rvf/rvf_i.h"					/* only for pRtAddrIdTable[] */
-#include "rvm/rvm_use_id_list.h"
+#include "rvm_gen.h"
+#include "rvm_api.h"
+#include "rvm_i.h"
+#include "../rvf/rvf_i.h"			/* only for pRtAddrIdTable[] */
+#include "rvm_use_id_list.h"
 
 
 extern T_RVM_KNOWN_SWE	* rvm_swe_array;  /* for start() */
@@ -530,4 +530,4 @@
 	}
 	RVM_TRACE_WARNING_PARAM(ret_val, p_msg_res->swe_index);
 }
-#endif
\ No newline at end of file
+#endif