# HG changeset patch
# User Michael Spacefalcon <msokolov@ivan.Harhan.ORG>
# Date 1409765481 0
# Node ID e60f51f747f52fe63c4eb923cc1e16badebb4634
# Parent  aed920085e5979d272ef94f01727f184c9ada84e
PCM integration: pcmdata.c compiles

diff -r aed920085e59 -r e60f51f747f5 gsm-fw/services/pcm/Makefile
--- a/gsm-fw/services/pcm/Makefile	Wed Sep 03 17:21:42 2014 +0000
+++ b/gsm-fw/services/pcm/Makefile	Wed Sep 03 17:31:21 2014 +0000
@@ -2,7 +2,7 @@
 CFLAGS=	-O2 -fno-builtin -mthumb-interwork -mthumb
 LD=	arm-elf-ld
 
-OBJS=	pcmcode.o
+OBJS=	pcmcode.o pcmdata.o
 
 HDRS=	pcm.h
 
diff -r aed920085e59 -r e60f51f747f5 gsm-fw/services/pcm/pcmdata.c
--- a/gsm-fw/services/pcm/pcmdata.c	Wed Sep 03 17:21:42 2014 +0000
+++ b/gsm-fw/services/pcm/pcmdata.c	Wed Sep 03 17:31:21 2014 +0000
@@ -18,18 +18,12 @@
 
 #define NEQ !=
 
-#ifndef TARGET
-  #include "ffs.cfg"
-#endif
+#include "../../include/config.h"
+#include "../../riviera/rv/general.h"
+#include "pcm.h" 
 
-#if (TARGET == 1)
-  #include "rv/general.h"
-  #include "swconfig.cfg"
-  #include "sys.cfg"
-#endif
-
-#include "ffs/pcm.h" 
-
+/* FreeCalypso configuration */
+#define	STD	6
 
 /*==== VARIABLES ==================================================*/
 /*
@@ -38,7 +32,7 @@
 
 UBYTE pcm_mem [PCM_SIZE];
 
-UBYTE std;
+UBYTE std = STD;
 // set treshold for initial power measurements (= -106 dBm)
 USHORT min_rxlev = 20;
 
@@ -626,5 +620,3 @@
   0xF1,   0xFF,   0xFF,   0xFF,   0xFF,   0xFF,   0xFF,   0xFF
         
 }; 
-
-