From ad663cc523eadf09d39d46d890020752d3a053b6 Mon Sep 17 00:00:00 2001 From: shockrahwow Date: Thu, 5 Dec 2019 10:43:14 -0800 Subject: [PATCH 1/3] newline in prompt --- shell.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell.c b/shell.c index aa5b252..543f23e 100644 --- a/shell.c +++ b/shell.c @@ -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); From 5902ef62b1c61e19187fc087a4352834175bb12f Mon Sep 17 00:00:00 2001 From: shockrah Date: Sun, 9 Feb 2020 21:53:10 -0800 Subject: [PATCH 2/3] gcc attributes regarding unused parameters --- kbd.c | 2 +- pit.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kbd.c b/kbd.c index f4d0b28..f14a299 100644 --- a/kbd.c +++ b/kbd.c @@ -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 diff --git a/pit.c b/pit.c index 57f031b..3cc40ff 100644 --- a/pit.c +++ b/pit.c @@ -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++; } From 332fbdcee0ac29cafa55beaa92fac0c5a4d005e3 Mon Sep 17 00:00:00 2001 From: shockrah Date: Sun, 16 Feb 2020 12:28:13 -0800 Subject: [PATCH 3/3] more comprehesive setup script pulling in nasm and genisoimage packages for debian --- scripts/setup.sh | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index 811cd2e..ad4370d 100644 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -1,11 +1,17 @@ -#!/bin/bash +#!/bin/sh # Setup script to grab any and all dependancies needed to build this on any of my machines -bochs_=$(dpkg --list | grep bochs) -if [ "$bochs_" == "" ] -then +bochs_=`dpkg --list | grep bochs` +if [ -z "$bochs_" ]; then # install bochs shiz - sudo apt-get update sudo apt-get install bochs "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