# HG changeset patch
# User Space Falcon <falcon@ivan.Harhan.ORG>
# Date 1430008301 0
# Node ID 86364a58aa6ccc11abd7a9879fe50f445b71e899
# Parent  6620bb8e3fa5bde0c8dec8c150ba147c67eab21d
gsm-fw: gsmcomp gpf configuration enabled for CONFIG_GSM

diff -r 6620bb8e3fa5 -r 86364a58aa6c gsm-fw/gpf/conf/Makefile
--- a/gsm-fw/gpf/conf/Makefile	Sat Apr 25 22:44:14 2015 +0000
+++ b/gsm-fw/gpf/conf/Makefile	Sun Apr 26 00:31:41 2015 +0000
@@ -3,7 +3,13 @@
 CPPFLAGS=-I../inc
 LD=	arm-elf-ld
 
+sinclude ../../include/config.mk
+
+ifeq (${CONFIG_GSM},1)
+CONFIG_MODULE=	gsmcomp
+else
 CONFIG_MODULE=	barecomp
+endif
 
 OBJS=	gpf_misc_init.o gpf_tst_drv.o ${CONFIG_MODULE}.o
 
diff -r 6620bb8e3fa5 -r 86364a58aa6c gsm-fw/gpf/conf/gsmcomp.c
--- a/gsm-fw/gpf/conf/gsmcomp.c	Sat Apr 25 22:44:14 2015 +0000
+++ b/gsm-fw/gpf/conf/gsmcomp.c	Sun Apr 26 00:31:41 2015 +0000
@@ -18,6 +18,11 @@
 +-----------------------------------------------------------------------------
 */
 
+#include "../../include/config.h"
+#include "../../include/condat-features.h"
+#include "gpfconf.h"
+
+#define	CONFIG_MODULE	1
 
 #ifndef NEW_ENTITY
 #define NEW_ENTITY
@@ -25,7 +30,7 @@
 
 /*==== INCLUDES ===================================================*/
 
-#include "nucleus.h"
+#include "../../nucleus/nucleus.h"
 #include "typedefs.h"
 #include "os.h"
 #include "vsi.h"
@@ -260,7 +265,7 @@
 };
 #endif /* FF_WAP || FF_SAT_E */
 
- #ifdef BT_ADAPTER
+#ifdef BT_ADAPTER
 const T_COMPONENT_ADDRESS bti_list[] =
 {
   { bti_pei_create,      NULL,   ASSIGNED_BY_TI },
@@ -387,54 +392,27 @@
 #endif /* else, #ifdef FAX_AND_DATA */
 
 
-#ifndef DATA_INT_RAM
 #ifdef FAX_AND_DATA
 unsigned int MaxPrimPartSize = PRIM_PARTITION_3_SIZE;
 #else
 unsigned int MaxPrimPartSize = PRIM_PARTITION_5_SIZE;
 #endif
-#endif /* !DATA_INT_RAM */
 
-#if (!defined DATA_EXT_RAM && defined PRIM_0_INT_RAM) || (!defined DATA_INT_RAM && !defined PRIM_0_INT_RAM)
-char pool10 [ POOL_SIZE(PRIMPOOL_0_PARTITIONS,ALIGN_SIZE(PRIM_PARTITION_0_SIZE)) ];
-#else
-extern char pool10 [];
-#endif
+char pool10 [ POOL_SIZE(PRIMPOOL_0_PARTITIONS,ALIGN_SIZE(PRIM_PARTITION_0_SIZE)) ] __attribute__ ((section ("int.ram")));
 
-#if (!defined DATA_EXT_RAM && defined PRIM_1_INT_RAM) || (!defined DATA_INT_RAM && !defined PRIM_1_INT_RAM)
-char pool11 [ POOL_SIZE(PRIMPOOL_1_PARTITIONS,ALIGN_SIZE(PRIM_PARTITION_1_SIZE)) ];
-#else
-extern char pool11 [];
-#endif
+char pool11 [ POOL_SIZE(PRIMPOOL_1_PARTITIONS,ALIGN_SIZE(PRIM_PARTITION_1_SIZE)) ] __attribute__ ((section ("int.ram")));
 
-#if (!defined DATA_EXT_RAM && defined PRIM_2_INT_RAM) || (!defined DATA_INT_RAM && !defined PRIM_2_INT_RAM)
-char pool12 [ POOL_SIZE(PRIMPOOL_2_PARTITIONS,ALIGN_SIZE(PRIM_PARTITION_2_SIZE)) ];
-#else
-extern char pool12 [];
-#endif
+char pool12 [ POOL_SIZE(PRIMPOOL_2_PARTITIONS,ALIGN_SIZE(PRIM_PARTITION_2_SIZE)) ] __attribute__ ((section ("int.ram")));
 
-#if (!defined DATA_EXT_RAM && defined PRIM_3_INT_RAM) || (!defined DATA_INT_RAM && !defined PRIM_3_INT_RAM)
-char pool13 [ POOL_SIZE(PRIMPOOL_3_PARTITIONS,ALIGN_SIZE(PRIM_PARTITION_3_SIZE)) ];
-#else
-extern char pool13 [];
-#endif
+char pool13 [ POOL_SIZE(PRIMPOOL_3_PARTITIONS,ALIGN_SIZE(PRIM_PARTITION_3_SIZE)) ] __attribute__ ((section ("int.ram")));
 
 #ifndef FAX_AND_DATA
-#if (!defined DATA_EXT_RAM && defined PRIM_4_INT_RAM) || (!defined DATA_INT_RAM && !defined PRIM_4_INT_RAM)
-char pool14 [ POOL_SIZE(PRIMPOOL_4_PARTITIONS,ALIGN_SIZE(PRIM_PARTITION_4_SIZE)) ];
-#else
-extern char pool14 [];
-#endif
+char pool14 [ POOL_SIZE(PRIMPOOL_4_PARTITIONS,ALIGN_SIZE(PRIM_PARTITION_4_SIZE)) ] __attribute__ ((section ("int.ram")));
 
-#if (!defined DATA_EXT_RAM && defined PRIM_5_INT_RAM) || (!defined DATA_INT_RAM && !defined PRIM_5_INT_RAM)
-char pool15 [ POOL_SIZE(PRIMPOOL_5_PARTITIONS,ALIGN_SIZE(PRIM_PARTITION_5_SIZE)) ];
-#else
-extern char pool15 [];
-#endif
+char pool15 [ POOL_SIZE(PRIMPOOL_5_PARTITIONS,ALIGN_SIZE(PRIM_PARTITION_5_SIZE)) ] __attribute__ ((section ("int.ram")));
 #endif /* FAX_AND_DATA */
 
 
-#ifndef DATA_INT_RAM
 const T_FRM_PARTITION_POOL_CONFIG prim_grp_config[] =
 {
   { PRIMPOOL_0_PARTITIONS, ALIGN_SIZE(PRIM_PARTITION_0_SIZE), &pool10 },
@@ -447,7 +425,6 @@
 #endif
   { 0                    , 0                    , NULL	  }
 };
-#endif /* !DATA_INT_RAM */
 
 /*
  * Partitions pool configuration for test interface communication
@@ -468,32 +445,20 @@
 
 #define TEST_PARTITION_2_SIZE      0 /* 1600 */
 
-#ifndef DATA_INT_RAM
 const USHORT TST_SndQueueEntries    = TSTSND_QUEUE_ENTRIES;
 const USHORT TST_RcvQueueEntries    = TSTRCV_QUEUE_ENTRIES;
 const USHORT TextTracePartitionSize = TEST_PARTITION_1_SIZE;
-#endif /* !DATA_INT_RAM */
 
-#if (!defined DATA_EXT_RAM && defined TEST_0_INT_RAM) || (!defined DATA_INT_RAM && !defined TEST_0_INT_RAM)
-char pool20 [ POOL_SIZE(TESTPOOL_0_PARTITIONS,ALIGN_SIZE(TEST_PARTITION_0_SIZE)) ];
-#else
-extern char pool20 [];
-#endif
+char pool20 [ POOL_SIZE(TESTPOOL_0_PARTITIONS,ALIGN_SIZE(TEST_PARTITION_0_SIZE)) ] __attribute__ ((section ("ext.ram")));
 
-#if (!defined DATA_EXT_RAM && defined TEST_1_INT_RAM) || (!defined DATA_INT_RAM && !defined TEST_1_INT_RAM)
-char pool21 [ POOL_SIZE(TESTPOOL_1_PARTITIONS,ALIGN_SIZE(TEST_PARTITION_1_SIZE)) ];
-#else
-extern char pool21 [];
-#endif
+char pool21 [ POOL_SIZE(TESTPOOL_1_PARTITIONS,ALIGN_SIZE(TEST_PARTITION_1_SIZE)) ] __attribute__ ((section ("ext.ram")));
 
-#ifndef DATA_INT_RAM
 const T_FRM_PARTITION_POOL_CONFIG test_grp_config[] =
 {
   { TESTPOOL_0_PARTITIONS, ALIGN_SIZE(TEST_PARTITION_0_SIZE), &pool20 },
   { TESTPOOL_1_PARTITIONS, ALIGN_SIZE(TEST_PARTITION_1_SIZE), &pool21 },
   { 0                    , 0                    , NULL	  }
 };
-#endif /* !DATA_INT_RAM */
 
 /*
  * Partitions pool configuration for general purpose allocation
@@ -507,25 +472,18 @@
 
 #define DMEMPOOL_0_PARTITIONS     50 /* 10 */ /* In GPRS this is 70 */
 
-#if (!defined DATA_EXT_RAM && defined DMEM_0_INT_RAM) || (!defined DATA_INT_RAM && !defined DMEM_0_INT_RAM)
-char pool30 [ POOL_SIZE(DMEMPOOL_0_PARTITIONS,ALIGN_SIZE(DMEM_PARTITION_0_SIZE)) ];
-#else
-extern char pool30 [];
-#endif
+char pool30 [ POOL_SIZE(DMEMPOOL_0_PARTITIONS,ALIGN_SIZE(DMEM_PARTITION_0_SIZE)) ] __attribute__ ((section ("ext.ram")));
 
-#ifndef DATA_INT_RAM
 const T_FRM_PARTITION_POOL_CONFIG dmem_grp_config[] =
 {
   { DMEMPOOL_0_PARTITIONS, ALIGN_SIZE(DMEM_PARTITION_0_SIZE), &pool30 },
   { 0                    , 0                    , NULL	  }
 };
-#endif /* !DATA_INT_RAM */
 
 /*
  * Partitions group list
  */
 
-#ifndef DATA_INT_RAM
 const T_FRM_PARTITION_GROUP_CONFIG partition_grp_config[MAX_POOL_GROUPS+1] =
 {
   { "PRIM", &prim_grp_config[0] },
@@ -545,7 +503,6 @@
   &DmemGroupHandle,
   NULL
 };
-#endif /* !DATA_INT_RAM */
 
 /*
  * Dynamic Memory Pool Configuration
@@ -591,11 +548,8 @@
 #define EXT_DATA_POOL_SIZE      (EXT_DATA_POOL_PS_SIZE + EXT_DATA_POOL_GPF_SIZE)
 #define INT_DATA_POOL_SIZE      (INT_DATA_POOL_PS_SIZE)
 
-#ifndef DATA_INT_RAM
-char ext_data_pool              [ EXT_DATA_POOL_SIZE ];
-#endif
-
-#ifndef DATA_INT_RAM
+char ext_data_pool              [ EXT_DATA_POOL_SIZE ]
+					__attribute__ ((section ("ext.ram")));
 
 const T_MEMORY_POOL_CONFIG memory_pool_config[MAX_MEMORY_POOLS+1] =
 {
@@ -610,5 +564,3 @@
   &ext_data_pool_handle,
   NULL
 };
-
-#endif /* !DATA_INT_RAM */