RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

sparc: Remove use of proc_ptr

Browse Source 
Update #3585.
This commit is contained in:
Sebastian Huber
2018-11-08 06:41:15 +01:00
parent 510fbfc314
commit ce37237f96
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cpukit/score/cpu/sparc/cpu.c
View File

@@ -236,9 +236,9 @@ uint32_t _CPU_ISR_Get_level( void )
*/ */
void _CPU_ISR_install_raw_handler( void _CPU_ISR_install_raw_handler(
uint32_t vector, uint32_t vector,
proc_ptr new_handler, CPU_ISR_raw_handler new_handler,
proc_ptr *old_handler CPU_ISR_raw_handler *old_handler
) )
{ {
uint32_t real_vector; uint32_t real_vector;
@@ -282,7 +282,7 @@ void _CPU_ISR_install_raw_handler(
u32_handler = u32_handler =
(slot->sethi_of_handler_to_l4 << HIGH_BITS_SHIFT) | (slot->sethi_of_handler_to_l4 << HIGH_BITS_SHIFT) |
(slot->jmp_to_low_of_handler_plus_l4 & LOW_BITS_MASK); (slot->jmp_to_low_of_handler_plus_l4 & LOW_BITS_MASK);
*old_handler = (proc_ptr) u32_handler; *old_handler = (CPU_ISR_raw_handler) u32_handler;
} else } else
*old_handler = 0; *old_handler = 0;
@@ -317,13 +317,13 @@ void _CPU_ISR_install_raw_handler(
} }
void _CPU_ISR_install_vector( void _CPU_ISR_install_vector(
uint32_t vector, uint32_t vector,
proc_ptr new_handler, CPU_ISR_handler new_handler,
proc_ptr *old_handler CPU_ISR_handler *old_handler
) )
{ {
uint32_t real_vector; uint32_t real_vector;
proc_ptr ignored; CPU_ISR_raw_handler ignored;
/* /*
* Get the "real" trap number for this vector ignoring the synchronous * Get the "real" trap number for this vector ignoring the synchronous

16
cpukit/score/cpu/sparc/include/rtems/score/cpu.h
View File

@@ -940,6 +940,8 @@ extern void _CPU_Fatal_halt(uint32_t source, uint32_t error)
*/ */
void _CPU_Initialize(void); void _CPU_Initialize(void);
typedef void ( *CPU_ISR_raw_handler )( void );
/** /**
* @brief SPARC specific raw ISR installer. * @brief SPARC specific raw ISR installer.
* *
@@ -951,11 +953,13 @@ void _CPU_Initialize(void);
* @param[in] old_handler will contain the old ISR handler * @param[in] old_handler will contain the old ISR handler
*/ */
void _CPU_ISR_install_raw_handler( void _CPU_ISR_install_raw_handler(
uint32_t vector, uint32_t vector,
proc_ptr new_handler, CPU_ISR_raw_handler new_handler,
proc_ptr *old_handler CPU_ISR_raw_handler *old_handler
); );
typedef void ( *CPU_ISR_handler )( uint32_t );
/** /**
* @brief SPARC specific RTEMS ISR installer. * @brief SPARC specific RTEMS ISR installer.
* *
@@ -967,9 +971,9 @@ void _CPU_ISR_install_raw_handler(
*/ */
void _CPU_ISR_install_vector( void _CPU_ISR_install_vector(
uint32_t vector, uint32_t vector,
proc_ptr new_handler, CPU_ISR_handler new_handler,
proc_ptr *old_handler CPU_ISR_handler *old_handler
); );
void *_CPU_Thread_Idle_body( uintptr_t ignored ); void *_CPU_Thread_Idle_body( uintptr_t ignored );