darkkirb/old-DasOS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

just merge #1

Merged
Mtgxyz merged 22 commits from master into master 2016-07-01 14:22:41 +00:00
Conversation 0 Commits 22 Files changed 97 +7 -10
3 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 99a53601b7 - Show all commits

BIN
prototypes-rework/boot.img
View file

Binary file not shown.

2
prototypes-rework/video/Makefile
View file

@ -5,7 +5,7 @@
include ../config.mk
KERNEL = video.ker
LIBS = -lboot -lvideo
LIBS = -lboot -lvideo -lserial
all: builddir $(KERNEL)

15
prototypes-rework/video/src/init.cpp
View file

@ -1,15 +1,17 @@
#include <stdint.h>
#include <multiboot.hpp>
#include <io.hpp>
#include <driver/video.hpp>
#include <driver/serial.hpp>
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);
}