catfood/lab7-fix2023
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

enable uart output

Browse Source
This commit is contained in:
catfood 2023-11-22 22:07:31 +08:00
parent af16e1508a
commit 4761724dca
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -145,11 +145,13 @@ run: $(IMAGE)
@qemu-system-i386 \ @qemu-system-i386 \
-boot order=a \ -boot order=a \
-drive file=$<,format=raw \ -drive file=$<,format=raw \
-serial stdio \
gdb: $(IMAGE) gdb: $(IMAGE)
@qemu-system-i386 \ @qemu-system-i386 \
-boot order=a \ -boot order=a \
-drive file=$<,format=raw \ -drive file=$<,format=raw \
-serial stdio \
-s -S \ -s -S \
gdb-no-graphic: $(IMAGE) gdb-no-graphic: $(IMAGE)
@ -157,6 +159,7 @@ gdb-no-graphic: $(IMAGE)
-nographic \ -nographic \
-boot order=a \ -boot order=a \
-drive file=$<,format=raw \ -drive file=$<,format=raw \
-serial stdio \
-s -S \ -s -S \
# 调试的内核代码elf # 调试的内核代码elf

1
include/proto.h
View File

@ -12,6 +12,7 @@ int vga_get_disppos();
void vga_write_char(const char ch, u8 color); void vga_write_char(const char ch, u8 color);
void vga_write_str(const char * str); void vga_write_str(const char * str);
void vga_write_str_color(const char * str, u8 color); void vga_write_str_color(const char * str, u8 color);
int uart_kprintf(const char *fmt, ...);
//added by zcr //added by zcr
void disable_irq(int irq); void disable_irq(int irq);