omr
/
omos-tcnj2024
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve merge conflict

This commit is contained in:
MonkeyGG2 2024-02-18 08:42:53 -05:00
parent dea41c09d8 fb77c800b1
commit 2374905355
3 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/include/video.h
View File

@ -5,7 +5,7 @@
#define VGA_SIZE 4000 #define VGA_SIZE 4000
#define VGA_TEXT_SIZE 2000 #define VGA_TEXT_SIZE 2000
s32 unused = 0; s16 unused = 0;
s8 *vga_vidmem = (s8 *)0xb8000; s8 *vga_vidmem = (s8 *)0xb8000;
s8 vga_unused = 0; s8 vga_unused = 0;

40
sys/sysinit.c
View File

@ -3,8 +3,46 @@
void void
sysinit(void) sysinit(void)
{ {
char *howdy = "Om Smart"; char *howdy = "Om Smart.";
char *howday = "Om Smarter.";
vga_clearscreen(); vga_clearscreen();
/*
for (s16 i = 0; i < 100; i++) {
vga_write(howdy, strlen(howdy), 0x1f); vga_write(howdy, strlen(howdy), 0x1f);
vga_write(howday, strlen(howday), 0x0f);
}
vga_write("sid", 3, 0x07);
vga_write("did", 3, 0x07);
vga_write("fid", 3, 0x07);
*/
vga_write(
"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter."
"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter."
"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter."
"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter."
"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter."
"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter."
"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter."
"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter."
"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter."
"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter."
"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter."
"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter."
"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter."
"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter."
"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter."
"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter."
"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter."
"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter."
"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter."
"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter."
"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter."
"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter."
"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter."
"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter."
"Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter.Om Smart.Om Smarter."
"bob", 2003, 0x0F);
} }

4
sys/video.c
View File

@ -11,11 +11,11 @@ vga_write(s8 *sequence, s16 size, s8 flags)
vga_vidmem[i] = sequence[using_size + i]; vga_vidmem[i] = sequence[using_size + i];
vga_vidmem[++i] = flags; } vga_vidmem[++i] = flags; }
unused = 4001; unused = 4000;
return; return;
} }
if (size * 2 + unused >= VGA_SIZE) { if (size * 2 + unused > VGA_SIZE) {
s16 needed_space = size * 2; s16 needed_space = size * 2;
for (s16 i = 0; i <= (unused = VGA_SIZE - needed_space); i++) { for (s16 i = 0; i <= (unused = VGA_SIZE - needed_space); i++) {