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

sparc64: Remove use of proc_ptr

Browse Source 
Update #3585.
This commit is contained in:
Sebastian Huber
2018-11-09 08:12:49 +01:00
parent ce37237f96
commit 70928bc98b
2 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cpukit/score/cpu/sparc64/cpu.c
View File

@@ -193,8 +193,8 @@ 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;
@@ -251,7 +251,7 @@ void _CPU_ISR_install_raw_handler(
(slot->or_g2_hm_handler_to_g2 & IMM_MASK))) << HM_BITS_SHIFT) | (slot->or_g2_hm_handler_to_g2 & IMM_MASK))) << HM_BITS_SHIFT) |
((slot->sethi_of_handler_to_g3 << HI_BITS_SHIFT) | ((slot->sethi_of_handler_to_g3 << HI_BITS_SHIFT) |
(slot->jmp_to_low_of_handler_plus_g3 & IMM_MASK)); (slot->jmp_to_low_of_handler_plus_g3 & IMM_MASK));
*old_handler = (proc_ptr) u64_handler; *old_handler = (CPU_ISR_raw_handler) u64_handler;
} else } else
*old_handler = 0; *old_handler = 0;
@@ -307,13 +307,13 @@ void _CPU_ISR_install_raw_handler(
* *old_handler - former ISR for this vector number * *old_handler - former ISR for this vector number
*/ */
void _CPU_ISR_install_vector( void _CPU_ISR_install_vector(
uint64_t vector, uint32_t vector,
proc_ptr new_handler, CPU_ISR_handler new_handler,
proc_ptr *old_handler CPU_ISR_handler *old_handler
) )
{ {
uint64_t real_vector; uint64_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

23
cpukit/score/cpu/sparc64/include/rtems/score/cpu.h
View File

@@ -839,29 +839,20 @@ void _CPU_Context_Initialize(
void _CPU_Initialize(void); void _CPU_Initialize(void);
/* typedef void ( *CPU_ISR_raw_handler )( void );
* _CPU_ISR_install_raw_handler
*
* This routine installs new_handler to be directly called from the trap
* table.
*/
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 );
* _CPU_ISR_install_vector
*
* This routine installs an interrupt vector.
*/
void _CPU_ISR_install_vector( void _CPU_ISR_install_vector(
uint64_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 );