From 4daa4bedc51ce2ec5d0b915e222360752af40e67 Mon Sep 17 00:00:00 2001 From: pointer-to-bios Date: Sun, 14 Jan 2024 21:52:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0C=E4=BB=A3=E7=A0=81=E4=B8=AD?= =?UTF-8?q?=E6=9C=89=E5=85=B3isa=E7=9A=84=E5=AE=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/include/kernel/kernel.h | 2 +- src/kernel/arch/x86_64/memm_x86_64.c | 2 +- src/kernel/main.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/include/kernel/kernel.h b/src/include/kernel/kernel.h index 5ed0bda..b3c645c 100644 --- a/src/include/kernel/kernel.h +++ b/src/include/kernel/kernel.h @@ -7,7 +7,7 @@ #include -#define ISA_STRING "x86_64" +#define ISA_NAME "x86_64" #endif diff --git a/src/kernel/arch/x86_64/memm_x86_64.c b/src/kernel/arch/x86_64/memm_x86_64.c index 2eeec75..6112c03 100644 --- a/src/kernel/arch/x86_64/memm_x86_64.c +++ b/src/kernel/arch/x86_64/memm_x86_64.c @@ -123,8 +123,8 @@ bool memm_map_pageframes_to( } map_pageframe_to(target, physical, user, write, align); - usize step = min(size, (usize)align * MEMM_PAGE_SIZE); + usize step = min(size, (usize)align * MEMM_PAGE_SIZE); size -= step; target += step; physical += step; diff --git a/src/kernel/main.c b/src/kernel/main.c index 9eda2e9..9da9895 100644 --- a/src/kernel/main.c +++ b/src/kernel/main.c @@ -65,7 +65,7 @@ void get_frame_buffer_with_bootinfo(framebuffer *fb, bootinfo_t *bootinfo) fb->width = fbinfo->framebuffer_width; fb->height = fbinfo->framebuffer_height; fb->pixsize = fbinfo->framebuffer_bpp / 8; - fb->pixtype = rgb; + fb->pixtype = rgb; // 绝大多数显示器配置都是rgb，不需要特意判断 memm_map_pageframes_to( (u64)fb->pointer, (u64)fb->pointer, fb->width * fb->height * fb->pixsize,