Merge pull request #20 from SPRESENSE/merge-v2.0.2-develop

Merge tag v2.0.2 for develop
SPRESENSE · Dec 17, 2020 · a3788a3 · a3788a3
2 parents aeaed6a + 30f4ea2
commit a3788a3
Show file tree

Hide file tree

Showing 19 changed files with 740 additions and 523 deletions.
diff --git a/arch/arm/include/cxd56xx/gnss.h b/arch/arm/include/cxd56xx/gnss.h
@@ -565,7 +565,7 @@ extern "C"
 #define CXD56_GNSS_IOCTL_INVAL 0
 #define CXD56_GNSS_IOCTL_MAX   54
 
-/* Same value to GD Start mode CXD56_GNSS_STMOD_XXXX for GD_Start */
+/* Same value to GD Start mode CXD56_GNSS_STMOD_XXXX for fw_gd_start */
 
 #define CXD56_GNSS_STMOD_COLD       0 /* Cold Start */
 #define CXD56_GNSS_STMOD_WARM       1 /* Warm Start */

diff --git a/arch/arm/src/cxd56xx/cxd56_adc.c b/arch/arm/src/cxd56xx/cxd56_adc.c
@@ -126,7 +126,7 @@
 
 /* Input Gain setting */
 
-#define INPUT_GAIN(a, g2, g1) (((a) << 24) | ((g2) << 16) | ((g1) << 12))
+#define INPUT_GAIN(a, g1, g2) (((a) << 24) | ((g2) << 16) | ((g1) << 12))
 #define INPUT_GAIN_MASK         INPUT_GAIN(3, 15, 15)
 #define INPUT_GAIN_MINUS_6DB    INPUT_GAIN(2, 0, 0)
 #define INPUT_GAIN_THROUGH      INPUT_GAIN(0, 0, 0)

diff --git a/arch/arm/src/cxd56xx/cxd56_farapi.c b/arch/arm/src/cxd56xx/cxd56_farapi.c
@@ -55,7 +55,7 @@
 #include "cxd56_farapistub.h"
 #include "hardware/cxd5602_backupmem.h"
 
-int PM_WakeUpCpu(int cpuid);
+int fw_pm_wakeupcpu(int cpuid);
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -209,7 +209,7 @@ void farapi_main(int id, void *arg, struct modulelist_s *mlist)
       if (((gnscken & GNSDSP_CKEN_P1) != GNSDSP_CKEN_P1) &&
           ((gnscken & GNSDSP_CKEN_COP) != GNSDSP_CKEN_COP))
         {
-          PM_WakeUpCpu(GPS_CPU_ID);
+          fw_pm_wakeupcpu(GPS_CPU_ID);
         }
     }
 #endif