diff --git a/arch/sim/src/sim/up_hostirq.c b/arch/sim/src/sim/up_hostirq.c index 132bc9ee683..68173ad016b 100644 --- a/arch/sim/src/sim/up_hostirq.c +++ b/arch/sim/src/sim/up_hostirq.c @@ -114,7 +114,7 @@ void up_irqinitialize(void) #ifdef CONFIG_SMP /* Register the pause handler */ - up_cpu_set_pause_handler(SIGUSR1); + up_init_ipi(SIGUSR1); #endif } diff --git a/arch/sim/src/sim/up_internal.h b/arch/sim/src/sim/up_internal.h index 7506d19a8eb..5629b157591 100644 --- a/arch/sim/src/sim/up_internal.h +++ b/arch/sim/src/sim/up_internal.h @@ -173,7 +173,7 @@ void sim_send_ipi(int cpu); #ifdef CONFIG_SMP void up_cpu_started(void); -int up_cpu_set_pause_handler(int irq); +int up_init_ipi(int irq); #endif /* up_oneshot.c *************************************************************/ diff --git a/arch/sim/src/sim/up_simsmp.c b/arch/sim/src/sim/up_simsmp.c index f35d1e2baac..c802675efbd 100644 --- a/arch/sim/src/sim/up_simsmp.c +++ b/arch/sim/src/sim/up_simsmp.c @@ -51,12 +51,6 @@ struct sim_cpuinfo_s static pthread_key_t g_cpu_key; static pthread_t g_cpu_thread[CONFIG_SMP_NCPUS]; -/**************************************************************************** - * NuttX domain function prototypes - ****************************************************************************/ - -void up_irqinitialize(void); - /**************************************************************************** * Private Functions ****************************************************************************/ @@ -96,10 +90,6 @@ static void *sim_idle_trampoline(void *arg) return NULL; } - /* Initialize IRQ */ - - up_irqinitialize(); - /* Let up_cpu_start() continue */ pthread_mutex_lock(&cpuinfo->cpu_init_lock); diff --git a/arch/sim/src/sim/up_smpsignal.c b/arch/sim/src/sim/up_smpsignal.c index 249bbc66f6c..e2563b1db89 100644 --- a/arch/sim/src/sim/up_smpsignal.c +++ b/arch/sim/src/sim/up_smpsignal.c @@ -273,7 +273,7 @@ int up_cpu_start(int cpu) } /**************************************************************************** - * Name: up_cpu_set_pause_handler + * Name: up_init_ipi * * Description: * Attach the CPU pause request interrupt to the NuttX logic. @@ -285,7 +285,7 @@ int up_cpu_start(int cpu) * On success returns OK (0), otherwise a negative value. ****************************************************************************/ -int up_cpu_set_pause_handler(int irq) +int up_init_ipi(int irq) { up_enable_irq(irq); return irq_attach(irq, sim_cpupause_handler, NULL);