Skip to content

Commit a4a06db

Browse files
authored
Keyboard, working on memory, change return(), and add new messages
A lot.
1 parent 3f6477b commit a4a06db

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

kernel/main.c

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
#include <stdio.h>
22
#include <time.h>
33
#include <kernel/tty.h>
4+
#include <string.h>
5+
#include "devices/keyboard/keyboard.h"
46

57
void kernel_main(void) {
68
int time_t;
79
terminal_initialize();
10+
//memset()
811
fptr = fopen("ascii-art.txt","r");
912
char c;
1013
c = fgetc(fptr);
@@ -13,11 +16,15 @@ void kernel_main(void) {
1316
c = fgetc(fptr);
1417
};
1518
fclose(fptr);
19+
keyboard.init();
20+
keyboard.work();
1621
terminal_writestring("The time is %d", time_t);
1722
terminal_writestring("Welcome to Platypus OS!\n");
1823
terminal_writestring("This is still in development, so there isn't anything to do...\n\n\n");
1924
terminal_writestring("Yet.\n");
20-
terminal_writestring("If you want to help, go to https://github.com/Platypus-Tech/new-platypus-os-drafts/ to help\n\n");
25+
terminal_writestring("If you want to help, go to https://github.com/Platypus-Tech/new-platypus-os-drafts/ to help\n");
26+
terminal_writestring("...\n");
2127
terminal_writestring("Or to see the source code!");
22-
return("Chicken butt"); /* will it work... will it return "Program returned Chicken butt (0xChicken butt)"... */
28+
/*return("Chicken butt");*/
29+
return("Really serious message :D POO POO PEEPEE"); /* Eh no chicken butt */
2330
};

0 commit comments

Comments
 (0)