changeset 326:7e878e6b9cf7

gsm-fw/gpf/tst_drv: tif2.c compiles
author Michael Spacefalcon <msokolov@ivan.Harhan.ORG>
date Sat, 19 Apr 2014 05:23:11 +0000
parents ffb0442ffccf
children 05874f1ddacb
files gsm-fw/gpf/tst_drv/iram/Makefile gsm-fw/gpf/tst_drv/tif2.c gsm-fw/gpf/tst_drv/xip/Makefile
diffstat 3 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/gsm-fw/gpf/tst_drv/iram/Makefile	Sat Apr 19 00:18:44 2014 +0000
+++ b/gsm-fw/gpf/tst_drv/iram/Makefile	Sat Apr 19 05:23:11 2014 +0000
@@ -3,7 +3,7 @@
 CPPFLAGS=-I../../inc -DRUN_INT_RAM
 VPATH=	..
 
-OBJS=	ser_tr.o titrc.o
+OBJS=	ser_tr.o tif2.o titrc.o
 
 all:	${OBJS}
 
--- a/gsm-fw/gpf/tst_drv/tif2.c	Sat Apr 19 00:18:44 2014 +0000
+++ b/gsm-fw/gpf/tst_drv/tif2.c	Sat Apr 19 05:23:11 2014 +0000
@@ -21,14 +21,17 @@
 #define __TIF_C__
 #endif
 
+#include <string.h>
+#include "gpfconf.h"
 #include "typedefs.h"
-#include "string.h"
 #include "gdi.h"
 #include "vsi.h"
 #include "tools.h"
 #include "glob_defs.h"
+#if 0	// FreeCalypso
 #include "ccdtable.h"
 #include "ccddata.h"
+#endif
 #include "pcon.h"
 #include "p_mem.h"
 #include "drvconf.h"
@@ -956,7 +959,7 @@
            */
           if (CorruptByteOffset)
           {
-            s_hdr->time = NULL;
+            s_hdr->time = 0;	/* FreeCalypso: changed from NULL */
 #ifndef _TOOLS_
             memcpy ( s_hdr->snd, "~TST", 4 );
             memcpy ( s_hdr->rcv, FRM_TST_NAME, 4 );
--- a/gsm-fw/gpf/tst_drv/xip/Makefile	Sat Apr 19 00:18:44 2014 +0000
+++ b/gsm-fw/gpf/tst_drv/xip/Makefile	Sat Apr 19 05:23:11 2014 +0000
@@ -3,7 +3,7 @@
 CPPFLAGS=-I../../inc -DRUN_FLASH
 VPATH=	..
 
-OBJS=	ser_tr.o titrc.o tr2.o
+OBJS=	ser_tr.o tif2.o titrc.o tr2.o
 
 all:	${OBJS}