Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-31 14:27:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

arch: rename arch special function name

Browse Source
This commit is contained in:
zhangyuan21
2022-11-17 18:17:40 +08:00
committed by Xiang Xiao
parent fc65e6969d
commit a8fa51e6bf
613 changed files with 3023 additions and 2957 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/sparc/include/syscall.h
+12 -12
View File
@@ -65,30 +65,30 @@
/* SYS call 1:
*
* void up_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
* void sparc_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
*/
#define SYS_restore_context (1)
#define up_fullcontextrestore(restoreregs) \
#define sparc_fullcontextrestore(restoreregs) \
sys_call1(SYS_restore_context, (uintptr_t)restoreregs)
/* SYS call 2:
*
* void up_switchcontext(uint32_t *saveregs, uint32_t *restoreregs);
* void sparc_switchcontext(uint32_t *saveregs, uint32_t *restoreregs);
*/
#define SYS_switch_context (2)
#define up_switchcontext(saveregs, restoreregs) \
#define sparc_switchcontext(saveregs, restoreregs) \
sys_call2(SYS_switch_context, (uintptr_t)saveregs, (uintptr_t)restoreregs)
#ifdef CONFIG_BUILD_KERNEL
/* SYS call 3:
*
* void up_syscall_return(void);
* void sparc_syscall_return(void);
*/
#define SYS_syscall_return (3)
#define up_syscall_return() sys_call0(SYS_syscall_return)
#define sparc_syscall_return() sys_call0(SYS_syscall_return)
#endif
#endif /* __ASSEMBLY__ */
@@ -120,7 +120,7 @@ extern "C"
#endif
/****************************************************************************
* Name: up_syscall0
* Name: sparc_syscall0
*
* Description:
* System call SYS_ argument and no additional parameters.
@@ -130,7 +130,7 @@ extern "C"
uintptr_t sys_call0(unsigned int nbr);
/****************************************************************************
* Name: up_syscall1
* Name: sparc_syscall1
*
* Description:
* System call SYS_ argument and one additional parameter.
@@ -140,7 +140,7 @@ uintptr_t sys_call0(unsigned int nbr);
uintptr_t sys_call1(unsigned int nbr, uintptr_t parm1);
/****************************************************************************
* Name: up_syscall2
* Name: sparc_syscall2
*
* Description:
* System call SYS_ argument and two additional parameters.
@@ -150,7 +150,7 @@ uintptr_t sys_call1(unsigned int nbr, uintptr_t parm1);
uintptr_t sys_call2(unsigned int nbr, uintptr_t parm1, uintptr_t parm2);
/****************************************************************************
* Name: up_syscall3
* Name: sparc_syscall3
*
* Description:
* System call SYS_ argument and three additional parameters.
@@ -161,7 +161,7 @@ uintptr_t sys_call3(unsigned int nbr, uintptr_t parm1, uintptr_t parm2,
uintptr_t parm3);
/****************************************************************************
* Name: up_syscall4
* Name: sparc_syscall4
*
* Description:
* System call SYS_ argument and four additional parameters.
@@ -172,7 +172,7 @@ uintptr_t sys_call4(unsigned int nbr, uintptr_t parm1, uintptr_t parm2,
uintptr_t parm3, uintptr_t parm4);
/****************************************************************************
* Name: up_syscall5
* Name: sparc_syscall5
*
* Description:
* System call SYS_ argument and five additional parameters.
arch/sparc/src/bm3803/Make.defs
+1 -1
View File
@@ -18,7 +18,7 @@
#
############################################################################
include common/Make.defs
include sparc_v8/Make.defs
# The start-up, "head", file
arch/sparc/src/bm3803/bm3803-irq.c
+7 -7
View File
@@ -34,7 +34,7 @@
#include <arch/irq.h>
#include "up_internal.h"
#include "sparc_internal.h"
#include "bm3803.h"
/****************************************************************************
@@ -82,8 +82,8 @@ void up_irqinitialize(void)
/* Attach software interrupts */
irq_attach(BM3803_IRQ_SW_SYSCALL_TA0, up_swint0, NULL);
irq_attach(BM3803_IRQ_SW_SYSCALL_TA8, up_swint1, NULL);
irq_attach(BM3803_IRQ_SW_SYSCALL_TA0, sparc_swint0, NULL);
irq_attach(BM3803_IRQ_SW_SYSCALL_TA8, sparc_swint1, NULL);
/* And finally, enable interrupts */
@@ -167,14 +167,14 @@ void up_enable_irq(int irq)
}
/****************************************************************************
* Name: up_pending_irq
* Name: sparc_pending_irq
*
* Description:
* Return true if the interrupt is pending and unmasked.
*
****************************************************************************/
bool up_pending_irq(int irq)
bool sparc_pending_irq(int irq)
{
int bitno;
uint16_t regval;
@@ -215,14 +215,14 @@ bool up_pending_irq(int irq)
}
/****************************************************************************
* Name: up_clrpend_irq
* Name: sparc_clrpend_irq
*
* Description:
* Clear any pending interrupt
*
****************************************************************************/
void up_clrpend_irq(int irq)
void sparc_clrpend_irq(int irq)
{
int bitno;
/* Acknowledge the interrupt by clearing the associated bit in the ITP
arch/sparc/src/bm3803/bm3803-lowconsole.c
+5 -5
View File
@@ -32,7 +32,7 @@
#include <arch/irq.h>
#include "up_internal.h"
#include "sparc_internal.h"
#include "bm3803-uart.h"
#include "bm3803.h"
@@ -275,7 +275,7 @@ void uart3_configure(void)
#endif
/****************************************************************************
* Name: up_consoleinit
* Name: sparc_consoleinit
*
* Description:
* Initialize a console for debug output. This function is called very
@@ -285,7 +285,7 @@ void uart3_configure(void)
*
****************************************************************************/
void up_consoleinit(void)
void sparc_consoleinit(void)
{
#ifdef HAVE_SERIAL_CONSOLE
#if defined(CONFIG_UART1_SERIAL_CONSOLE)
@@ -299,14 +299,14 @@ void up_consoleinit(void)
}
/****************************************************************************
* Name: up_lowputc
* Name: sparc_lowputc
*
* Description:
* Output one byte on the serial console
*
****************************************************************************/
void up_lowputc(char ch)
void sparc_lowputc(char ch)
{
#ifdef HAVE_SERIAL_CONSOLE
#if defined(CONFIG_UART1_SERIAL_CONSOLE)
arch/sparc/src/bm3803/bm3803-lowinit.c
+4 -4
View File
@@ -25,7 +25,7 @@
#include <nuttx/config.h>
#include "bm3803-config.h"
#include "up_internal.h"
#include "sparc_internal.h"
#include "bm3803.h"
/****************************************************************************
@@ -61,7 +61,7 @@
****************************************************************************/
#ifdef CONFIG_DEBUG_FEATURES
# define showprogress(c) up_lowputc(c)
# define showprogress(c) sparc_lowputc(c)
#else
# define showprogress(c)
#endif
@@ -86,7 +86,7 @@ void up_lowinit(void)
/* Initialize a console (probably a serial console) */
up_consoleinit();
sparc_consoleinit();
showprogress('A');
@@ -105,7 +105,7 @@ void up_lowinit(void)
*/
#ifdef USE_EARLYSERIALINIT
up_earlyserialinit();
sparc_earlyserialinit();
#endif
/* Perform board-level initialization */
arch/sparc/src/bm3803/bm3803-serial.c
+18 -18
View File
@@ -44,7 +44,7 @@
#include <arch/board/board.h>
#include "up_internal.h"
#include "sparc_internal.h"
#include "bm3803-config.h"
#include "chip.h"
#include "bm3803-uart.h"
@@ -123,7 +123,7 @@
/* Common initialization logic will not not know that the all of the UARTs
* have been disabled. So, as a result, we may still have to provide
* stub implementations of up_earlyserialinit(), up_serialinit(), and
* stub implementations of sparc_earlyserialinit(), sparc_serialinit(), and
* up_putc().
*/
@@ -807,18 +807,18 @@ static bool up_txempty(struct uart_dev_s *dev)
****************************************************************************/
/****************************************************************************
* Name: up_earlyserialinit
* Name: sparc_earlyserialinit
*
* Description:
* Performs the low level UART initialization early in debug so that the
* serial console will be available during bootup. This must be called
* before up_serialinit. NOTE: This function depends on GPIO pin
* configuration performed in up_consoleinit() and main clock iniialization
* performed in up_clkinitialize().
* before sparc_serialinit. NOTE: This function depends on GPIO pin
* configuration performed in sparc_consoleinit() and main clock
* iniialization performed in up_clkinitialize().
*
****************************************************************************/
void up_earlyserialinit(void)
void sparc_earlyserialinit(void)
{
/* Disable interrupts from all UARTS. The console is enabled in
* bm3803_consoleinit().
@@ -838,15 +838,15 @@ void up_earlyserialinit(void)
}
/****************************************************************************
* Name: up_serialinit
* Name: sparc_serialinit
*
* Description:
* Register serial console and serial ports. This assumes
* that up_earlyserialinit was called previously.
* that sparc_earlyserialinit was called previously.
*
****************************************************************************/
void up_serialinit(void)
void sparc_serialinit(void)
{
/* Register the console */
@@ -884,31 +884,31 @@ int up_putc(int ch)
{
/* Add CR */
up_lowputc('\r');
sparc_lowputc('\r');
}
up_lowputc(ch);
sparc_lowputc(ch);
up_restoreuartint(dev, imr);
#endif
return ch;
}
/****************************************************************************
* Name: up_earlyserialinit, up_serialinit, and up_putc
* Name: sparc_earlyserialinit, sparc_serialinit, and up_putc
*
* Description:
* stubs that may be needed. These stubs would be used if all UARTs are
* disabled. In that case, the logic in common/up_initialize() is not
* disabled. In that case, the logic in common/sparc_initialize() is not
* smart enough to know that there are not UARTs and will still expect
* these interfaces to be provided.
*
****************************************************************************/
#else /* HAVE_UART_DEVICE */
void up_earlyserialinit(void)
void sparc_earlyserialinit(void)
{
}
void up_serialinit(void)
void sparc_serialinit(void)
{
}
@@ -937,10 +937,10 @@ int up_putc(int ch)
{
/* Add CR */
up_lowputc('\r');
sparc_lowputc('\r');
}
up_lowputc(ch);
sparc_lowputc(ch);
#endif
return ch;
}
arch/sparc/src/bm3803/bm3803-timerisr.c
+3 -3
View File
@@ -31,7 +31,7 @@
#include <nuttx/arch.h>
#include <arch/board/board.h>
#include "up_internal.h"
#include "sparc_internal.h"
#include "bm3803.h"
/****************************************************************************
@@ -81,7 +81,7 @@ static int bm3803_timerisr(int irq, uint32_t *regs, void *arg)
{
/* Clear the pending timer interrupt */
up_clrpend_irq(BM3803_IRQ_TIMER1);
sparc_clrpend_irq(BM3803_IRQ_TIMER1);
/* Process timer interrupt */
@@ -121,7 +121,7 @@ void up_timer_initialize(void)
/* Configure the timer interrupt */
up_clrpend_irq(BM3803_IRQ_TIMER1);
sparc_clrpend_irq(BM3803_IRQ_TIMER1);
#ifdef CONFIG_ARCH_IRQPRIO
up_prioritize_irq(BM3803_IRQ_TIMER1, CONFIG_BM3803_TIMER1PRIO);
#endif
arch/sparc/src/bm3803/bm3803.h
+3 -3
View File
@@ -468,7 +468,7 @@ void uart1_configure(void);
void uart2_configure(void);
void uart3_configure(void);
/****************************************************************************
* Name: up_consoleinit
* Name: sparc_consoleinit
*
* Description:
* Initialize a console for debug output. This function is called very
@@ -478,9 +478,9 @@ void uart3_configure(void);
****************************************************************************/
#ifdef HAVE_SERIAL_CONSOLE
void up_consoleinit(void);
void sparc_consoleinit(void);
#else
# define up_consoleinit()
# define sparc_consoleinit()
#endif
/****************************************************************************
arch/sparc/src/bm3803/bm3803_exceptions.S
+2 -2
View File
@@ -31,7 +31,7 @@
****************************************************************************/
.global _ISR_Handler
.global up_doirq /* Dispatch an IRQ */
.global sparc_doirq /* Dispatch an IRQ */
/*
* void _ISR_Handler()
@@ -197,7 +197,7 @@ fix_pil:
! o1 = 2nd arg = address of the ISF
! WAS LOADED WHEN ISF WAS SAVED!!!
mov %l3, %o0 ! o0 = 1st arg = vector number
call up_doirq /* call ISR dispatcher */
call sparc_doirq /* call ISR dispatcher */
nop
/*==========================================================================*/
mov %l0, %psr ! **** DISABLE TRAPS ****
arch/sparc/src/bm3803/bm3803_exti_gpio.c
+5 -5
View File
@@ -33,7 +33,7 @@
#include <arch/irq.h>
#include "up_internal.h"
#include "sparc_internal.h"
#include "chip.h"
#include "bm3803.h"
/****************************************************************************
@@ -68,7 +68,7 @@ static int bm3803_exti0_isr(int irq, void *context, void *arg)
/* Clear the pending interrupt */
up_clrpend_irq(BM3803_IRQ_EXTERNAL_0);
sparc_clrpend_irq(BM3803_IRQ_EXTERNAL_0);
/* And dispatch the interrupt to the handler */
@@ -99,7 +99,7 @@ static int bm3803_exti1_isr(int irq, void *context, void *arg)
/* Clear the pending interrupt */
up_clrpend_irq(BM3803_IRQ_EXTERNAL_1);
sparc_clrpend_irq(BM3803_IRQ_EXTERNAL_1);
return ret;
}
@@ -120,7 +120,7 @@ static int bm3803_exti2_isr(int irq, void *context, void *arg)
/* Clear the pending interrupt */
up_clrpend_irq(BM3803_IRQ_EXTERNAL_2);
sparc_clrpend_irq(BM3803_IRQ_EXTERNAL_2);
return ret;
}
@@ -141,7 +141,7 @@ static int bm3803_exti3_isr(int irq, void *context, void * arg)
/* Clear the pending interrupt */
up_clrpend_irq(BM3803_IRQ_EXTERNAL_3);
sparc_clrpend_irq(BM3803_IRQ_EXTERNAL_3);
return ret;
}
arch/sparc/src/bm3803/bm3803_tim.c
+3 -3
View File
@@ -37,7 +37,7 @@
#include <arch/board/board.h>
#include "chip.h"
#include "up_internal.h"
#include "sparc_internal.h"
#include "bm3803.h"
#include "bm3803_tim.h"
@@ -525,7 +525,7 @@ static void bm3803_tim_clrint(struct bm3803_tim_dev_s *dev, int source)
break;
}
up_clrpend_irq(vectorno);
sparc_clrpend_irq(vectorno);
}
/****************************************************************************
@@ -557,7 +557,7 @@ static int bm3803_tim_checkint(struct bm3803_tim_dev_s *dev, int source)
return -EINVAL;
}
return up_pending_irq(vectorno);
return sparc_pending_irq(vectorno);
}
/****************************************************************************
arch/sparc/src/bm3803/bm3803_wdg.c
+1 -1
View File
@@ -35,7 +35,7 @@
#include <nuttx/timers/watchdog.h>
#include <arch/board/board.h>
#include "up_internal.h"
#include "sparc_internal.h"
#include "bm3803_wdg.h"
#if defined(CONFIG_WATCHDOG) && defined(CONFIG_BM3803_WDG)
arch/sparc/src/bm3823/Make.defs
+1 -11
View File
@@ -18,22 +18,12 @@
#
############################################################################
include common/Make.defs
include sparc_v8/Make.defs
# The start-up, "head", file
HEAD_ASRC += bm3823_head.S
# Configuration-dependent common files
ifeq ($(CONFIG_ARCH_STACKDUMP),y)
CMN_CSRCS += up_dumpstate.c
endif
ifeq ($(CONFIG_STACK_COLORATION),y)
CMN_CSRCS += up_checkstack.c
endif
# Required bm3823 files
CHIP_ASRCS = bm3823_exceptions.S
arch/sparc/src/bm3823/bm3823-irq.c
+7 -7
View File
@@ -33,7 +33,7 @@
#include <arch/irq.h>
#include "up_internal.h"
#include "sparc_internal.h"
#include "bm3823.h"
/****************************************************************************
@@ -87,8 +87,8 @@ void up_irqinitialize(void)
/* Attach software interrupts */
irq_attach(BM3823_IRQ_SW_SYSCALL_TA0, up_swint0, NULL);
irq_attach(BM3823_IRQ_SW_SYSCALL_TA8, up_swint1, NULL);
irq_attach(BM3823_IRQ_SW_SYSCALL_TA0, sparc_swint0, NULL);
irq_attach(BM3823_IRQ_SW_SYSCALL_TA8, sparc_swint1, NULL);
/* And finally, enable interrupts */
@@ -172,14 +172,14 @@ void up_enable_irq(int irq)
}
/****************************************************************************
* Name: up_pending_irq
* Name: sparc_pending_irq
*
* Description:
* Return true if the interrupt is pending and unmasked.
*
****************************************************************************/
bool up_pending_irq(int irq)
bool sparc_pending_irq(int irq)
{
int bitno;
uint16_t regval;
@@ -220,14 +220,14 @@ bool up_pending_irq(int irq)
}
/****************************************************************************
* Name: up_clrpend_irq
* Name: sparc_clrpend_irq
*
* Description:
* Clear any pending interrupt
*
****************************************************************************/
void up_clrpend_irq(int irq)
void sparc_clrpend_irq(int irq)
{
int bitno;
/* Acknowledge the interrupt by clearing the associated bit in the ITP
arch/sparc/src/bm3823/bm3823-lowconsole.c
+5 -5
View File
@@ -32,7 +32,7 @@
#include <arch/irq.h>
#include "up_internal.h"
#include "sparc_internal.h"
#include "bm3823-uart.h"
#include "bm3823.h"
@@ -258,7 +258,7 @@ void uart3_configure(void)
#endif
/****************************************************************************
* Name: up_consoleinit
* Name: sparc_consoleinit
*
* Description:
* Initialize a console for debug output. This function is called very
@@ -267,7 +267,7 @@ void uart3_configure(void)
*
****************************************************************************/
void up_consoleinit(void)
void sparc_consoleinit(void)
{
#ifdef HAVE_SERIAL_CONSOLE
# if defined(CONFIG_UART1_SERIAL_CONSOLE)
@@ -281,14 +281,14 @@ void up_consoleinit(void)
}
/****************************************************************************
* Name: up_lowputc
* Name: sparc_lowputc
*
* Description:
* Output one byte on the serial console
*
****************************************************************************/
void up_lowputc(char ch)
void sparc_lowputc(char ch)
{
#ifdef HAVE_SERIAL_CONSOLE
# if defined(CONFIG_UART1_SERIAL_CONSOLE)
arch/sparc/src/bm3823/bm3823-lowinit.c
+4 -4
View File
@@ -25,7 +25,7 @@
#include <nuttx/config.h>
#include "bm3823-config.h"
#include "up_internal.h"
#include "sparc_internal.h"
#include "bm3823.h"
/****************************************************************************
@@ -83,7 +83,7 @@
****************************************************************************/
#ifdef CONFIG_DEBUG_FEATURES
# define showprogress(c) up_lowputc(c)
# define showprogress(c) sparc_lowputc(c)
#else
# define showprogress(c)
#endif
@@ -139,7 +139,7 @@ void up_lowinit(void)
/* Initialize a console (probably a serial console) */
up_consoleinit();
sparc_consoleinit();
showprogress('A');
@@ -158,7 +158,7 @@ void up_lowinit(void)
*/
#ifdef USE_EARLYSERIALINIT
up_earlyserialinit();
sparc_earlyserialinit();
#endif
/* Perform board-level initialization */
arch/sparc/src/bm3823/bm3823-serial.c
+18 -18
View File
@@ -43,7 +43,7 @@
#include <arch/board/board.h>
#include "up_internal.h"
#include "sparc_internal.h"
#include "bm3823-config.h"
#include "chip.h"
#include "bm3823-uart.h"
@@ -122,7 +122,7 @@
/* Common initialization logic will not not know that the all of the UARTs
* have been disabled. So, as a result, we may still have to provide
* stub implementations of up_earlyserialinit(), up_serialinit(), and
* stub implementations of sparc_earlyserialinit(), sparc_serialinit(), and
* up_putc().
*/
@@ -803,18 +803,18 @@ static bool up_txempty(struct uart_dev_s *dev)
****************************************************************************/
/****************************************************************************
* Name: up_earlyserialinit
* Name: sparc_earlyserialinit
*
* Description:
* Performs the low level UART initialization early in debug so that the
* serial console will be available during bootup. This must be called
* before up_serialinit. NOTE: This function depends on GPIO pin
* configuration performed in up_consoleinit() and main clock iniialization
* performed in up_clkinitialize().
* before sparc_serialinit. NOTE: This function depends on GPIO pin
* configuration performed in sparc_consoleinit() and main clock
* iniialization performed in up_clkinitialize().
*
****************************************************************************/
void up_earlyserialinit(void)
void sparc_earlyserialinit(void)
{
/* Disable interrupts from all UARTS. The console is enabled in
* bm3823_consoleinit().
@@ -834,15 +834,15 @@ void up_earlyserialinit(void)
}
/****************************************************************************
* Name: up_serialinit
* Name: sparc_serialinit
*
* Description:
* Register serial console and serial ports. This assumes
* that up_earlyserialinit was called previously.
* that sparc_earlyserialinit was called previously.
*
****************************************************************************/
void up_serialinit(void)
void sparc_serialinit(void)
{
/* Register the console */
@@ -880,31 +880,31 @@ int up_putc(int ch)
{
/* Add CR */
up_lowputc('\r');
sparc_lowputc('\r');
}
up_lowputc(ch);
sparc_lowputc(ch);
up_restoreuartint(dev, imr);
#endif
return ch;
}
/****************************************************************************
* Name: up_earlyserialinit, up_serialinit, and up_putc
* Name: sparc_earlyserialinit, sparc_serialinit, and up_putc
*
* Description:
* stubs that may be needed. These stubs would be used if all UARTs are
* disabled. In that case, the logic in common/up_initialize() is not
* disabled. In that case, the logic in common/sparc_initialize() is not
* smart enough to know that there are not UARTs and will still expect
* these interfaces to be provided.
*
****************************************************************************/
#else /* HAVE_UART_DEVICE */
void up_earlyserialinit(void)
void sparc_earlyserialinit(void)
{
}
void up_serialinit(void)
void sparc_serialinit(void)
{
}
@@ -933,10 +933,10 @@ int up_putc(int ch)
{
/* Add CR */
up_lowputc('\r');
sparc_lowputc('\r');
}
up_lowputc(ch);
sparc_lowputc(ch);
#endif
return ch;
}
arch/sparc/src/bm3823/bm3823-timerisr.c
+3 -3
View File
@@ -31,7 +31,7 @@
#include <nuttx/arch.h>
#include <arch/board/board.h>
#include "up_internal.h"
#include "sparc_internal.h"
#include "bm3823.h"
/****************************************************************************
@@ -82,7 +82,7 @@ static int bm3823_timerisr(int irq, uint32_t *regs, void *arg)
{
/* Clear the pending timer interrupt */
up_clrpend_irq(BM3823_IRQ_TIMER1);
sparc_clrpend_irq(BM3823_IRQ_TIMER1);
/* Process timer interrupt */
@@ -122,7 +122,7 @@ void up_timer_initialize(void)
/* Configure the timer interrupt */
up_clrpend_irq(BM3823_IRQ_TIMER1);
sparc_clrpend_irq(BM3823_IRQ_TIMER1);
#ifdef CONFIG_ARCH_IRQPRIO
up_prioritize_irq(BM3823_IRQ_TIMER1, CONFIG_BM3823_TIMER1PRIO);
#endif
arch/sparc/src/bm3823/bm3823.h
+3 -3
View File
@@ -548,7 +548,7 @@ void uart2_configure(void);
void uart3_configure(void);
/****************************************************************************
* Name: up_consoleinit
* Name: sparc_consoleinit
*
* Description:
* Initialize a console for debug output. This function is called very
@@ -558,9 +558,9 @@ void uart3_configure(void);
****************************************************************************/
#ifdef HAVE_SERIAL_CONSOLE
void up_consoleinit(void);
void sparc_consoleinit(void);
#else
# define up_consoleinit()
# define sparc_consoleinit()
#endif
/****************************************************************************
arch/sparc/src/bm3823/bm3823_exceptions.S
+2 -2
View File
@@ -31,7 +31,7 @@
****************************************************************************/
.global _ISR_Handler
.global up_doirq /* Dispatch an IRQ */
.global sparc_doirq /* Dispatch an IRQ */
/*
* void _ISR_Handler()
@@ -145,7 +145,7 @@ fix_pil:
! o1 = 2nd arg = address of the ISF
! WAS LOADED WHEN ISF WAS SAVED!!!
mov %l3, %o0 ! o0 = 1st arg = vector number
call up_doirq /* call ISR dispatcher */
call sparc_doirq /* call ISR dispatcher */
nop
/*==========================================================================*/
mov %l0, %psr ! **** DISABLE TRAPS ****
arch/sparc/src/common/Make.defs
+8 -14
View File
@@ -20,25 +20,19 @@
# Common Sparc files (arch/sparc/src/common)
CMN_ASRCS = up_syscall.S
CMN_CSRCS = up_allocateheap.c up_assert.c up_blocktask.c up_copystate.c up_systemreset.c
CMN_CSRCS += up_createstack.c up_doirq.c up_exit.c up_idle.c up_initialize.c
CMN_CSRCS += up_initialstate.c up_irq.c up_lowputs.c
CMN_CSRCS += up_mdelay.c up_modifyreg8.c up_modifyreg16.c up_modifyreg32.c
CMN_CSRCS += up_nputs.c up_releasepending.c up_releasestack.c
CMN_CSRCS += up_schedulesigaction.c up_sigdeliver.c
CMN_CSRCS += up_stackframe.c up_swint1.c up_udelay.c up_unblocktask.c up_usestack.c
CMN_CSRCS += sparc_allocateheap.c sparc_assert.c
CMN_CSRCS += sparc_createstack.c sparc_exit.c sparc_idle.c sparc_initialize.c
CMN_CSRCS += sparc_lowputs.c sparc_mdelay.c
CMN_CSRCS += sparc_modifyreg8.c sparc_modifyreg16.c sparc_modifyreg32.c
CMN_CSRCS += sparc_nputs.c sparc_releasestack.c
CMN_CSRCS += sparc_stackframe.c sparc_udelay.c sparc_usestack.c
# Configuration-dependent common files
ifeq ($(CONFIG_ARCH_STACKDUMP),y)
CMN_CSRCS += up_dumpstate.c
endif
ifeq ($(CONFIG_STACK_COLORATION),y)
CMN_CSRCS += up_checkstack.c
CMN_CSRCS += sparc_checkstack.c
endif
ifeq ($(CONFIG_SPINLOCK),y)
CMN_CSRCS += up_testset.c
CMN_CSRCS += sparc_testset.c
endif
arch/sparc/src/common/up_allocateheap.c → arch/sparc/src/common/sparc_allocateheap.c
+2 -2
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* arch/sparc/src/common/up_allocateheap.c
* arch/sparc/src/common/sparc_allocateheap.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -31,7 +31,7 @@
#include <nuttx/board.h>
#include <arch/board/board.h>
#include "up_internal.h"
#include "sparc_internal.h"
/****************************************************************************
* Pre-processor Definitions
arch/sparc/src/common/up_assert.c → arch/sparc/src/common/sparc_assert.c
+3 -3
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* arch/sparc/src/common/up_assert.c
* arch/sparc/src/common/sparc_assert.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -38,7 +38,7 @@
#include <arch/board/board.h>
#include "sched/sched.h"
#include "up_internal.h"
#include "sparc_internal.h"
/****************************************************************************
* Pre-processor Definitions
@@ -147,7 +147,7 @@ void up_assert(const char *filename, int lineno)
filename, lineno);
#endif
up_dumpstate();
sparc_dumpstate();
/* Flush any buffered SYSLOG data (from the above) */
arch/sparc/src/common/up_checkstack.c → arch/sparc/src/common/sparc_checkstack.c
+5 -5
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* arch/sparc/src/common/up_checkstack.c
* arch/sparc/src/common/sparc_checkstack.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -35,7 +35,7 @@
#include <nuttx/board.h>
#include "sched/sched.h"
#include "up_internal.h"
#include "sparc_internal.h"
#ifdef CONFIG_STACK_COLORATION
@@ -140,14 +140,14 @@ size_t sparc_stack_check(void *stackbase, size_t nbytes)
}
/****************************************************************************
* Name: up_stack_color
* Name: sparc_stack_color
*
* Description:
* Write a well know value into the stack
*
****************************************************************************/
void up_stack_color(void *stackbase, size_t nbytes)
void sparc_stack_color(void *stackbase, size_t nbytes)
{
uint32_t *stkptr;
uintptr_t stkend;
@@ -221,7 +221,7 @@ ssize_t up_check_stack_remain(void)
#if CONFIG_ARCH_INTERRUPTSTACK > 7
size_t up_check_intstack(void)
{
return sparc_stack_check((void *)up_intstack_alloc(),
return sparc_stack_check((void *)sparc_intstack_alloc(),
STACK_ALIGN_DOWN(CONFIG_ARCH_INTERRUPTSTACK));
}
arch/sparc/src/common/up_createstack.c → arch/sparc/src/common/sparc_createstack.c
+3 -3
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* arch/sparc/src/common/up_createstack.c
* arch/sparc/src/common/sparc_createstack.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -34,7 +34,7 @@
#include <nuttx/board.h>
#include <arch/board/board.h>
#include "up_internal.h"
#include "sparc_internal.h"
/****************************************************************************
* Public Functions
@@ -166,7 +166,7 @@ int up_create_stack(struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
* water marks.
*/
up_stack_color(tcb->stack_base_ptr, tcb->adj_stack_size);
sparc_stack_color(tcb->stack_base_ptr, tcb->adj_stack_size);
#endif /* CONFIG_STACK_COLORATION */
tcb->flags |= TCB_FLAG_FREE_STACK;
arch/sparc/src/common/up_exit.c → arch/sparc/src/common/sparc_exit.c
+4 -4
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* arch/sparc/src/common/up_exit.c
* arch/sparc/src/common/sparc_exit.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -38,7 +38,7 @@
#include "task/task.h"
#include "sched/sched.h"
#include "group/group.h"
#include "up_internal.h"
#include "sparc_internal.h"
/****************************************************************************
* Pre-processor Definitions
@@ -136,9 +136,9 @@ void up_exit(int status)
/* Then switch contexts */
up_fullcontextrestore(tcb->xcp.regs);
sparc_fullcontextrestore(tcb->xcp.regs);
/* up_fullcontextrestore() should not return but could if software
/* sparc_fullcontextrestore() should not return but could if software
* interrupts are disabled. NOTE: Can't use DEBUGPANIC here because
* that results in a GCC compilation warning: "No return function does
* return"
arch/sparc/src/common/up_idle.c → arch/sparc/src/common/sparc_idle.c
+2 -2
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* arch/sparc/src/common/up_idle.c
* arch/sparc/src/common/sparc_idle.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -25,7 +25,7 @@
#include <nuttx/config.h>
#include <nuttx/arch.h>
#include "up_internal.h"
#include "sparc_internal.h"
/****************************************************************************
* Pre-processor Definitions
arch/sparc/src/common/up_initialize.c → arch/sparc/src/common/sparc_initialize.c
+12 -12
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* arch/sparc/src/common/up_initialize.c
* arch/sparc/src/common/sparc_initialize.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -26,15 +26,15 @@
#include <nuttx/board.h>
#include <arch/board/board.h>
#include "up_internal.h"
#include "sparc_internal.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/* Determine which (if any) console driver to use. This will probably cause
* up_serialinit to be incorrectly called if there is no USART configured to
* be an RS-232 device (see as an example arch/sparc/src/at32uc23/at32uc3
* sparc_serialinit to be incorrectly called if there is no USART configured
* to be an RS-232 device (see as an example arch/sparc/src/at32uc23/at32uc3
* config.h) This will probably have to be revisited someday.
*
* If a console is enabled and no other console device is specified, then a
@@ -103,7 +103,7 @@ volatile uint32_t *g_current_regs[CONFIG_SMP_NCPUS];
#if defined(CONFIG_STACK_COLORATION) && CONFIG_ARCH_INTERRUPTSTACK > 7
static inline void up_color_intstack(void)
{
uint32_t *ptr = (uint32_t *)up_intstack_alloc();
uint32_t *ptr = (uint32_t *)sparc_intstack_alloc();
ssize_t size;
for (size = ((CONFIG_ARCH_INTERRUPTSTACK & ~7) * CONFIG_SMP_NCPUS);
@@ -159,30 +159,30 @@ void up_initialize(void)
/* Add any extra memory fragments to the memory manager */
up_addregion();
sparc_addregion();
#ifdef CONFIG_ARCH_DMA
/* Initialize the DMA subsystem if the weak function up_dma_initialize has
* been brought into the build
/* Initialize the DMA subsystem if the weak function sparc_dma_initialize
* has been brought into the build
*/
#ifdef CONFIG_HAVE_WEAKFUNCTIONS
if (up_dma_initialize)
if (sparc_dma_initialize)
#endif
{
up_dma_initialize();
sparc_dma_initialize();
}
#endif
/* Initialize the serial device driver */
#ifdef USE_SERIALDRIVER
up_serialinit();
sparc_serialinit();
#endif
/* Initialize USB */
up_usbinitialize();
sparc_usbinitialize();
#if defined(ARCH_HAVE_LEDS)
board_autoled_on(LED_IRQSENABLED);
arch/sparc/src/common/up_internal.h → arch/sparc/src/common/sparc_internal.h
+25 -25
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* arch/sparc/src/common/up_internal.h
* arch/sparc/src/common/sparc_internal.h
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -177,37 +177,37 @@ void modifyreg32(unsigned int addr, uint32_t clearbits, uint32_t setbits);
/* Context switching */
void up_copystate(uint32_t *dest, uint32_t *src);
void sparc_copystate(uint32_t *dest, uint32_t *src);
/* Serial output */
void up_lowputs(const char *str);
void sparc_lowputs(const char *str);
/* Debug */
#ifdef CONFIG_ARCH_STACKDUMP
void up_dumpstate(void);
void sparc_dumpstate(void);
#else
# define up_dumpstate()
# define sparc_dumpstate()
#endif
/* Software interrupt 0 handler */
int up_swint0(int irq, void *context, void *arg);
int sparc_swint0(int irq, void *context, void *arg);
/* Software interrupt 1 handler */
int up_swint1(int irq, void *context, void *arg);
int sparc_swint1(int irq, void *context, void *arg);
/* Signals */
void up_sigdeliver(void);
void sparc_sigdeliver(void);
/* Interrupt handling *******************************************************/
#if CONFIG_ARCH_INTERRUPTSTACK > 7
uintptr_t up_intstack_alloc(void);
uintptr_t up_intstack_top(void);
uintptr_t sparc_intstack_alloc(void);
uintptr_t sparc_intstack_top(void);
#endif
/* Chip-specific functions **************************************************/
@@ -216,51 +216,51 @@ uintptr_t up_intstack_top(void);
/* IRQs */
bool up_pending_irq(int irq);
void up_clrpend_irq(int irq);
bool sparc_pending_irq(int irq);
void sparc_clrpend_irq(int irq);
/* DMA */
#ifdef CONFIG_ARCH_DMA
void weak_function up_dma_initialize(void);
void weak_function sparc_dma_initialize(void);
#endif
/* Memory management */
#if CONFIG_MM_REGIONS > 1
void up_addregion(void);
void sparc_addregion(void);
#else
# define up_addregion()
# define sparc_addregion()
#endif
/* Serial output */
void up_lowputc(char ch);
void up_earlyserialinit(void);
void up_serialinit(void);
void sparc_lowputc(char ch);
void sparc_earlyserialinit(void);
void sparc_serialinit(void);
/* Network */
#if defined(CONFIG_NET) && !defined(CONFIG_NETDEV_LATEINIT)
void up_netinitialize(void);
void sparc_netinitialize(void);
#else
# define up_netinitialize()
# define sparc_netinitialize()
#endif
/* USB */
#ifdef CONFIG_USBDEV
void up_usbinitialize(void);
void up_usbuninitialize(void);
void sparc_usbinitialize(void);
void sparc_usbuninitialize(void);
#else
# define up_usbinitialize()
# define up_usbuninitialize()
# define sparc_usbinitialize()
# define sparc_usbuninitialize()
#endif
/* Debug ********************************************************************/
#ifdef CONFIG_STACK_COLORATION
size_t sparc_stack_check(void *stackbase, size_t nbytes);
void up_stack_color(void *stackbase, size_t nbytes);
void sparc_stack_color(void *stackbase, size_t nbytes);
#endif
#endif /* __ASSEMBLY__ */
arch/sparc/src/common/up_lowputs.c → arch/sparc/src/common/sparc_lowputs.c
+5 -5
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* arch/sparc/src/common/up_lowputs.c
* arch/sparc/src/common/sparc_lowputs.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -24,7 +24,7 @@
#include <nuttx/config.h>
#include "up_internal.h"
#include "sparc_internal.h"
/****************************************************************************
* Pre-processor Definitions
@@ -43,18 +43,18 @@
****************************************************************************/
/****************************************************************************
* Name: up_lowputs
* Name: sparc_lowputs
*
* Description:
* This is a low-level helper function used to support debug.
*
****************************************************************************/
void up_lowputs(const char *str)
void sparc_lowputs(const char *str)
{
while (*str)
{
up_lowputc(*str++);
sparc_lowputc(*str++);
}
}
arch/sparc/src/common/up_mdelay.c → arch/sparc/src/common/sparc_mdelay.c
+1 -1
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* arch/sparc/src/common/up_mdelay.c
* arch/sparc/src/common/sparc_mdelay.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
arch/sparc/src/common/up_modifyreg16.c → arch/sparc/src/common/sparc_modifyreg16.c
+2 -2
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* arch/sparc/src/common/up_modifyreg16.c
* arch/sparc/src/common/sparc_modifyreg16.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -30,7 +30,7 @@
#include <nuttx/irq.h>
#include <nuttx/arch.h>
#include <nuttx/spinlock.h>
#include "up_internal.h"
#include "sparc_internal.h"
/****************************************************************************
* Pre-processor Definitions
arch/sparc/src/common/up_modifyreg32.c → arch/sparc/src/common/sparc_modifyreg32.c
+2 -2
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* arch/sparc/src/common/up_modifyreg32.c
* arch/sparc/src/common/sparc_modifyreg32.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -30,7 +30,7 @@
#include <nuttx/irq.h>
#include <nuttx/arch.h>
#include <nuttx/spinlock.h>
#include "up_internal.h"
#include "sparc_internal.h"
/****************************************************************************
* Pre-processor Definitions
arch/sparc/src/common/up_modifyreg8.c → arch/sparc/src/common/sparc_modifyreg8.c
+2 -2
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* arch/sparc/src/common/up_modifyreg8.c
* arch/sparc/src/common/sparc_modifyreg8.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -30,7 +30,7 @@
#include <nuttx/irq.h>
#include <nuttx/arch.h>
#include <nuttx/spinlock.h>
#include "up_internal.h"
#include "sparc_internal.h"
/****************************************************************************
* Pre-processor Definitions
arch/sparc/src/common/up_nputs.c → arch/sparc/src/common/sparc_nputs.c
+1 -1
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* arch/sparc/src/common/up_nputs.c
* arch/sparc/src/common/sparc_nputs.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
arch/sparc/src/common/up_releasestack.c → arch/sparc/src/common/sparc_releasestack.c
+2 -2
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* arch/sparc/src/common/up_releasestack.c
* arch/sparc/src/common/sparc_releasestack.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -30,7 +30,7 @@
#include <nuttx/arch.h>
#include <nuttx/kmalloc.h>
#include "up_internal.h"
#include "sparc_internal.h"
/****************************************************************************
* Private Types
arch/sparc/src/common/up_stackframe.c → arch/sparc/src/common/sparc_stackframe.c
+2 -2
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* arch/sparc/src/common/up_stackframe.c
* arch/sparc/src/common/sparc_stackframe.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -31,7 +31,7 @@
#include <nuttx/arch.h>
#include "up_internal.h"
#include "sparc_internal.h"
/****************************************************************************
* Public Functions
arch/sparc/src/common/up_testset.c → arch/sparc/src/common/sparc_testset.c
+1 -1
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* arch/sparc/src/common/up_testset.c
* arch/sparc/src/common/sparc_testset.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
arch/sparc/src/common/up_udelay.c → arch/sparc/src/common/sparc_udelay.c
+1 -1
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* arch/sparc/src/common/up_udelay.c
* arch/sparc/src/common/sparc_udelay.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
arch/sparc/src/common/up_usestack.c → arch/sparc/src/common/sparc_usestack.c
+3 -3
View File
@@ -1,5 +1,5 @@
/****************************************************************************
* arch/sparc/src/common/up_usestack.c
* arch/sparc/src/common/sparc_usestack.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -32,7 +32,7 @@
#include <nuttx/kmalloc.h>
#include <nuttx/arch.h>
#include "up_internal.h"
#include "sparc_internal.h"
/****************************************************************************
* Public Functions
@@ -111,7 +111,7 @@ int up_use_stack(struct tcb_s *tcb, void *stack, size_t stack_size)
* water marks.
*/
up_stack_color(tcb->stack_base_ptr, tcb->adj_stack_size);
sparc_stack_color(tcb->stack_base_ptr, tcb->adj_stack_size);
#endif /* CONFIG_STACK_COLORATION */
return OK;
arch/sparc/src/s698pm/Make.defs
+1 -1
View File
@@ -18,7 +18,7 @@
#
############################################################################
include common/Make.defs
include sparc_v8/Make.defs
# The start-up, "head", file
arch/sparc/src/s698pm/s698pm-irq.c
+9 -9
View File
@@ -34,7 +34,7 @@
#include <arch/irq.h>
#include "up_internal.h"
#include "sparc_internal.h"
#include "s698pm.h"
/****************************************************************************
@@ -137,8 +137,8 @@ void up_irqinitialize(void)
/* Attach software interrupts */
irq_attach(S698PM_IRQ_SW_SYSCALL_TA0, up_swint0, NULL);
irq_attach(S698PM_IRQ_SW_SYSCALL_TA8, up_swint1, NULL);
irq_attach(S698PM_IRQ_SW_SYSCALL_TA0, sparc_swint0, NULL);
irq_attach(S698PM_IRQ_SW_SYSCALL_TA8, sparc_swint1, NULL);
/* And finally, enable cpu interrupts */
@@ -359,14 +359,14 @@ void up_enable_irq(int irq)
}
/****************************************************************************
* Name: up_pending_irq
* Name: sparc_pending_irq
*
* Description:
* Return true if the interrupt is pending and unmasked.
*
****************************************************************************/
bool up_pending_irq(int irq)
bool sparc_pending_irq(int irq)
{
uintptr_t regaddr;
uint16_t regval;
@@ -416,14 +416,14 @@ bool up_pending_irq(int irq)
}
/****************************************************************************
* Name: up_clrpend_irq
* Name: sparc_clrpend_irq
*
* Description:
* Clear any pending interrupt
*
****************************************************************************/
void up_clrpend_irq(int irq)
void sparc_clrpend_irq(int irq)
{
int cpuint = IRQ_GETCPUINT(g_irqmap[irq]);
@@ -510,7 +510,7 @@ int up_prioritize_irq(int irq, int priority)
****************************************************************************/
#if CONFIG_ARCH_INTERRUPTSTACK > 7
uintptr_t up_intstack_top(void)
uintptr_t sparc_intstack_top(void)
{
#if defined(CONFIG_SMP)
return g_cpu_intstack_top[up_cpu_index()];
@@ -530,7 +530,7 @@ uintptr_t up_intstack_top(void)
****************************************************************************/
#if CONFIG_ARCH_INTERRUPTSTACK > 7
uintptr_t up_intstack_alloc(void)
uintptr_t sparc_intstack_alloc(void)
{
#if defined(CONFIG_SMP)
return g_cpu_intstack_top[up_cpu_index()] - INTSTACK_SIZE;
arch/sparc/src/s698pm/s698pm-lowconsole.c
+3 -3
View File
@@ -32,7 +32,7 @@
#include <arch/irq.h>
#include "up_internal.h"
#include "sparc_internal.h"
#include "s698pm-uart.h"
#include "s698pm.h"
@@ -245,14 +245,14 @@ void s698pm_consoleinit(void)
}
/****************************************************************************
* Name: up_lowputc
* Name: sparc_lowputc
*
* Description:
* Output one byte on the serial console
*
****************************************************************************/
void up_lowputc(char ch)
void sparc_lowputc(char ch)
{
#ifdef HAVE_SERIAL_CONSOLE
while ((s698pm_getreg(S698PM_CONSOLE_BASE, S698PM_UART_STATREG_OFFSET) &
arch/sparc/src/s698pm/s698pm-lowinit.c
+3 -3
View File
@@ -25,7 +25,7 @@
#include <nuttx/config.h>
#include "s698pm-config.h"
#include "up_internal.h"
#include "sparc_internal.h"
#include "s698pm.h"
/****************************************************************************
@@ -61,7 +61,7 @@
****************************************************************************/
#ifdef CONFIG_DEBUG_FEATURES
# define showprogress(c) up_lowputc(c)
# define showprogress(c) sparc_lowputc(c)
#else
# define showprogress(c)
#endif
@@ -105,7 +105,7 @@ void up_lowinit(void)
*/
#ifdef USE_EARLYSERIALINIT
up_earlyserialinit();
sparc_earlyserialinit();
#endif
/* Perform board-level initialization */
arch/sparc/src/s698pm/s698pm-serial.c
+18 -18
View File
@@ -44,7 +44,7 @@
#include <nuttx/spinlock.h>
#include <arch/board/board.h>
#include "up_internal.h"
#include "sparc_internal.h"
#include "s698pm-config.h"
#include "chip.h"
#include "s698pm-uart.h"
@@ -146,7 +146,7 @@
/* Common initialization logic will not not know that the all of the UARTs
* have been disabled. So, as a result, we may still have to provide
* stub implementations of up_earlyserialinit(), up_serialinit(), and
* stub implementations of sparc_earlyserialinit(), sparc_serialinit(), and
* up_putc().
*/
@@ -878,18 +878,18 @@ static bool up_txempty(struct uart_dev_s *dev)
****************************************************************************/
/****************************************************************************
* Name: up_earlyserialinit
* Name: sparc_earlyserialinit
*
* Description:
* Performs the low level UART initialization early in debug so that the
* serial console will be available during bootup. This must be called
* before up_serialinit. NOTE: This function depends on GPIO pin
* configuration performed in up_consoleinit() and main clock iniialization
* performed in up_clkinitialize().
* before sparc_serialinit. NOTE: This function depends on GPIO pin
* configuration performed in sparc_consoleinit() and main clock
* iniialization performed in up_clkinitialize().
*
****************************************************************************/
void up_earlyserialinit(void)
void sparc_earlyserialinit(void)
{
/* Disable interrupts from all UARTS. The console is enabled in
* s698pm_consoleinit().
@@ -914,15 +914,15 @@ void up_earlyserialinit(void)
}
/****************************************************************************
* Name: up_serialinit
* Name: sparc_serialinit
*
* Description:
* Register serial console and serial ports. This assumes
* that up_earlyserialinit was called previously.
* that sparc_earlyserialinit was called previously.
*
****************************************************************************/
void up_serialinit(void)
void sparc_serialinit(void)
{
/* Register the console */
@@ -966,31 +966,31 @@ int up_putc(int ch)
{
/* Add CR */
up_lowputc('\r');
sparc_lowputc('\r');
}
up_lowputc(ch);
sparc_lowputc(ch);
up_restoreuartint(dev, imr);
#endif
return ch;
}
/****************************************************************************
* Name: up_earlyserialinit, up_serialinit, and up_putc
* Name: sparc_earlyserialinit, sparc_serialinit, and up_putc
*
* Description:
* stubs that may be needed. These stubs would be used if all UARTs are
* disabled. In that case, the logic in common/up_initialize() is not
* disabled. In that case, the logic in common/sparc_initialize() is not
* smart enough to know that there are not UARTs and will still expect
* these interfaces to be provided.
*
****************************************************************************/
#else /* HAVE_UART_DEVICE */
void up_earlyserialinit(void)
void sparc_earlyserialinit(void)
{
}
void up_serialinit(void)
void sparc_serialinit(void)
{
}
@@ -1019,10 +1019,10 @@ int up_putc(int ch)
{
/* Add CR */
up_lowputc('\r');
sparc_lowputc('\r');
}
up_lowputc(ch);
sparc_lowputc(ch);
#endif
return ch;
}
arch/sparc/src/s698pm/s698pm-timerisr.c
+3 -3
View File
@@ -31,7 +31,7 @@
#include <nuttx/arch.h>
#include <arch/board/board.h>
#include "up_internal.h"
#include "sparc_internal.h"
#include "s698pm.h"
#include "s698pm_tim.h"
#include "s698pm_irq.h"
@@ -90,7 +90,7 @@ static int s698pm_timerisr(int irq, uint32_t *regs, void *arg)
{
/* Clear the pending timer interrupt */
up_clrpend_irq(S698PM_IRQ_TIMER1);
sparc_clrpend_irq(S698PM_IRQ_TIMER1);
/* Process timer interrupt */
@@ -136,7 +136,7 @@ void up_timer_initialize(void)
/* Configure the timer interrupt */
up_clrpend_irq(S698PM_IRQ_TIMER1);
sparc_clrpend_irq(S698PM_IRQ_TIMER1);
/* Attach the timer interrupt vector */
arch/sparc/src/s698pm/s698pm_cpuidlestack.c
+1 -1
View File
@@ -30,7 +30,7 @@
#include <nuttx/arch.h>
#include <nuttx/sched.h>
#include "up_internal.h"
#include "sparc_internal.h"
#include "s698pm.h"
#ifdef CONFIG_SMP
arch/sparc/src/s698pm/s698pm_cpuindex.c
+1 -1
View File
@@ -29,7 +29,7 @@
#include <nuttx/arch.h>
#include <nuttx/irq.h>
#include "up_internal.h"
#include "sparc_internal.h"
/****************************************************************************
* Public Functions
arch/sparc/src/s698pm/s698pm_cpupause.c
+3 -3
View File
@@ -35,7 +35,7 @@
#include <nuttx/sched_note.h>
#include "sched/sched.h"
#include "up_internal.h"
#include "sparc_internal.h"
#include "chip.h"
/****************************************************************************
@@ -128,7 +128,7 @@ int up_cpu_paused(int cpu)
* of the assigned task list for this CPU.
*/
up_savestate(tcb->xcp.regs);
sparc_savestate(tcb->xcp.regs);
/* Wait for the spinlock to be released */
@@ -155,7 +155,7 @@ int up_cpu_paused(int cpu)
* will be made when the interrupt returns.
*/
up_restorestate(tcb->xcp.regs);
sparc_restorestate(tcb->xcp.regs);
spin_unlock(&g_cpu_wait[cpu]);
arch/sparc/src/s698pm/s698pm_cpustart.c
+1 -1
View File
@@ -36,7 +36,7 @@
#include <nuttx/sched_note.h>
#include "sched/sched.h"
#include "up_internal.h"
#include "sparc_internal.h"
#ifdef CONFIG_BUILD_KERNEL
# include "s698pm_mmu.h"

Some files were not shown because too many files have changed in this diff Show More