mirror of https://github.com/ARMmbed/mbed-os.git
				
				
				
			Merge pull request #8400 from AdamZhang0124/realtek-rtl8195am-usticker-patch
This PR retrieves the TimerSync function to fix the lockup issuepull/8249/head
						commit
						8a5b9ff893
					
				
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							| 
						 | 
					@ -97,7 +97,7 @@ void us_ticker_set_interrupt(timestamp_t timestamp)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    HalTimerOp.HalTimerDis((u32)TimerAdapter.TimerId);
 | 
					    HalTimerOp.HalTimerDis((u32)TimerAdapter.TimerId);
 | 
				
			||||||
    HalTimerOpExt.HalTimerReLoad((u32)TimerAdapter.TimerId, TimerAdapter.TimerLoadValueUs);
 | 
					    HalTimerOpExt.HalTimerReLoad((u32)TimerAdapter.TimerId, TimerAdapter.TimerLoadValueUs);
 | 
				
			||||||
    //HalTimerOpExt.HalTimerSync(SYS_TIM_ID);
 | 
					    HalTimerOpExt.HalTimerSync(SYS_TIM_ID);
 | 
				
			||||||
    HalTimerOp.HalTimerEn((u32)TimerAdapter.TimerId);
 | 
					    HalTimerOp.HalTimerEn((u32)TimerAdapter.TimerId);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -107,7 +107,7 @@ void us_ticker_fire_interrupt(void)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    HalTimerOp.HalTimerDis((u32)TimerAdapter.TimerId);
 | 
					    HalTimerOp.HalTimerDis((u32)TimerAdapter.TimerId);
 | 
				
			||||||
    HalTimerOpExt.HalTimerReLoad((u32)TimerAdapter.TimerId, TimerAdapter.TimerLoadValueUs);
 | 
					    HalTimerOpExt.HalTimerReLoad((u32)TimerAdapter.TimerId, TimerAdapter.TimerLoadValueUs);
 | 
				
			||||||
    //HalTimerOpExt.HalTimerSync(SYS_TIM_ID);
 | 
					    HalTimerOpExt.HalTimerSync(SYS_TIM_ID);
 | 
				
			||||||
    HalTimerOp.HalTimerEn((u32)TimerAdapter.TimerId);
 | 
					    HalTimerOp.HalTimerEn((u32)TimerAdapter.TimerId);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,14 +1,10 @@
 | 
				
			||||||
/*******************************************************************************
 | 
					/*
 | 
				
			||||||
 *Copyright (c) 2013-2016 Realtek Semiconductor Corp, All Rights Reserved
 | 
					 *  Routines to access hardware
 | 
				
			||||||
 * SPDX-License-Identifier: LicenseRef-PBL
 | 
					 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 * Licensed under the Permissive Binary License, Version 1.0 (the "License"); 
 | 
					 *  Copyright (c) 2013 Realtek Semiconductor Corp.
 | 
				
			||||||
 * you may not use this file except in compliance with the License.
 | 
					 | 
				
			||||||
 *
 | 
					 *
 | 
				
			||||||
 * You may obtain a copy of the License at https://www.mbed.com/licenses/PBL-1.0
 | 
					 *  This module is a confidential and proprietary property of RealTek and
 | 
				
			||||||
 * 
 | 
					 *  possession or use of this module requires written permission of RealTek.
 | 
				
			||||||
 * See the License for the specific language governing permissions and limitations under the License.
 | 
					 | 
				
			||||||
 *******************************************************************************
 | 
					 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifndef _HAL_TIMER_H_
 | 
					#ifndef _HAL_TIMER_H_
 | 
				
			||||||
| 
						 | 
					@ -54,6 +50,7 @@ typedef struct _HAL_TIMER_OP_EXT_ {
 | 
				
			||||||
	PHAL_TIMER_OP phal_timer_op_rom;
 | 
						PHAL_TIMER_OP phal_timer_op_rom;
 | 
				
			||||||
	VOID (*HalTimerIrqEn)(u32 TimerId);
 | 
						VOID (*HalTimerIrqEn)(u32 TimerId);
 | 
				
			||||||
	VOID (*HalTimerReLoad)(u32 TimerId, u32 LoadUs);
 | 
						VOID (*HalTimerReLoad)(u32 TimerId, u32 LoadUs);
 | 
				
			||||||
 | 
						VOID (*HalTimerSync)(u32 TimerId);
 | 
				
			||||||
}HAL_TIMER_OP_EXT, *PHAL_TIMER_OP_EXT;
 | 
					}HAL_TIMER_OP_EXT, *PHAL_TIMER_OP_EXT;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifdef CONFIG_TIMER_MODULE
 | 
					#ifdef CONFIG_TIMER_MODULE
 | 
				
			||||||
| 
						 | 
					@ -105,5 +102,6 @@ void
 | 
				
			||||||
HalTimerDeInit(
 | 
					HalTimerDeInit(
 | 
				
			||||||
    void *Data
 | 
					    void *Data
 | 
				
			||||||
);
 | 
					);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#endif  // #ifdef CONFIG_RELEASE_BUILD_LIBRARIES
 | 
					#endif  // #ifdef CONFIG_RELEASE_BUILD_LIBRARIES
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -89,6 +89,11 @@ HalTimerReLoadRtl8195a_Patch(
 | 
				
			||||||
    IN  u32 LoadUs
 | 
					    IN  u32 LoadUs
 | 
				
			||||||
);
 | 
					);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					VOID
 | 
				
			||||||
 | 
					HalTimerSyncRtl8195a(
 | 
				
			||||||
 | 
					    IN  u32 TimerId
 | 
				
			||||||
 | 
					);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
u32
 | 
					u32
 | 
				
			||||||
HalTimerReadCountRtl8195a_Patch(
 | 
					HalTimerReadCountRtl8195a_Patch(
 | 
				
			||||||
    IN  u32 TimerId
 | 
					    IN  u32 TimerId
 | 
				
			||||||
| 
						 | 
					@ -119,6 +124,11 @@ HalTimerDisRtl8195a_Patch(
 | 
				
			||||||
    IN  u32 TimerId
 | 
					    IN  u32 TimerId
 | 
				
			||||||
);
 | 
					);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					VOID
 | 
				
			||||||
 | 
					HalTimerSyncRtl8195a(
 | 
				
			||||||
 | 
					    IN  u32 TimerId
 | 
				
			||||||
 | 
					);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
VOID
 | 
					VOID
 | 
				
			||||||
HalTimerDeInitRtl8195a_Patch(
 | 
					HalTimerDeInitRtl8195a_Patch(
 | 
				
			||||||
    IN  VOID    *Data
 | 
					    IN  VOID    *Data
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue