Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/drivers/i2c/dev_i2c_bit_ops.c
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ static rt_ssize_t i2c_recv_bytes(struct rt_i2c_bus_device *bus,
ptr ++;
count --;

LOG_D("recieve bytes: 0x%02x, %s",
LOG_D("receive bytes: 0x%02x, %s",
val, (flags & RT_I2C_NO_READ_ACK) ?
"(No ACK/NACK)" : (count ? "ACK" : "NACK"));

Expand Down
2 changes: 1 addition & 1 deletion components/drivers/spi/dev_spi_msd.c
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ static rt_err_t _send_cmd(
return -RT_ERROR;//fail
}

//recieve other byte
//receive other byte
if (type == response_r1)
{
return RT_EOK;
Expand Down
2 changes: 1 addition & 1 deletion components/finsh/msh.c
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ static char *_msh_exec_search_env(const char *pg_name)
or hitting its end */
while (1)
{
/* env paths are seperated by ':' */
/* env paths are separated by ':' */
if (*pos == ':' || *pos == '\0')
{
tmp_ch = *pos;
Expand Down
10 changes: 5 additions & 5 deletions components/lwp/lwp_args.c
Original file line number Diff line number Diff line change
Expand Up @@ -671,21 +671,21 @@ static char *_find_word(char *cp)
}

/**
* @brief Seperate words in a string and get the next word
* @brief Separate words in a string and get the next word
*
* @param[in] cp Pointer to the string to process
*
* @return char* Pointer to the next word in the string
*
* @note Finds the next whitespace character, seperates words, and returns a
* @note Finds the next whitespace character, separates words, and returns a
* pointer to the next word.
*/
static char *_seperate_and_get_nextword(char *cp)
static char *_separate_and_get_nextword(char *cp)
{
/* find next whitespace */
for (; *cp && (*cp != ' ') && (*cp != '\t'); cp++)
;
/* seperate words */
/* separate words */
while ((*cp == ' ') || (*cp == '\t'))
{
*cp++ = '\0';
Expand Down Expand Up @@ -762,7 +762,7 @@ rt_err_t lwp_args_load_script(struct lwp_args_info *ai, const char *filename)

do
{
nextword = _seperate_and_get_nextword(cp);
nextword = _separate_and_get_nextword(cp);
args_append(&ow_ai, cp, strlen(cp), LWP_ARGS_TYPE_KARG);
cp = nextword;
}
Expand Down
4 changes: 2 additions & 2 deletions include/rtdef.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
* 2023-12-01 Shell Support of dynamic device
* 2023-12-18 xqyjlj add rt_always_inline
* 2023-12-22 Shell Support hook list
* 2024-01-18 Shell Seperate basical types to a rttypes.h
* Seperate the compiler portings to rtcompiler.h
* 2024-01-18 Shell Separate basical types to a rttypes.h
* Separate the compiler portings to rtcompiler.h
* 2024-03-30 Meco Man update version number to v5.2.0
* 2025-11-10 Rbb666 update version number to v5.3.0
*/
Expand Down
2 changes: 1 addition & 1 deletion libcpu/arm/AT91SAM7S/interrupt.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ rt_uint32_t rt_thread_switch_interrupt_flag;

void rt_hw_interrupt_handler(int vector)
{
rt_kprintf("Unhandled interrupt %d occured!!!\n", vector);
rt_kprintf("Unhandled interrupt %d occurred!!!\n", vector);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion libcpu/arm/AT91SAM7X/interrupt.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ rt_uint32_t rt_thread_switch_interrupt_flag;

static void rt_hw_interrupt_handler(int vector, void *param)
{
rt_kprintf("Unhandled interrupt %d occured!!!\n", vector);
rt_kprintf("Unhandled interrupt %d occurred!!!\n", vector);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion libcpu/arm/AT91SAM7X/trap.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ void rt_hw_trap_fiq(void)
extern struct rt_thread* rt_current_thread;
void rt_hw_trap_abort(void)
{
rt_kprintf("Abort occured!!! Thread [%s] suspended.\n",rt_current_thread->parent.name);
rt_kprintf("Abort occurred!!! Thread [%s] suspended.\n",rt_current_thread->parent.name);
rt_thread_suspend(rt_current_thread);
rt_schedule();

Expand Down
2 changes: 1 addition & 1 deletion libcpu/arm/cortex-r4/interrupt.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ rt_uint32_t rt_thread_switch_interrupt_flag;

static void rt_hw_int_not_handle(int vector, void *param)
{
rt_kprintf("Unhandled interrupt %d occured!!!\n", vector);
rt_kprintf("Unhandled interrupt %d occurred!!!\n", vector);
}

#define vimRAM (0xFFF82000U)
Expand Down
2 changes: 1 addition & 1 deletion libcpu/arm/lpc214x/cpuport.c
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ rt_uint32_t rt_thread_switch_interrupt_flag;

void rt_hw_interrupt_handler(int vector, void *param)
{
rt_kprintf("Unhandled interrupt %d occured!!!\n", vector);
rt_kprintf("Unhandled interrupt %d occurred!!!\n", vector);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion libcpu/arm/lpc24xx/interrupt.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ rt_uint32_t rt_thread_switch_interrupt_flag;
/*@{*/
void rt_hw_interrupt_handler(int vector, void *param)
{
rt_kprintf("Unhandled interrupt %d occured!!!\n", vector);
rt_kprintf("Unhandled interrupt %d occurred!!!\n", vector);
}

void rt_hw_interrupt_init(void)
Expand Down
2 changes: 1 addition & 1 deletion libcpu/arm/s3c24x0/interrupt.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ rt_uint32_t rt_thread_switch_interrupt_flag;

static void rt_hw_interrupt_handle(int vector, void *param)
{
rt_kprintf("Unhandled interrupt %d occured!!!\n", vector);
rt_kprintf("Unhandled interrupt %d occurred!!!\n", vector);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion libcpu/arm/s3c44b0/interrupt.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ unsigned char interrupt_bank3[256];

void rt_hw_interrupt_handle(int vector)
{
rt_kprintf("Unhandled interrupt %d occured!!!\n", vector);
rt_kprintf("Unhandled interrupt %d occurred!!!\n", vector);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion libcpu/arm/sep4020/interrupt.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ rt_uint32_t rt_thread_switch_interrupt_flag;

static void rt_hw_interrupt_handle(int vector, void *param)
{
rt_kprintf("Unhandled interrupt %d occured!!!\n", vector);
rt_kprintf("Unhandled interrupt %d occurred!!!\n", vector);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion libcpu/ia32/interrupt.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void rt_hw_pic_init()

void rt_hw_interrupt_handle(int vector, void* param)
{
rt_kprintf("Unhandled interrupt %d occured!!!\n", vector);
rt_kprintf("Unhandled interrupt %d occurred!!!\n", vector);
}

void rt_hw_isr(int vector)
Expand Down
2 changes: 1 addition & 1 deletion libcpu/mips/gs232/interrupt.c
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ static struct gs232_intc_regs volatile *gs232_hw0_icregs

static void rt_hw_interrupt_handler(int vector, void *param)
{
rt_kprintf("Unhandled interrupt %d occured!!!\n", vector);
rt_kprintf("Unhandled interrupt %d occurred!!!\n", vector);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion libcpu/ppc/ppc405/interrupt.c
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ rt_uint32_t rt_thread_switch_interrput_flag;

rt_isr_handler_t rt_hw_interrupt_handler(rt_uint32_t vector, void* param)
{
rt_kprintf("Unhandled interrupt %d occured!!!\n", vector);
rt_kprintf("Unhandled interrupt %d occurred!!!\n", vector);
return RT_NULL;
}

Expand Down
2 changes: 1 addition & 1 deletion libcpu/risc-v/t-head/c906/interrupt.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ struct rt_irq_desc isr_table[INTERRUPTS_MAX];

static void rt_hw_interrupt_handler(int vector, void *param)
{
rt_kprintf("Unhandled interrupt %d occured!!!\n", vector);
rt_kprintf("Unhandled interrupt %d occurred!!!\n", vector);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion libcpu/risc-v/t-head/c908/interrupt.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ struct rt_irq_desc isr_table[INTERRUPTS_MAX];

static void rt_hw_interrupt_handler(int vector, void *param)
{
rt_kprintf("Unhandled interrupt %d occured!!!\n", vector);
rt_kprintf("Unhandled interrupt %d occurred!!!\n", vector);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion libcpu/sim/posix/cpu_port.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ rt_ubase_t rt_thread_switch_interrupt_flag;

/* interrupt event mutex */
static pthread_mutex_t *ptr_int_mutex;
static pthread_cond_t cond_int_hit; /* interrupt occured! */
static pthread_cond_t cond_int_hit; /* interrupt occurred! */
static volatile unsigned int cpu_pending_interrupts;
static int (* cpu_isr_table[MAX_INTERRUPT_NUM])(void) = {0};

Expand Down
2 changes: 1 addition & 1 deletion libcpu/unicore32/sep6200/interrupt.c
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ rt_inline void sep6200_irq_mask(rt_uint32_t irq)
}
rt_isr_handler_t rt_hw_interrupt_handle(rt_uint32_t vector)
{
rt_kprintf("Unhandled interrupt %d occured!!!\n", vector);
rt_kprintf("Unhandled interrupt %d occurred!!!\n", vector);
return RT_NULL;
}

Expand Down
2 changes: 1 addition & 1 deletion libcpu/xilinx/microblaze/trap.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ rt_uint32_t rt_thread_switch_interrupt_flag;

void rt_hw_interrupt_handler(int vector)
{
rt_kprintf("Unhandled interrupt %d occured!!!\n", vector);
rt_kprintf("Unhandled interrupt %d occurred!!!\n", vector);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions tools/building.py
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ def PrepareBuilding(env, root_directory, has_libcpu=False, remove_components = [
if env['LINK'].find('gcc') != -1:
env['LINK'] = env['LINK'].replace('gcc', 'g++')

# we need to seperate the variant_dir for BSPs and the kernels. BSPs could
# we need to separate the variant_dir for BSPs and the kernels. BSPs could
# have their own components etc. If they point to the same folder, SCons
# would find the wrong source code to compile.
bsp_vdir = 'build'
Expand Down Expand Up @@ -792,7 +792,7 @@ def local_group(group, objects):
for group in Projects:
local_group(group, objects_in_group)

# sort seperately, because the data type of
# sort separately, because the data type of
# the members of the two lists are different
objects_in_group = sorted(objects_in_group)
objects = sorted(objects)
Expand Down
Loading