fixed merge in setup

This commit is contained in:
shockrah committed 2020-04-22 20:49:40 -07:00
commit 4487ddc0c8
4 files changed
+13 -5

No files matched your search

+1 -1
View File
@@ -49,7 +49,7 @@ unsigned char keymap[128] = {
// Reads one key from the keyboard
void kbd_read_key(struct cpu_reg_state* cpu) {
void kbd_read_key(__attribute__((unused)) struct cpu_reg_state* cpu) {
u8 scancode = serial_read_byte(KBD_PORT);
if(scancode & 0x80) {
// Key released
+1 -1
View File
@@ -4,7 +4,7 @@
#include "serial.h"
#include "stlio.h"
void pit_inc_ticks(struct cpu_reg_state* cpu) {
void pit_inc_ticks(__attribute__((unused)) struct cpu_reg_state* cpu) {
pit_timer_ticks++;
}
+10 -2
View File
@@ -4,6 +4,14 @@
dpkg -s bochs
if [ $? -ne 0 ];then
apt install bochs-x
else
echo Nothing to install
fi
gen=`dpkg --list | grep genisoimage`
if [ -z "$gen" ]; then
sudo apt-get install genisoimage
fi
nasm=`dpkg --list | grep nasm`
if [ -z "$nasm" ]; then
sudo apt-get install nasm
fi
+1 -1
View File
@@ -12,7 +12,7 @@ void jmain(void) {
" timer: prints out current timer tick\n"
" quit: hangs because power management vry hrd\n");
printf("Where's the prompt? \n It literally causes triple faults so its invisible :^)\n"
"_Also the cursor is busted and i don't wanna fix it");
"_Also the cursor is busted and i don't wanna fix it\n");
while(1) {
memset((u8*)line, 0x00, LINE_LENGTH);
read(line, LINE_LENGTH);