--- 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;