DragonOS-Community/DragonOS
4
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-25 18:23:22 +00:00
Code Issues Releases Wiki Activity

Patch refactor scm and textui (#289)

Browse Source 
* 重构屏幕管理器和textui框架

* 切换字体为spleen，并增加对字体的抽象

* 修正文档

---------

Co-authored-by: longjin <longjin@RinGoTek.cn>
This commit is contained in:
hanjiezhou
2023-08-20 00:19:36 +08:00
committed by GitHub
parent 5db5a5652c
commit abe3a6ea3c
42 changed files with 2005 additions and 1726 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
kernel/src/driver/video/video.c
View File

@ -17,10 +17,10 @@ extern void rs_register_softirq_video();
uint64_t video_refresh_expire_jiffies = 0;
uint64_t video_last_refresh_pid = -1;
struct scm_buffer_info_t video_frame_buffer_info = {0};
static struct multiboot_tag_framebuffer_info_t __fb_info;
static struct scm_buffer_info_t *video_refresh_target = NULL;
// static struct scm_buffer_info_t *_video_refresh_target = NULL;
static struct scm_buffer_info_t video_refresh_target = {0};
static struct process_control_block *video_daemon_pcb = NULL;
static spinlock_t daemon_refresh_lock;
@ -35,9 +35,9 @@ void init_frame_buffer()
kinfo("Re-mapping VBE frame buffer...");
video_frame_buffer_info.vaddr = SPECIAL_MEMOEY_MAPPING_VIRT_ADDR_BASE + FRAME_BUFFER_MAPPING_OFFSET;
rs_map_phys(video_frame_buffer_info.vaddr, __fb_info.framebuffer_addr, video_frame_buffer_info.size, PAGE_KERNEL_PAGE | PAGE_PWT | PAGE_PCD);
// kinfo("vaddr:%#018lx", video_frame_buffer_info.vaddr);
kinfo("VBE frame buffer successfully Re-mapped!");
}
@ -56,12 +56,16 @@ int video_refresh_daemon(void *unused)
if (rs_clock() >= video_refresh_expire_jiffies)
{
if (likely(video_refresh_target != NULL))
if (likely(video_refresh_target.size != 0))
{
spin_lock(&daemon_refresh_lock);
if (video_frame_buffer_info.vaddr != NULL)
memcpy((void *)video_frame_buffer_info.vaddr, (void *)video_refresh_target->vaddr,
video_refresh_target->size);
{
// kdebug("video_frame_buffer_info.vaddr = %#018lx,get_video_refresh_target_vaddr()= %#018lx" ,video_frame_buffer_info.vaddr,get_video_refresh_target_vaddr());
memcpy((void *)video_frame_buffer_info.vaddr, (void *)get_video_refresh_target_vaddr(),
video_refresh_target.size);
}
spin_unlock(&daemon_refresh_lock);
video_daemon_pcb->virtual_runtime =
0xfffff0000000; // 临时解决由于显示刷新进程的虚拟运行时间过大/过小，导致其不运行，或者一直运行的问题。将来应使用实时调度解决它
@ -76,6 +80,10 @@ int video_refresh_daemon(void *unused)
return 0;
}
uint64_t get_video_refresh_target_vaddr()
{
return video_refresh_target.vaddr;
}
/**
* @brief 唤醒video的守护进程
*/
@ -105,10 +113,13 @@ int video_reinitialize(bool level) // 这个函数会在main.c调用, 保证 vid
{
rs_unregister_softirq(VIDEO_REFRESH_SIRQ);
// 计算开始时间
video_refresh_expire_jiffies = rs_timer_next_n_ms_jiffies(10 * REFRESH_INTERVAL);
video_refresh_expire_jiffies = rs_timer_next_n_ms_jiffies(50 * REFRESH_INTERVAL);
kdebug("video_frame_buffer_info.vaddr = %#018lx,get_video_refresh_target_vaddr()= %#018lx", video_frame_buffer_info.vaddr, get_video_refresh_target_vaddr());
io_mfence();
// 创建video守护进程
video_daemon_pcb = kthread_run(&video_refresh_daemon, NULL, "Video refresh daemon");
io_mfence();
video_daemon_pcb->virtual_runtime = 0; // 特殊情况， 最高优先级， 以后再改
// 启用屏幕刷新软中断
rs_register_softirq_video();
@ -123,7 +134,8 @@ int video_reinitialize(bool level) // 这个函数会在main.c调用, 保证 vid
* @param buf
* @return int
*/
int video_set_refresh_target(struct scm_buffer_info_t *buf)
int video_set_refresh_target(struct scm_buffer_info_t buf)
{
rs_unregister_softirq(VIDEO_REFRESH_SIRQ);
@ -137,10 +149,11 @@ int video_set_refresh_target(struct scm_buffer_info_t *buf)
// rs_usleep(1000);
// }
// kdebug("buf = %#018lx", buf);
video_refresh_target = buf;
rs_register_softirq_video();
kdebug("register softirq video done");
// rs_raise_softirq(VIDEO_REFRESH_SIRQ);
}
/**
@ -153,8 +166,8 @@ int video_init()
memset(&video_frame_buffer_info, 0, sizeof(struct scm_buffer_info_t));
memset(&__fb_info, 0, sizeof(struct multiboot_tag_framebuffer_info_t));
video_refresh_target = NULL;
// _video_refresh_target = NULL;
video_refresh_target = (struct scm_buffer_info_t){0};
io_mfence();
// 从multiboot2获取帧缓冲区信息
int reserved;
@ -180,17 +193,21 @@ int video_init()
video_frame_buffer_info.size =
video_frame_buffer_info.width * video_frame_buffer_info.height * ((video_frame_buffer_info.bit_depth + 7) / 8);
// 先临时映射到该地址，稍后再重新映射
video_frame_buffer_info.vaddr = 0xffff800003000000;
// 先临时映射到50M的位置，稍后再重新映射
video_frame_buffer_info.vaddr = 0xffff800003200000;
char init_text1[] = "Video driver to map.\n";
for (int i = 0; i < sizeof(init_text1) - 1; ++i)
c_uart_send(COM1, init_text1[i]);
rs_pseudo_map_phys(video_frame_buffer_info.vaddr, __fb_info.framebuffer_addr, video_frame_buffer_info.size);
io_mfence();
char init_text2[] = "Video driver initialized.\n";
for (int i = 0; i < sizeof(init_text2) - 1; ++i)
{
c_uart_send(COM1, init_text2[i]);
}
return 0;
}

16
kernel/src/driver/video/video.h
View File

@ -1,8 +1,8 @@
#pragma once
#include <common/glib.h>
#include <stdbool.h>
#include <libs/libUI/screen_manager.h>
#include <libs/lib_ui/screen_manager.h>
extern struct scm_buffer_info_t video_frame_buffer_info;
/**
* @brief 重新初始化显示驱动，需先低级初始化才能高级初始化
* @param level 初始化等级
@ -21,13 +21,15 @@ int video_init();
/**
* @brief 设置帧缓冲区刷新目标
*
* @param buf
* @return int
*
* @param buf
* @return int
*/
int video_set_refresh_target(struct scm_buffer_info_t *buf);
// int video_set_refresh_target(struct scm_buffer_info_t *buf);
int video_set_refresh_target(struct scm_buffer_info_t buf);
extern uint64_t video_refresh_expire_jiffies;
extern uint64_t video_last_refresh_pid;
void video_refresh_framebuffer(void *data);
void video_refresh_framebuffer(void *data);
uint64_t get_video_refresh_target_vaddr();