# HG changeset patch
# User Mychaela Falconia <falcon@freecalypso.org>
# Date 1579471468 0
# Node ID 9029c222c42679ff8eb47175d766d8dec8b6b32c
# Parent  5e1436690fe302814212d30653fd03181d9e59f0
sync with Magnetite: DTR handling and pcmdata.c +CGxx defaults

diff -r 5e1436690fe3 -r 9029c222c426 src/cs/drivers/drv_app/ffs/board/pcmdata.c
--- a/src/cs/drivers/drv_app/ffs/board/pcmdata.c	Sat Jan 04 22:59:51 2020 +0000
+++ b/src/cs/drivers/drv_app/ffs/board/pcmdata.c	Sun Jan 19 22:04:28 2020 +0000
@@ -26,6 +26,7 @@
   #include "rv/general.h"
   #include "swconfig.cfg"
   #include "sys.cfg"
+  #include "fc-target.h"
 #endif
 
 #include "ffs/pcm.h" 
@@ -487,15 +488,16 @@
   /********************************************************************
    * Field MANUFACTURER - CGMI
    ********************************************************************/
-#if (OP_WCP == 1)
-  'T',    'e',    'x',    'a',    's',    ' ',    'I',    'n',
-  's',    't',    'r',    'u',    'm',    'e',    'n',    't',
-  's',    0xFF,   0xFF,   0xFF, 
+#if 1
+  'F',    'r',    'e',    'e',    'C',    'a',    'l',    'y',
+  'p',    's',    'o',    0xFF,   0xFF,   0xFF,   0xFF,   0xFF,
+  0xFF,   0xFF,   0xFF,   0xFF, 
 #else
   '<',    'm',    'a',    'n',    'u',    'f',    'a',    'c',
   't',    'u',    'r',    'e',    'r',    '>',    0xFF,   0xFF,
   0xFF,   0xFF,   0xFF,   0xFF, 
 #endif
+
   /********************************************************************
    * Field IDENTIFICATION INFORMATION - INF0
    ********************************************************************/
@@ -512,8 +514,12 @@
   /********************************************************************
    * Field MODEL - CGMM
    ********************************************************************/
-#if (OP_WCP == 1)
-  'O',    'M',    'A',    'P',    '7',    '1',    '0',    0xFF,
+#ifdef CONFIG_TARGET_GTM900
+  'G',    'T',    'M',    '9',    '0',    '0',    '-',    'F',
+  'C',    0xFF,   0xFF,   0xFF,   0xFF,   0xFF,   0xFF,   0xFF,
+  0xFF,   0xFF,   0xFF,   0xFF,
+#elif defined(CONFIG_TARGET_TANGO)
+  'T',    'a',    'n',    'g',    'o',    0xFF,   0xFF,   0xFF,
   0xFF,   0xFF,   0xFF,   0xFF,   0xFF,   0xFF,   0xFF,   0xFF,
   0xFF,   0xFF,   0xFF,   0xFF,
 #else
@@ -525,15 +531,10 @@
   /********************************************************************
    * Field REVISION - CGMR
    ********************************************************************/
-#if (OP_WCP == 1)
-  '1',    '4',    '0',     '.',    '5',    '4',    '2',    '.',
-  '8',    '2',    '7',    0xFF,    0xFF,   0xFF,   0xFF,   0xFF,
-  0xFF,   0xFF,   0xFF,   0xFF,
-#else
   '<',    'r',    'e',    'v',    'i',    's',    'i',    'o',
   'n',    '>',    0xFF,   0xFF,   0xFF,   0xFF,   0xFF,   0xFF,
   0xFF,   0xFF,   0xFF,   0xFF,
-#endif
+
   /********************************************************************
    * Field PRODUCT SERIAL NUMBER - CGSN
    ********************************************************************/
diff -r 5e1436690fe3 -r 9029c222c426 src/cs/drivers/drv_core/inth/niq32.c
--- a/src/cs/drivers/drv_core/inth/niq32.c	Sat Jan 04 22:59:51 2020 +0000
+++ b/src/cs/drivers/drv_core/inth/niq32.c	Sun Jan 19 22:04:28 2020 +0000
@@ -30,6 +30,7 @@
 #include "board.cfg"
 #include "rf.cfg"
 #include "swconfig.cfg"
+#include "fc-target.h"
 
 #if(OP_L1_STANDALONE == 0)
   #include "debug.cfg"
@@ -163,9 +164,7 @@
    SER_uart_modem_handler, /* AIRQ 7 */
 #endif
 #if ((BOARD == 8) || (BOARD == 9) || (BOARD == 40) || (BOARD == 41))
-// CC test 0316
    IQ_KeypadGPIOHandler,   /* AIRQ 8 */
-// end
 #else
    IQ_KeypadHandler,       /* AIRQ 8 */
 #endif
@@ -539,11 +538,6 @@
 /* Return        : none                                            */
 /* Functionality : Handle keypad and GPIO interrupts          */
 /*--------------------------------------------------------------*/
-// CC test 0316
-//#include "rvm/rvm_use_id_list.h"
-//#include "rvf/rvf_api.h"
-//static char debug_buffer[50];
-// end
 
 void IQ_KeypadGPIOHandler(void)
 {
@@ -554,36 +548,23 @@
      * status bit is reset when the register is read.
      */
      
-    if (AI_CheckITSource (ARMIO_GPIO_INT))
-
-// CC test 0315
-{	       
-        AI_MaskIT (ARMIO_MASKIT_GPIO);
-//sprintf(debug_buffer, "GPIO_Interrupt");
-//rvf_send_trace(debug_buffer, 40, NULL_PARAM, RV_TRACE_LEVEL_ERROR, RVT_USE_ID);
-        AI_UnmaskIT(ARMIO_MASKIT_GPIO);       //0x0002  
-// end
-/*
+    if (AI_CheckITSource (ARMIO_GPIO_INT)) {	       
     #ifdef RVM_MPM_SWE
       // check if the SWE has been started
        MPM_InterruptHandler ();
     #elif BT_CLK_REQ_INT
-
       BT_DRV_ClkReqInterruptHandler( );
-    #else
+    #elif UARTFAX_CLASSIC_DTR_DCD
       UAF_DTRInterruptHandler ();
+    #else
+      AI_MaskIT(ARMIO_MASKIT_GPIO);
+      AI_UnmaskIT(ARMIO_MASKIT_GPIO);
     #endif
-*/    
-}
+    }
     if (AI_CheckITSource (ARMIO_KEYPDAD_INT))
     {
-// CC test 0316
-//sprintf(debug_buffer, "Key_Interrupt");
-//rvf_send_trace(debug_buffer, 40, NULL_PARAM, RV_TRACE_LEVEL_ERROR, RVT_USE_ID);
-// end
       kpd_key_handler ();
     }
-
  #endif
 }