From af4dbbdb3d2e1a1c10f4cfeafef529a5929531d8 Mon Sep 17 00:00:00 2001
From: "xinxin.li" <xinxin.li@263.com>
Date: Mon, 1 Apr 2024 16:01:54 +0800
Subject: [PATCH] > 1. fix UCP4008_SL feature enhancement #1792; > 2. delete
 pp1s scratch of jesd timer rx1; > 3. delete the process of resetting jesd
 timer rx1 when gps locked.

---
 public/ecs_rfm_spu1/driver/src/jesd_timer.s.c | 3 ++-
 public/ecs_rfm_spu1/driver/src/mtimer_cal.s.c | 7 ++++---
 public/ecs_rfm_spu1/driver/src/rfm1_drv.s.c   | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/public/ecs_rfm_spu1/driver/src/jesd_timer.s.c b/public/ecs_rfm_spu1/driver/src/jesd_timer.s.c
index e6519db..cff5786 100644
--- a/public/ecs_rfm_spu1/driver/src/jesd_timer.s.c
+++ b/public/ecs_rfm_spu1/driver/src/jesd_timer.s.c
@@ -1245,7 +1245,8 @@ void jesd_10ms_callback(uint8_t nTmrId)
 					pMtimerInt->tmrPP1sCost = GET_STC_CNT();
 				}
 
-				if (MTIMER_JESD_RX1_ID == nTmrId)
+				//if (MTIMER_JESD_RX1_ID == nTmrId)
+				if (MTIMER_JESD_RX0_ID == nTmrId)
 				{
 					mtimer_orx_adjust();
 				}
diff --git a/public/ecs_rfm_spu1/driver/src/mtimer_cal.s.c b/public/ecs_rfm_spu1/driver/src/mtimer_cal.s.c
index ea72558..437e21d 100644
--- a/public/ecs_rfm_spu1/driver/src/mtimer_cal.s.c
+++ b/public/ecs_rfm_spu1/driver/src/mtimer_cal.s.c
@@ -46,11 +46,12 @@ void mtimer_1pps_resync(uint8_t nTmrId)
 	if (PROTOCOL_JESD == nBsType)
 	{
 		stop_jesd_timer(nTmrId);
-		stop_jesd_timer(nTmrId+1);
+		//stop_jesd_timer(nTmrId+1);
 		stop_jesd_timer(nTmrId+2);
 		stop_jesd_timer(nTmrId+3);
+		__ucps2_synch(0);
 		start_jesd_timer(nTmrId);
-		start_jesd_timer(nTmrId+1);
+		//start_jesd_timer(nTmrId+1);
 		start_jesd_timer(nTmrId+2);
 		start_jesd_timer(nTmrId+3);
 	}
@@ -59,8 +60,8 @@ void mtimer_1pps_resync(uint8_t nTmrId)
 		gCpriIntStatus.cpriSyncFlag = 0;
 		stop_cpri_timer();
 		stop_ecpri_timer();
-		//set_cpri_tx_rfp();
 		set_cpri_tmr_ctrl();
+		__ucps2_synch(0);
 		start_cpri_timer();
 		start_ecpri_timer();
 		stCpriDelayMeasure* pCpriDelay = pEcsDmLocalMgt->pCpriDelay;
diff --git a/public/ecs_rfm_spu1/driver/src/rfm1_drv.s.c b/public/ecs_rfm_spu1/driver/src/rfm1_drv.s.c
index e644703..d1cea76 100644
--- a/public/ecs_rfm_spu1/driver/src/rfm1_drv.s.c
+++ b/public/ecs_rfm_spu1/driver/src/rfm1_drv.s.c
@@ -224,7 +224,7 @@ int32_t set_mtimer_scratch_tod()
 	else if (PROTOCOL_JESD == protocolSel)
 	{
 		set_jesd_1pps_scratch(0);
-		set_jesd_1pps_scratch(1);
+		//set_jesd_1pps_scratch(1);
 	}
 	else
 	{