shockrah/jankos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed merge in setup

Browse Source
This commit is contained in:
shockrah 2020-04-22 20:49:40 -07:00
commit 4487ddc0c8
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kbd.c
View File

@ -49,7 +49,7 @@ unsigned char keymap[128] = {
// Reads one key from the keyboard // 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); u8 scancode = serial_read_byte(KBD_PORT);
if(scancode & 0x80) { if(scancode & 0x80) {
// Key released // Key released

2
pit.c
View File

@ -4,7 +4,7 @@
#include "serial.h" #include "serial.h"
#include "stlio.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++; pit_timer_ticks++;
} }

12
scripts/setup.sh
View File

@ -4,6 +4,14 @@
dpkg -s bochs dpkg -s bochs
if [ $? -ne 0 ];then if [ $? -ne 0 ];then
apt install bochs-x apt install bochs-x
else fi
echo Nothing to install
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 fi

2
shell.c
View File

@ -12,7 +12,7 @@ void jmain(void) {
" timer: prints out current timer tick\n" " timer: prints out current timer tick\n"
" quit: hangs because power management vry hrd\n"); " quit: hangs because power management vry hrd\n");
printf("Where's the prompt? \n It literally causes triple faults so its invisible :^)\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) { while(1) {
memset((u8*)line, 0x00, LINE_LENGTH); memset((u8*)line, 0x00, LINE_LENGTH);
read(line, LINE_LENGTH); read(line, LINE_LENGTH);