lby/mkrtos-real
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

用户态中断封装

Browse Source
This commit is contained in:
zhangzheng
2023-11-21 23:13:12 +08:00
parent 7336f4a480
commit ba53429b12
16 changed files with 132 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mkrtos_user/lib/sys/inc/u_irq_sender.h
View File

@@ -2,6 +2,24 @@
#include "u_types.h"
msg_tag_t uirq_bind(obj_handler_t obj_inx, umword_t irq_no, umword_t prio_sub_pre);
typedef union u_irq_prio
{
struct
{
uhmword_t prio_p;
uhmword_t prio_s;
};
umword_t raw;
} u_irq_prio_t;
static inline u_irq_prio_t u_irq_prio_create(uhmword_t p, uhmword_t s)
{
return (u_irq_prio_t){
.prio_p = p,
.prio_s = s,
};
}
msg_tag_t uirq_bind(obj_handler_t obj_inx, umword_t irq_no, u_irq_prio_t prio_sub_pre);
msg_tag_t uirq_wait(obj_handler_t obj_inx, int flags);
msg_tag_t uirq_ack(obj_handler_t obj_inx, umword_t irq_no);

39
mkrtos_user/lib/sys/src/u_irq_sender.c
View File

@@ -5,6 +5,7 @@
#include "u_types.h"
#include "u_util.h"
#include "u_arch.h"
#include "u_irq_sender.h"
#include <string.h>
enum log_op
{
@@ -19,17 +20,17 @@ enum irq_sender_op
WAIT_IRQ, //!< 等待中断触发
ACK_IRQ, //!< 中断确认
};
msg_tag_t uirq_bind(obj_handler_t obj_inx, umword_t irq_no, umword_t prio_sub_pre)
msg_tag_t uirq_bind(obj_handler_t obj_inx, umword_t irq_no, u_irq_prio_t prio_sub_pre)
{
register volatile umword_t r0 asm("r0");
mk_syscall(syscall_prot_create(BIND_IRQ, IRQ_PROT, obj_inx).raw,
0,
irq_no,
0,
0,
0,
0);
0,
irq_no,
prio_sub_pre.raw,
0,
0,
0);
asm __volatile__(""
:
:
@@ -43,12 +44,12 @@ msg_tag_t uirq_wait(obj_handler_t obj_inx, int flags)
register volatile umword_t r0 asm("r0");
mk_syscall(syscall_prot_create(WAIT_IRQ, IRQ_PROT, obj_inx).raw,
0,
flags,
0,
0,
0,
0);
0,
flags,
0,
0,
0,
0);
asm __volatile__(""
:
:
@@ -62,12 +63,12 @@ msg_tag_t uirq_ack(obj_handler_t obj_inx, umword_t irq_no)
register volatile umword_t r0 asm("r0");
mk_syscall(syscall_prot_create(ACK_IRQ, IRQ_PROT, obj_inx).raw,
0,
irq_no,
0,
0,
0,
0);
0,
irq_no,
0,
0,
0,
0);
asm __volatile__(""
:
:

7
mkrtos_user/lib/sys_util/inc/u_intr.h Normal file
View File

@@ -0,0 +1,7 @@
#pragma once
#include <u_types.h>
#include <u_irq_sender.h>
int u_intr_bind(int irq_no, u_irq_prio_t prio, int th_prio,
void *stack, umword_t stack_size, void *msg_buf, void (*thread_func)(void));

46
mkrtos_user/lib/sys_util/src/u_intr.c Normal file
View File

@@ -0,0 +1,46 @@
#include <u_types.h>
#include <u_hd_man.h>
#include <u_prot.h>
#include <u_factory.h>
#include <u_irq_sender.h>
#include <u_task.h>
#include <errno.h>
#include <u_thread_util.h>
int u_intr_bind(int irq_no, u_irq_prio_t prio, int th_prio,
void *stack, umword_t stack_size, void *msg_buf, void (*thread_func)(void))
{
obj_handler_t irq_obj = handler_alloc();
obj_handler_t th_hd;
msg_tag_t tag;
int ret;
if (irq_obj == HANDLER_INVALID)
{
return -ENOMEM;
}
tag = factory_create_irq_sender(FACTORY_PROT, vpage_create_raw3(0, 0, irq_obj));
if (msg_tag_get_val(tag) < 0)
{
handler_free(irq_obj);
return msg_tag_get_val(tag);
}
tag = uirq_bind(irq_obj, irq_no, prio);
if (msg_tag_get_val(tag) < 0)
{
handler_free_umap(irq_obj);
return msg_tag_get_val(tag);
}
ret = u_thread_create(&th_hd, stack, stack_size, msg_buf, thread_func);
if (ret < 0)
{
handler_free_umap(irq_obj);
return ret;
}
u_thread_run(th_hd, th_prio);
return ret;
}

2
mkrtos_user/server/app/drv/timer.c
View File

@@ -22,7 +22,7 @@ void timer_init(void)
assert(obj != HANDLER_INVALID);
msg_tag_t tag = factory_create_irq_sender(FACTORY_PROT, vpage_create_raw3(0, 0, obj));
assert(msg_tag_get_val(tag) >= 0);
uirq_bind(obj, TIM2_IRQn, 0);
uirq_bind(obj, TIM2_IRQn, u_irq_prio_create(1, 1));
int ret = thread_create(IRQ_THREAD_PRIO, TIM2_IRQHandler, (umword_t)(stack0 + STACK_SIZE), NULL);
assert(ret >= 0);

2
mkrtos_user/server/app/drv/uart4.c
View File

@@ -74,7 +74,7 @@ void init_uart4(u32 baudRate)
assert(irq_obj != HANDLER_INVALID);
msg_tag_t tag = factory_create_irq_sender(FACTORY_PROT, vpage_create_raw3(0, 0, irq_obj));
assert(msg_tag_get_val(tag) >= 0);
uirq_bind(irq_obj, UART4_IRQn, (1 << 16) | 1);
uirq_bind(irq_obj, UART4_IRQn, u_irq_prio_create(1, 1));
int ret = thread_create(IRQ_THREAD_PRIO, UART4_IRQHandler, (umword_t)(stack0 + STACK_SIZE), NULL);
assert(ret >= 0);

2
mkrtos_user/server/app/drv/uart5.c
View File

@@ -60,7 +60,7 @@ void init_uart5(u32 baudRate)
assert(irq_obj != HANDLER_INVALID);
msg_tag_t tag = factory_create_irq_sender(FACTORY_PROT, vpage_create_raw3(0, 0, irq_obj));
assert(msg_tag_get_val(tag) >= 0);
uirq_bind(irq_obj, UART5_IRQn, (1 << 16) | 1);
uirq_bind(irq_obj, UART5_IRQn, u_irq_prio_create(1, 1));
int ret = thread_create(IRQ_THREAD_PRIO, UART5_IRQHandler, (umword_t)(stack0 + STACK_SIZE), NULL);
assert(ret >= 0);

2
mkrtos_user/server/app/drv/usart2.c
View File

@@ -58,7 +58,7 @@ void init_usart2(u32 BaudRate)
assert(irq_obj != HANDLER_INVALID);
msg_tag_t tag = factory_create_irq_sender(FACTORY_PROT, vpage_create_raw3(0, 0, irq_obj));
assert(msg_tag_get_val(tag) >= 0);
uirq_bind(irq_obj, USART2_IRQn, (1 << 16) | 1);
uirq_bind(irq_obj, USART2_IRQn, u_irq_prio_create(1, 1));
int ret = thread_create(IRQ_THREAD_PRIO, USART2_IRQHandler, (umword_t)(stack0 + STACK_SIZE), NULL);
assert(ret >= 0);

2
mkrtos_user/server/app/drv/usart3.c
View File

@@ -59,7 +59,7 @@ void init_usart3(u32 baudRate)
assert(irq_obj != HANDLER_INVALID);
msg_tag_t tag = factory_create_irq_sender(FACTORY_PROT, vpage_create_raw3(0, 0, irq_obj));
assert(msg_tag_get_val(tag) >= 0);
uirq_bind(irq_obj, USART3_IRQn, (1 << 16) | 1);
uirq_bind(irq_obj, USART3_IRQn, u_irq_prio_create(1, 1));
int ret = thread_create(IRQ_THREAD_PRIO, USART3_IRQHandler, (umword_t)(stack0 + STACK_SIZE), NULL);
assert(ret >= 0);

2
mkrtos_user/server/app/drv/wk2xx_hw.c
View File

@@ -59,7 +59,7 @@ void wk2xx_hw_init(void)
assert(irq_obj != HANDLER_INVALID);
msg_tag_t tag = factory_create_irq_sender(FACTORY_PROT, vpage_create_raw3(0, 0, irq_obj));
assert(msg_tag_get_val(tag) >= 0);
uirq_bind(irq_obj, EXTI15_10_IRQn, (0 << 16) | 1);
uirq_bind(irq_obj, EXTI15_10_IRQn, u_irq_prio_create(0, 1));
int ret = thread_create(IRQ_THREAD_PRIO, exti_12_irq, (umword_t)(stack0 + STACK_SIZE), NULL);
assert(ret >= 0);

22
mkrtos_user/server/drv/rtthread_drv/bsp/stm32/libraries/HAL_Drivers/CMSIS/Include/core_cm3.h
View File

@@ -1512,7 +1512,7 @@ __STATIC_INLINE void __NVIC_EnableIRQ(IRQn_Type IRQn)
{
if ((int32_t)(IRQn) >= 0)
{
NVIC->ISER[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
// NVIC->ISER[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
}
}
@@ -1548,7 +1548,8 @@ __STATIC_INLINE void __NVIC_DisableIRQ(IRQn_Type IRQn)
{
if ((int32_t)(IRQn) >= 0)
{
NVIC->ICER[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
// NVIC->ICER[(((uint32_t)IRQn) >> 5UL)] = (uint32_t)(1UL << (((uint32_t)IRQn) & 0x1FUL));
__DSB();
__ISB();
}
@@ -1638,14 +1639,15 @@ __STATIC_INLINE uint32_t __NVIC_GetActive(IRQn_Type IRQn)
*/
__STATIC_INLINE void __NVIC_SetPriority(IRQn_Type IRQn, uint32_t priority)
{
if ((int32_t)(IRQn) >= 0)
{
NVIC->IP[((uint32_t)IRQn)] = (uint8_t)((priority << (8U - __NVIC_PRIO_BITS)) & (uint32_t)0xFFUL);
}
else
{
SCB->SHP[(((uint32_t)IRQn) & 0xFUL)-4UL] = (uint8_t)((priority << (8U - __NVIC_PRIO_BITS)) & (uint32_t)0xFFUL);
}
/*TODO:*/
// if ((int32_t)(IRQn) >= 0)
// {
// NVIC->IP[((uint32_t)IRQn)] = (uint8_t)((priority << (8U - __NVIC_PRIO_BITS)) & (uint32_t)0xFFUL);
// }
// else
// {
// SCB->SHP[(((uint32_t)IRQn) & 0xFUL)-4UL] = (uint8_t)((priority << (8U - __NVIC_PRIO_BITS)) & (uint32_t)0xFFUL);
// }
}

4
mkrtos_user/server/drv/rtthread_drv/bsp/stm32/stm32f103-onenet-nbiot/rtconfig.h
View File

@@ -84,7 +84,7 @@
#define RT_UNAMED_PIPE_NUMBER 64
#define RT_USING_SERIAL
#define RT_USING_SERIAL_V1
#define RT_SERIAL_USING_DMA
// #define RT_SERIAL_USING_DMA
#define RT_SERIAL_RB_BUFSZ 64
#define RT_USING_PIN
#define RT_USING_DM
@@ -257,7 +257,7 @@
#define BSP_USING_GPIO
#define BSP_USING_UART
#define BSP_USING_UART1
#define BSP_USING_UART2
/* Board extended module Drivers */

1
mkrtos_user/server/drv/rtthread_drv/inc/test.h
View File

@@ -1,4 +1,5 @@
#pragma once
void dfs_test(void);
int completion_sample(void);
void rtthread_drv_test(void);

12
mkrtos_user/server/drv/rtthread_drv/src/dfs_test.c Normal file
View File

@@ -0,0 +1,12 @@
#include <fcntl.h>
#include <unistd.h>
#include <assert.h>
void dfs_test(void)
{
int fd = open("/dev/uart2", O_RDWR, 0x777);
assert(fd >= 0);
write(fd, "1234\n", 5);
close(fd);
}

7
mkrtos_user/server/drv/rtthread_drv/src/main.c
View File

@@ -6,6 +6,9 @@
#include <syscall_backend.h>
#include <rtthread_inter.h>
#include <test.h>
#include <unistd.h>
#include <fcntl.h>
#include <assert.h>
/* defined the LED0 pin: PC0 */
#define LED0_PIN GET_PIN(C, 0)
extern void rt_hw_board_init(void);
@@ -22,8 +25,10 @@ int main(void)
#if 0
completion_sample();
#endif
rtthread_drv_test();
#endif
dfs_test();
/* set LED0 pin mode to output */
rt_pin_mode(LED0_PIN, PIN_MODE_OUTPUT);

2
mkrtos_user/server/drv/rtthread_drv/src/rtthread_inter.c
View File

@@ -482,11 +482,11 @@ rt_err_t rt_timer_control(rt_timer_t timer, int cmd, void *arg)
}
rt_tick_t rt_timer_next_timeout_tick(void)
{
pthread_spin_lock(&timer_lock);
umword_t sys_tick;
int min = INT32_MAX;
sys_tick = sys_read_tick();
pthread_spin_lock(&timer_lock);
for (int i = 0; i < TIMER_LIST_NR; i++)
{
if (timer_list[i] &&