--- a/gsm-fw/bsp/abb+spi/abb.h	Sat Nov 16 19:03:37 2013 +0000
+++ b/gsm-fw/bsp/abb+spi/abb.h	Sat Nov 16 19:41:30 2013 +0000
@@ -30,36 +30,24 @@
 #ifndef __ABB_H__
 #define __ABB_H__
 
-#include "l1sw.cfg"
-
-#if (OP_L1_STANDALONE == 0)
-  #include "main/sys_types.h"
-#else
-  #include "sys_types.h"
-#endif
-
+#include "../../include/config.h"
+#include "../../include/sys_types.h"
 
 #ifndef _WINDOWS
 
-
-#include "chipset.cfg"
-
-
-
-
 /*------------------------------------*/
 /* SYREN PG Definition                */
 /*------------------------------------*/
 
-#if (ANLG_FAM == 3)   // SYREN
+#if (ANALOG == 3)   // SYREN
     #define S_PG_10      1
     #define S_PG_20      2
-#endif  // (ANLG_FAM == 3)
+#endif  // (ANALOG == 3)
 
 
 
 // DEFINITIONS FOR OMEGA/NAUSICA
-#if (ANLG_FAM == 1)
+#if (ANALOG == 1)
   // ABB PAGE
   #define PAGE0	0x0001
   #define PAGE1	0x0002
@@ -187,7 +175,7 @@
 
 
 // DEFINITIONS FOR IOTA
-#elif (ANLG_FAM == 2)
+#elif (ANALOG == 2)
   // ABB PAGE
   #define PAGE0	0x0001
   #define PAGE1	0x0002
@@ -354,7 +342,7 @@
 
 
 // DEFINITIONS FOR SYREN
-#elif (ANLG_FAM == 3)
+#elif (ANALOG == 3)
 
   // ABB PAGE
   #define PAGE0	0x0001
@@ -549,7 +537,7 @@
   #define MAIN_BG        0x01,
   #define SLEEP_BG       0x00
 
-#endif	  // ANLG_FAM == 1,2,3
+#endif	  // ANALOG == 1,2,3
 
 
 // Define the level of semaphore protection for all accesses to the ABB
@@ -585,7 +573,7 @@
 #if (OP_L1_STANDALONE == 0)
 void ABB_Power_Off(void);
 #endif
-#if (ANLG_FAM ==3)
+#if (ANALOG ==3)
   void Syren_Sleep_Config(SYS_UWORD16 sleep_type,SYS_UWORD16 bg_select, SYS_UWORD16 sleep_delay);
 #endif