FreeCalypso > hg > freecalypso-sw

changeset 120:e7d4ec9c4c32

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
All of RVF compiles
author Michael Spacefalcon <msokolov@ivan.Harhan.ORG>
date Thu, 31 Oct 2013 00:17:12 +0000
parents dd56546ad9e0
children 15e972110527
files nuc-fw/riviera/rvf/Makefile nuc-fw/riviera/rvf/rvf_mem_pool.c nuc-fw/riviera/rvf/rvf_msg.c nuc-fw/riviera/rvf/rvf_task.c nuc-fw/riviera/rvf/rvf_time.c nuc-fw/riviera/rvf/rvf_trace_adapt.c nuc-fw/riviera/rvt/rvt_gen.h
diffstat 7 files changed, 55 insertions(+), 50 deletions(-) [+]
line wrap: on
line diff
--- a/nuc-fw/riviera/rvf/Makefile	Wed Oct 30 23:19:21 2013 +0000
+++ b/nuc-fw/riviera/rvf/Makefile	Thu Oct 31 00:17:12 2013 +0000
@@ -1,7 +1,8 @@
 CC=	arm-elf-gcc
 CFLAGS=	-O2 -fno-builtin -mthumb-interwork -mthumb
 
-OBJS=	rvf_buffer.o
+OBJS=	rvf_buffer.o rvf_mem_pool.o rvf_msg.o rvf_task.o rvf_time.o \
+	rvf_trace_adapt.o
 
 all:	${OBJS}
 
--- a/nuc-fw/riviera/rvf/rvf_mem_pool.c	Wed Oct 30 23:19:21 2013 +0000
+++ b/nuc-fw/riviera/rvf/rvf_mem_pool.c	Thu Oct 31 00:17:12 2013 +0000
@@ -15,8 +15,8 @@
 /* (C) Copyright 2002 by Texas Instruments Incorporated, All Rights Reserved*/
 /****************************************************************************/
 
-#include "rvf/rvf_pool_size.h"
-#include "rvf/rvf_cust.h"
+#include "rvf_pool_size.h"
+#include "rvf_cust.h"
 
 /******** MEMORY POOLS ******************/
 /* Define the buffer pools */
@@ -78,4 +78,4 @@
 UINT16 _rvf_get_number_of_pool(void)
 {
    return RVF_NB_POOLS;
-}
\ No newline at end of file
+}
--- a/nuc-fw/riviera/rvf/rvf_msg.c	Wed Oct 30 23:19:21 2013 +0000
+++ b/nuc-fw/riviera/rvf/rvf_msg.c	Thu Oct 31 00:17:12 2013 +0000
@@ -13,10 +13,10 @@
 /* (C) Copyright 2002 by Texas Instruments Incorporated, All Rights Reserved*/
 /****************************************************************************/
 
-#include "rvf/rvf_api.h"
-#include "rvf/rvf_i.h"
-#include "rvm/rvm_use_id_list.h"
-#include "rvm/rvm_api.h"	// RVM_TMS_MSG & RVM_MSG_OFFSET
+#include "rvf_api.h"
+#include "rvf_i.h"
+#include "../rvm/rvm_use_id_list.h"
+#include "../rvm/rvm_api.h"	// RVM_TMS_MSG & RVM_MSG_OFFSET
 
 // PRIVATE
 static const UINT8	BOUNDBUFVAL=20; 
@@ -190,5 +190,3 @@
 T_RVF_RET rvf_adapt_send_msg (T_RVF_G_ADDR_ID addr_id, void *msg, UINT8 mbox) {
 	return _send_msg ( addr_id, msg, mbox, FALSE); 
 }
-
-
--- a/nuc-fw/riviera/rvf/rvf_task.c	Wed Oct 30 23:19:21 2013 +0000
+++ b/nuc-fw/riviera/rvf/rvf_task.c	Thu Oct 31 00:17:12 2013 +0000
@@ -20,17 +20,16 @@
 /* (C) Copyright 1999 by Texas Instruments Incorporated, All Rights Reserved*/
 /****************************************************************************/
 
-#ifndef _WINDOWS
-	#include "config/rv.cfg"
-#endif
-
-#include "nucleus.h" 
+#include "../../include/config.h"
 
-#include "rv/rv_general.h"
-#include "rvf/rvf_api.h"
-#include "rvf/rvf_i.h"			
-#include "rvm/rvm_i.h"	 /* ONLY for Task Codes */
-#include "rvm/rvm_use_id_list.h"
+#include "../rv/rv_general.h"
+#include "rvf_api.h"
+#include "rvf_i.h"			
+#include "../rvm/rvm_i.h"	 /* ONLY for Task Codes */
+#include "../rvm/rvm_use_id_list.h"
+
+#include "../../nucleus/nucleus.h"
+
 #include <stdio.h>
 #include <string.h>
 
@@ -874,6 +873,11 @@
 /* Declaration of ASM INT_Check_IRQ_Mask function */
 UINT32 INT_Check_IRQ_Mask(void);
 
+/*
+ * FreeCalypso: this assembly function will be moved out into
+ * its own source file, or maybe added to nucleus/tct.S.
+ */
+#if 0
 asm("           .def	$INT_Check_IRQ_Mask");
 asm("$INT_Check_IRQ_Mask  ");			    
 asm("           .ref _INT_32_Check_IRQ_Mask");
@@ -888,7 +892,7 @@
 
 asm("	MRS	r0,CPSR  ");   // pick up CPSR 
 asm("	BX	lr  ");        // return to caller
-
+#endif
 #endif
 
 
@@ -1171,4 +1175,3 @@
 	if(pRtAddrIdTable[rvf_get_taskid()]->type_code==ET2_HOST_TASK) return 1;
 	else return 0;
 }
-
--- a/nuc-fw/riviera/rvf/rvf_time.c	Wed Oct 30 23:19:21 2013 +0000
+++ b/nuc-fw/riviera/rvf/rvf_time.c	Thu Oct 31 00:17:12 2013 +0000
@@ -18,13 +18,16 @@
 /* (C) Copyright 1999 by Texas Instruments Incorporated, All Rights Reserved*/
 /****************************************************************************/
 
-#include "nucleus.h" 
+#include "../../include/config.h"
 
-#include "rvm/rvm_use_id_list.h"
-#include "rvm/rvm_i.h"	// only for MBs [coupling issue]
-#include "rvm/rvm_api.h"// MSG			[coupling issue]
-#include "rvf/rvf_i.h"
-#include "rvf/rvf_api.h"
+#include "../rvm/rvm_use_id_list.h"
+#include "../rvm/rvm_i.h"	// only for MBs [coupling issue]
+#include "../rvm/rvm_api.h"	// MSG		[coupling issue]
+#include "rvf_i.h"
+#include "rvf_api.h"
+
+#include "../../nucleus/nucleus.h"
+
 #include <string.h>
 
 
@@ -612,12 +615,3 @@
 	{	return NULL;
 	}
 }
-
-
-
-
-
-
-
-
-
--- a/nuc-fw/riviera/rvf/rvf_trace_adapt.c	Wed Oct 30 23:19:21 2013 +0000
+++ b/nuc-fw/riviera/rvf/rvf_trace_adapt.c	Thu Oct 31 00:17:12 2013 +0000
@@ -16,20 +16,16 @@
 /* (C) Copyright 1999 by Texas Instruments Incorporated, All Rights Reserved*/
 /****************************************************************************/
 
-
-#ifndef _WINDOWS
-	#include "config/rv.cfg"
-	#include "config/trace.cfg"
-#endif
+#include "../../include/config.h"
 
-#include "rv/general.h"
-#include "rv/rv.h"
-#include "rv/rv_general.h"
-#include "rvf/rvf_api.h"
+#include "../rv/general.h"
+#include "../rv/rv.h"
+#include "../rv/rv_general.h"
+#include "rvf_api.h"
 
-#include "rvt/rvt_gen.h"
+#include "../rvt/rvt_gen.h"
 
-#include "rvm/rvm_use_id_list.h"
+#include "../rvm/rvm_use_id_list.h"
 
 #include <string.h>
 
@@ -44,6 +40,19 @@
 //	extern T_DAR_ENV_CTRL_BLK *dar_gbl_var_p;
 //#endif
 
+/*
+ * FreeCalypso: the configuration we've got with the Sotomodem semi-src
+ * has this in g23m/__out__/gsm_<blah>/config/trace.cfg:
+ */
+
+#define LAYER_DBG 0xFFFFFFFF
+#define TRACE_LEVEL_FILTER 5
+
+/*
+ * The above configuration corresponds to all trace output
+ * being enabled by default.
+ */
+
 UINT8 rvf_trace_level = TRACE_LEVEL_FILTER;
 UINT32 rvf_layer_mask = LAYER_DBG;
 
--- a/nuc-fw/riviera/rvt/rvt_gen.h	Wed Oct 30 23:19:21 2013 +0000
+++ b/nuc-fw/riviera/rvt/rvt_gen.h	Thu Oct 31 00:17:12 2013 +0000
@@ -20,7 +20,7 @@
 #ifndef __RVT_GEN_H__
 #define __RVT_GEN_H__
 
-#include "rv/general.h"
+#include "../rv/general.h"
 
 /*
 ** If TRACE_MODULE is defined, the trace is using the trace task API.
@@ -111,4 +111,4 @@
 rvt_mem_free(T_RVT_BUFFER msg);
 
 
-#endif
\ No newline at end of file
+#endif