diff --git a/prototypes-rework/boot.img b/prototypes-rework/boot.img deleted file mode 100644 index f0d3010..0000000 Binary files a/prototypes-rework/boot.img and /dev/null differ diff --git a/prototypes-rework/video/Makefile b/prototypes-rework/video/Makefile index 2a072dc..5d30401 100644 --- a/prototypes-rework/video/Makefile +++ b/prototypes-rework/video/Makefile @@ -5,7 +5,7 @@ include ../config.mk KERNEL = video.ker -LIBS = -lboot -lvideo +LIBS = -lboot -lvideo -lserial all: builddir $(KERNEL) diff --git a/prototypes-rework/video/src/init.cpp b/prototypes-rework/video/src/init.cpp index 3c890a7..1087f3b 100644 --- a/prototypes-rework/video/src/init.cpp +++ b/prototypes-rework/video/src/init.cpp @@ -1,15 +1,17 @@ #include #include -#include #include +#include extern "C" void init(multiboot::Structure const & data) { - write_com(0x3F8, 'H'); - write_com(0x3F8, 'i'); - write_com(0x3F8, '\n'); + SerialPort serial(SERIAL_COM1); + + serial.write('H'); + serial.write('i'); + serial.write('\n'); VideoScreen video(*data.vbe.modeInfo); for(uint32_t y = 0; y < video.height(); y++) @@ -20,10 +22,5 @@ extern "C" void init(multiboot::Structure const & data) } } - write_com(0x3F8, 'B'); - write_com(0x3F8, 'y'); - write_com(0x3F8, 'e'); - write_com(0x3F8, '\n'); - while(true); }