# HG changeset patch
# User Michael Spacefalcon <msokolov@ivan.Harhan.ORG>
# Date 1409761931 0
# Node ID c07f9df9f6afcd5ccaa64e707eb1fbb4578e16a6
# Parent  0b5f226bfdf4feb56a0fb1fabc7fc2fbabadeed0
gsm-fw/services/pcm/pcm.h: basic preen

diff -r 0b5f226bfdf4 -r c07f9df9f6af gsm-fw/services/pcm/pcm.h
--- a/gsm-fw/services/pcm/pcm.h	Wed Sep 03 16:26:27 2014 +0000
+++ b/gsm-fw/services/pcm/pcm.h	Wed Sep 03 16:32:11 2014 +0000
@@ -12,16 +12,7 @@
 #ifndef DEF_PCM
 #define DEF_PCM
 
-#ifndef TARGET
-  #include "ffs.cfg"
-#endif
-
-#if (TARGET == 1)
-  #include "rv/general.h"
-#else
-  typedef unsigned char  UBYTE;
-  typedef unsigned short USHORT;
-#endif
+#include "../../riviera/rv/general.h"
 
 #define LEN_MSCAP    (NR_EF_MSCAP    * SIZE_EF_MSCAP)    + 2
 #define LEN_IMEI     (NR_EF_IMEI     * SIZE_EF_IMEI)     + 2
@@ -825,7 +816,7 @@
 typedef struct pcm_EFhzcache_Type
 {
     UBYTE 			cid[2];				
-	UBYTE			zone;
+    UBYTE			zone;
 } EF_HZCACHE;
 
 #define SIZE_EF_HZCACHE 3