Mirrors_Framework/rtems
1
0
Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2026-08-30 04:28:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

arm: Remove use of proc_ptr

Browse Source 
Update #3585.
This commit is contained in:
Sebastian Huber
2018-11-12 13:25:42 +01:00
parent d997aa1f0e
commit 685aa280ea
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpukit/score/cpu/arm/armv7m-isr-vector-install.c
+3 -3
View File
@@ -28,9 +28,9 @@
#ifdef ARM_MULTILIB_ARCH_V7M
void _CPU_ISR_install_vector(
uint32_t vector,
proc_ptr new_handler,
proc_ptr *old_handler
uint32_t vector,
CPU_ISR_handler new_handler,
CPU_ISR_handler *old_handler
)
{
uint32_t level;
cpukit/score/cpu/arm/cpu.c
+8 -8
View File
@@ -144,24 +144,24 @@ uint32_t _CPU_ISR_Get_level( void )
}
void _CPU_ISR_install_vector(
uint32_t vector,
proc_ptr new_handler,
proc_ptr *old_handler
uint32_t vector,
CPU_ISR_handler new_handler,
CPU_ISR_handler *old_handler
)
{
/* Redirection table starts at the end of the vector table */
volatile uint32_t *table = (volatile uint32_t *) (MAX_EXCEPTIONS * 4);
CPU_ISR_handler *table = (CPU_ISR_handler *) (MAX_EXCEPTIONS * 4);
uint32_t current_handler = table [vector];
CPU_ISR_handler current_handler = table [vector];
/* The current handler is now the old one */
if (old_handler != NULL) {
*old_handler = (proc_ptr) current_handler;
*old_handler = current_handler;
}
/* Write only if necessary to avoid writes to a maybe read-only memory */
if (current_handler != (uint32_t) new_handler) {
table [vector] = (uint32_t) new_handler;
if (current_handler != new_handler) {
table [vector] = new_handler;
}
}
cpukit/score/cpu/arm/include/rtems/score/cpu.h
+5 -3
View File
@@ -464,10 +464,12 @@ void _CPU_Context_Initialize(
*/
void _CPU_Initialize( void );
typedef void ( *CPU_ISR_handler )( void );
void _CPU_ISR_install_vector(
uint32_t vector,
proc_ptr new_handler,
proc_ptr *old_handler
uint32_t vector,
CPU_ISR_handler new_handler,
CPU_ISR_handler *old_handler
);
/**