--- a/gsm-fw/services/etm/etm_misc.h	Mon Nov 18 06:39:44 2013 +0000
+++ b/gsm-fw/services/etm/etm_misc.h	Tue Nov 19 04:23:29 2013 +0000
@@ -25,28 +25,19 @@
  * Usefull Header 
  *****************************************************************************/
 
-#ifndef _WINDOWS
-#include "swconfig.cfg"
-#include "sys.cfg"
-#include "chipset.cfg"
-//#include "testmode.cfg"
-#endif
+#include "etm_config.h"
 
-#include "l1_confg.h"
+#include "../../L1/include/l1_confg.h"
 
 /* Riviera useful header */
-#include "rv/rv_general.h"
-#include "rvm/rvm_gen.h"
-#include "rvf/rvf_target.h"
-#include "rvf/rvf_api.h"
-#include "rvt/rvt_gen.h"
+#include "../../riviera/rv/rv_general.h"
+#include "../../riviera/rvm/rvm_gen.h"
+#include "../../riviera/rvf/rvf_target.h"
+#include "../../riviera/rvf/rvf_api.h"
+#include "../../riviera/rvt/rvt_gen.h"
 
-
+#if 0	// FreeCalypso
 /* include the usefull L1 header */
-#ifdef _WINDOWS
-#define BOOL_FLAG
-#define CHAR_FLAG
-#endif
 
 #include "l1_types.h"
 #include "l1audio_const.h"
@@ -68,19 +59,16 @@
 #include "l1_msgty.h"
 #include "l1_signa.h"
 
-#ifdef _WINDOWS
-#define L1_ASYNC_C
-#endif
-
 #include "l1_varex.h"
 
+#endif
 
 /******************************************************************************
  * Defines 
  *****************************************************************************/
 
 #define TM3_PACKET_SIZE 128
-#define ETM_PACEKT_SIZE 256
+#define ETM_PACKET_SIZE 256
 
 // This is the return TM3 packet structure
 // HACK! - taken from l1tm_msgty.h
@@ -101,7 +89,7 @@
     int index;           // index into data[] - for put()/get() functions
     unsigned char  mid;
     unsigned char  status;
-    unsigned char  data[ETM_PACEKT_SIZE]; // include cksum
+    unsigned char  data[ETM_PACKET_SIZE]; // include cksum
 } T_ETM_PKT;