Mirrors_Framework/rtems
1
0
Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2026-09-23 20:52:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

grlib/tlib: Use correct IRQ(A)MP field names

Browse Source
This commit is contained in:
Matteo Concas
2026-06-17 21:52:24 +02:00
parent b236b3763b
commit 18e5aace1d
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bsps/include/grlib/grlib.h
+4 -4
View File
@@ -38,6 +38,8 @@
#include <stdbool.h>
#include <stdint.h>
#include <grlib/irqamp-regs.h>
#ifdef __cplusplus
extern "C" {
#endif
@@ -73,11 +75,9 @@ struct irqmp_timestamp_regs {
volatile uint32_t ack; /* 0x0c */
};
static inline bool irqmp_has_timestamp(
volatile struct irqmp_timestamp_regs *irqmp_ts
)
static inline bool irqmp_has_timestamp( volatile irqamp_timestamp *irqmp_ts )
{
return ( irqmp_ts->control >> 27 ) > 0;
return IRQAMP_ITSTMPC_TSTAMP_GET( irqmp_ts->itstmpc ) > 0;
}
/* IRQMP and IRQAMP interrupt controllers */
bsps/shared/grlib/btimer/tlib_ckinit.c
+6 -6
View File
@@ -148,9 +148,9 @@ static rtems_device_driver tlib_clock_find_timer( void )
} else
#endif
{
volatile struct irqmp_timestamp_regs *irqmp_ts;
volatile irqamp_timestamp *irqmp_ts;
irqmp_ts = &LEON3_IrqCtrl_Regs->timestamp[ 0 ];
irqmp_ts = &LEON3_IrqCtrl_Regs->itstmp[ 0 ];
if ( irqmp_has_timestamp( irqmp_ts ) ) {
priv.ops = &ops_irqamp;
return RTEMS_SUCCESSFUL;
@@ -392,12 +392,12 @@ static uint32_t irqamp_get_timecount( struct timecounter *tc )
{
(void) tc;
return LEON3_IrqCtrl_Regs->timestamp[ 0 ].counter;
return LEON3_IrqCtrl_Regs->itstmp[ 0 ].itcnt;
}
static rtems_device_driver irqamp_initialize_counter( void )
{
volatile struct irqmp_timestamp_regs *irqmp_ts;
volatile irqamp_timestamp *irqmp_ts;
static const uint32_t A_TSISEL_FIELD = 0xf;
/* Configure free running counter: timetag */
@@ -411,8 +411,8 @@ static rtems_device_driver irqamp_initialize_counter( void )
* The counter increments whenever a TSISEL field in a Timestamp Control
* Register is non-zero.
*/
irqmp_ts = &LEON3_IrqCtrl_Regs->timestamp[ 0 ];
irqmp_ts->control = A_TSISEL_FIELD;
irqmp_ts = &LEON3_IrqCtrl_Regs->itstmp[ 0 ];
irqmp_ts->itstmpc = A_TSISEL_FIELD;
return RTEMS_SUCCESSFUL;
}