From 5e113daf7b5a5344e5859b0c44e0949f813c84dc Mon Sep 17 00:00:00 2001 From: plane000 Date: Sun, 7 Oct 2018 20:18:20 +0100 Subject: [PATCH] Cleaned up comments --- .vscode/tasks.json | 26 ++++++++++++++++++++++---- bin/ThanOS.iso | Bin 8067072 -> 8067072 bytes kernel.asm | 22 +++++++++++++--------- kernel.cpp | 3 +++ 4 files changed, 38 insertions(+), 13 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index a8e9261..59c63e2 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -24,9 +24,27 @@ "problemMatcher": [] }, { - "label": "Run", + "label": "Build All", "type": "shell", - "command": "&('C:/Program Files/qemu/qemu-system-i386') -kernel bin/ThanOS.bin -serial mon:stdio -drive id=disk,file=hda.img,if=none -device ahci,id=ahci -device ide-drive,drive=disk,bus=ahci.0", + "command": "bash --login -c 'make'; bash --login -c 'make iso'", + "group": { + "kind": "test", + "isDefault": true, + }, + }, + { + "label": "Build all and run", + "type": "shell", + "command": "bash --login -c 'make'; bash --login -c 'make iso'; &('D:/Program Files/qemu/qemu-system-i386') -cdrom E:/OS/ThanOS/bin/ThanOS.iso -serial mon:stdio", + "group": { + "kind": "test", + "isDefault": true, + }, + }, + { + "label": "Run (NOT WORKING)", + "type": "shell", + "command": "&('D:/Program Files/qemu/qemu-system-i386') -kernel bin/ThanOS.bin -serial mon:stdio -drive id=disk,file=hda.img,if=none -device ahci,id=ahci -device ide-drive,drive=disk,bus=ahci.0", "group": { "kind": "test", "isDefault": true @@ -35,7 +53,7 @@ { "label": "Run (With ISO)", "type": "shell", - "command": "&('C:/Program Files/qemu/qemu-system-i386') -cdrom bin/ThanOS.iso -serial mon:stdio -drive file=hda.img,format=raw", + "command": "&('D:/Program Files/qemu/qemu-system-i386') -cdrom E:/OS/ThanOS/bin/ThanOS.iso -serial mon:stdio", "group": { "kind": "test", "isDefault": true @@ -51,4 +69,4 @@ } } ] -} \ No newline at end of file +} diff --git a/bin/ThanOS.iso b/bin/ThanOS.iso index ad05aa98078604e6a6059b5d4cdcc78d91596118..74fa1a0e254bd5413ba77c81425780592d065321 100644 GIT binary patch delta 11234 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 delta 11234 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 m