# HG changeset patch
# User Michael Spacefalcon <msokolov@ivan.Harhan.ORG>
# Date 1411878341 0
# Node ID 643379e7e141a3cc72ae9aab0c6ddf7c5206bdaa
# Parent  a712c95b60c1e276b02277152feb027dd5ce0089
gsm-fw/include/condat: initial round of fixes

diff -r a712c95b60c1 -r 643379e7e141 gsm-fw/include/condat/cl_imei.h
--- a/gsm-fw/include/condat/cl_imei.h	Sun Sep 28 01:14:48 2014 +0000
+++ b/gsm-fw/include/condat/cl_imei.h	Sun Sep 28 04:25:41 2014 +0000
@@ -36,15 +36,15 @@
   /* Chipset Type          Value          Value name
    * Gemini/Pole Star        0              _ge
    * Hercules                2              _he
- 	 * Ulysse                  3              _ul
-	 * Samson                  4              _sa
-	 * Ulysse G1 13MHz         5              _g1_13
-	 * Ulysse G1 26MHz         6              _g1_26
-	 * Calypso C05 (rev. A)    7              _cal
+   * Ulysse                  3              _ul
+   * Samson                  4              _sa
+   * Ulysse G1 13MHz         5              _g1_13
+   * Ulysse G1 26MHz         6              _g1_26
+   * Calypso C05 (rev. A)    7              _cal
    * Calypso C05 (rev. B)    8              _calb
-	 * Ulysse C035             9              _ul35
-	 * Calypso C035            10             _cal35
-	 * Calypso C035 Lite       11             _lite
+   * Ulysse C035             9              _ul35
+   * Calypso C035            10             _cal35
+   * Calypso C035 Lite       11             _lite
    * Calypso+                12             _cplus
    */
 /******************************************************************************
diff -r a712c95b60c1 -r 643379e7e141 gsm-fw/include/condat/custom.h
--- a/gsm-fw/include/condat/custom.h	Sun Sep 28 01:14:48 2014 +0000
+++ b/gsm-fw/include/condat/custom.h	Sun Sep 28 04:25:41 2014 +0000
@@ -546,7 +546,7 @@
 
 #define T_PRIM_HEADER_DEFINED
 
-#ifdef _TMS470
+#if 1 //#ifdef _TMS470
 
 typedef struct
 {
diff -r a712c95b60c1 -r 643379e7e141 gsm-fw/include/condat/dspl.h
--- a/gsm-fw/include/condat/dspl.h	Sun Sep 28 01:14:48 2014 +0000
+++ b/gsm-fw/include/condat/dspl.h	Sun Sep 28 04:25:41 2014 +0000
@@ -333,5 +333,5 @@
 //-ion of the global variable is moved inside this function and also adopted 
 //for the new LCD API migration
 EXTERN int	dspl_control(int state);
-	
+
 #endif
diff -r a712c95b60c1 -r 643379e7e141 gsm-fw/include/condat/dti.h
--- a/gsm-fw/include/condat/dti.h	Sun Sep 28 01:14:48 2014 +0000
+++ b/gsm-fw/include/condat/dti.h	Sun Sep 28 04:25:41 2014 +0000
@@ -44,12 +44,12 @@
 /*
  *  Use SAP DTI2.DOC
  */
-#include "P_DTI2.h"
+#include "p_dti2.h"
 #else
 /*
  *  Make this code compatible to SAP dti.doc.
  */
-#include "P_DTI.h"
+#include "p_dti.h"
 
 #define T_DTI2_DATA_IND      T_DTI_DATA_IND
 #define T_DTI2_DATA_REQ      T_DTI_DATA_REQ
diff -r a712c95b60c1 -r 643379e7e141 gsm-fw/include/condat/ffs_coat.h
--- a/gsm-fw/include/condat/ffs_coat.h	Sun Sep 28 01:14:48 2014 +0000
+++ b/gsm-fw/include/condat/ffs_coat.h	Sun Sep 28 04:25:41 2014 +0000
@@ -20,11 +20,7 @@
 #ifndef FFS_COAT_H
 #define FFS_COAT_H
 
-#if defined(_TMS470)
 #define FFS_COAT_ENABLED
-#endif  /* _TMS470 */
-
-#undef FFS_COAT_ENABLED
 
 #if defined(FFS_COAT_ENABLED)
 #ifdef TI_PS_HCOMM_CHANGE
diff -r a712c95b60c1 -r 643379e7e141 gsm-fw/include/condat/gsm.h
--- a/gsm-fw/include/condat/gsm.h	Sun Sep 28 01:14:48 2014 +0000
+++ b/gsm-fw/include/condat/gsm.h	Sun Sep 28 04:25:41 2014 +0000
@@ -151,7 +151,7 @@
 #define NEW_BUFFER(p,s)    UBYTE buf_##p [(s)+sizeof(T_PRIM_HEADER)]; T_PRIM *p=(T_PRIM*)p1
 #endif
 
-#if !defined (_TMS470)
+#if 0 //!defined (_TMS470)
 #define Sprintf sprintf
 #else
 int sprintf( char *buffer, const char *format, ... );
@@ -159,7 +159,7 @@
 
 #ifndef NEW_FRAME
 
-#ifdef _TMS470
+#if 1 //#ifdef _TMS470
   #define SET_PRIM_OPCODE(P,O) P->custom.opc = O; P->custom.opc2 = 0
 #else
   #define SET_PRIM_OPCODE(P,O) P->custom.opc = O
@@ -424,7 +424,7 @@
 #ifdef OPTION_TIMER
 #define TSTART(i,h,v) tim_start_timer(i,h,v)
 #else
-#define TSTART(i,h,v) TIMER_START(VSI_CALLER h,v)
+#define TSTART(i,h,v) vsi_t_start(VSI_CALLER h,v)
 #endif
 
 #ifdef OPTION_RELATIVE