sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch/xtensa/esp32_cpuint.c: Refactor retrieving the intmap and register

Browse Source 
address of a peripheral.

Signed-off-by: Abdelatif Guettouche <abdelatif.guettouche@espressif.com>
This commit is contained in:
Abdelatif Guettouche 2021-08-17 20:37:49 +02:00 committed by Masayuki Ishikawa
parent 02c17c3169
commit 237aebb7e1
1 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
arch/xtensa/src/esp32/esp32_cpuint.c
View File

@ -208,6 +208,34 @@ static inline void xtensa_disable_all(void)
); );
} }
/****************************************************************************
* Name: esp32_intinfo
*
* Description:
* Return the CPU interrupt map of the given CPU and the register map
* of the given peripheral.
*
****************************************************************************/
static void esp32_intinfo(int cpu, int periphid,
uintptr_t *regaddr, uint8_t **intmap)
{
#ifdef CONFIG_SMP
DEBUGASSERT(cpu >= 0 && cpu < CONFIG_SMP_NCPUS);
if (cpu != 0)
{
*regaddr = DPORT_APP_MAP_REGADDR(periphid);
*intmap = g_cpu1_intmap;
}
else
#endif
{
*regaddr = DPORT_PRO_MAP_REGADDR(periphid);
*intmap = g_cpu0_intmap;
}
}
/**************************************************************************** /****************************************************************************
* Name: esp32_getcpuint * Name: esp32_getcpuint
* *
@ -531,20 +559,8 @@ int esp32_setup_irq(int cpu, int periphid, int priority, int type)
DEBUGASSERT(periphid >= 0 && periphid < ESP32_NPERIPHERALS); DEBUGASSERT(periphid >= 0 && periphid < ESP32_NPERIPHERALS);
DEBUGASSERT(cpuint >= 0 && cpuint <= ESP32_CPUINT_MAX); DEBUGASSERT(cpuint >= 0 && cpuint <= ESP32_CPUINT_MAX);
#ifdef CONFIG_SMP
DEBUGASSERT(cpu >= 0 && cpu < CONFIG_SMP_NCPUS);
if (cpu != 0) esp32_intinfo(cpu, periphid, &regaddr, &intmap);
{
regaddr = DPORT_APP_MAP_REGADDR(periphid);
intmap = g_cpu1_intmap;
}
else
#endif
{
regaddr = DPORT_PRO_MAP_REGADDR(periphid);
intmap = g_cpu0_intmap;
}
DEBUGASSERT(intmap[cpuint] == CPUINT_UNASSIGNED); DEBUGASSERT(intmap[cpuint] == CPUINT_UNASSIGNED);
@ -598,20 +614,8 @@ void esp32_teardown_irq(int cpu, int periphid, int cpuint)
irq = ESP32_PERIPH2IRQ(periphid); irq = ESP32_PERIPH2IRQ(periphid);
DEBUGASSERT(periphid >= 0 && periphid < ESP32_NPERIPHERALS); DEBUGASSERT(periphid >= 0 && periphid < ESP32_NPERIPHERALS);
#ifdef CONFIG_SMP
DEBUGASSERT(cpu >= 0 && cpu < CONFIG_SMP_NCPUS);
if (cpu != 0) esp32_intinfo(cpu, periphid, &regaddr, &intmap);
{
regaddr = DPORT_APP_MAP_REGADDR(periphid);
intmap = g_cpu1_intmap;
}
else
#endif
{
regaddr = DPORT_PRO_MAP_REGADDR(periphid);
intmap = g_cpu0_intmap;
}
DEBUGASSERT(intmap[cpuint] != CPUINT_UNASSIGNED); DEBUGASSERT(intmap[cpuint] != CPUINT_UNASSIGNED);
intmap[cpuint] = CPUINT_UNASSIGNED; intmap[cpuint] = CPUINT_UNASSIGNED;