File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -90,7 +90,6 @@ void vPortSetupTimerInterrupt( void ) __attribute__( ( weak ) );
9090uint64_t ullNextTime = 0ULL ;
9191const uint64_t * pullNextTime = & ullNextTime ;
9292const size_t uxTimerIncrementsForOneTick = ( size_t ) ( ( configCPU_CLOCK_HZ ) / ( configTICK_RATE_HZ ) ); /* Assumes increment won't go over 32-bits. */
93- UBaseType_t const ullMachineTimerCompareRegisterBase = configMTIMECMP_BASE_ADDRESS ;
9493volatile uint64_t * pullMachineTimerCompareRegister = NULL ;
9594
9695/* Holds the critical nesting value - deliberately non-zero at start up to
@@ -136,7 +135,7 @@ size_t xTaskReturnAddress = ( size_t ) portTASK_RETURN_ADDRESS;
136135
137136 __asm volatile ( "csrr %0, mhartid" : "=r" ( ulHartId ) );
138137
139- pullMachineTimerCompareRegister = ( volatile uint64_t * ) ( ullMachineTimerCompareRegisterBase + ( ulHartId * sizeof ( uint64_t ) ) );
138+ pullMachineTimerCompareRegister = ( volatile uint64_t * ) ( configMTIMECMP_BASE_ADDRESS + ( ulHartId * sizeof ( uint64_t ) ) );
140139
141140 do
142141 {
Original file line number Diff line number Diff line change @@ -98,7 +98,6 @@ void vPortSetupTimerInterrupt( void ) __attribute__( ( weak ) );
9898uint64_t ullNextTime = 0ULL ;
9999const uint64_t * pullNextTime = & ullNextTime ;
100100const size_t uxTimerIncrementsForOneTick = ( size_t ) ( ( configCPU_CLOCK_HZ ) / ( configTICK_RATE_HZ ) ); /* Assumes increment won't go over 32-bits. */
101- UBaseType_t const ullMachineTimerCompareRegisterBase = configMTIMECMP_BASE_ADDRESS ;
102101volatile uint64_t * pullMachineTimerCompareRegister = NULL ;
103102
104103/* Holds the critical nesting value - deliberately non-zero at start up to
@@ -169,7 +168,7 @@ static void prvTaskExitError( void )
169168
170169 __asm volatile ( "csrr %0, 0xf14" : "=r" ( ulHartId ) ); /* 0xf14 is HART ID. */
171170
172- pullMachineTimerCompareRegister = ( volatile uint64_t * ) ( ullMachineTimerCompareRegisterBase + ( ulHartId * sizeof ( uint64_t ) ) );
171+ pullMachineTimerCompareRegister = ( volatile uint64_t * ) ( configMTIMECMP_BASE_ADDRESS + ( ulHartId * sizeof ( uint64_t ) ) );
173172
174173 do
175174 {
You can’t perform that action at this time.
0 commit comments