Merge pull request #15 from raphydaphy/master

Fetch latest update
raphydaphy · Nov 21, 2015 · 81fd689 · 81fd689
2 parents 9cd7f51 + a31f298
commit 81fd689
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/documentation/downloads.md b/documentation/downloads.md
@@ -4,7 +4,7 @@ If you came here because you just want to try out Q OS without having to do comp
 
 ## Download the latest <code>Q-OS.iso</code>
 
-If you want to try Q OS inside a virtual machine or burn it to a CD/USB, click [here](https://drive.google.com/open?id=0B6wT3i4cCDb_LWYyNFpyYXZUelk). That link will take you to a Google Drive file download page which should always have the most recent Q OS <code>.iso</code> file. If it isn't the most recent, that is because the latest version has errors that prevent it from working or cause major bugs. If you are very brave and want to try buggy versions, have a look at [this file](https://github.com/raphydaphy/Q-Operating-System/blob/master/compiling.md) for some instructions on how to compile the code for Q OS on your own computer.
+If you want to try Q OS inside a virtual machine or burn it to a CD/USB, click [here](https://drive.google.com/open?id=0B6wT3i4cCDb_T1RodV9qQ05TZHM). That link will take you to a Google Drive file download page which should always have the most recent Q OS <code>.iso</code> file. If it isn't the most recent, that is because the latest version has errors that prevent it from working or cause major bugs. If you are very brave and want to try buggy versions, have a look at [this file](https://github.com/raphydaphy/Q-Operating-System/blob/master/compiling.md) for some instructions on how to compile the code for Q OS on your own computer.
 
 ## Download versions of Q OS older than the latest release
 

diff --git a/kernel/inc/assemblyFunctions.c b/kernel/inc/assemblyFunctions.c
@@ -20,9 +20,9 @@ void halt()
 
 void reboot()
 {
-    uint8 good = 0x02;
-    while (good & 0x02)
-        good = inportb(0x64);
+    uint8 rebootTemp = 0x02;
+    while (rebootTemp & 0x02)
+        rebootTemp = inportb(0x64);
     outportb(0x64, 0xFE);
     halt();
 }
diff --git a/kernel/inc/assemblyFunctions.h b/kernel/inc/assemblyFunctions.h
@@ -4,13 +4,14 @@
 #define ASSEMBLYFUNCTIONS_H
 
 #include "intTypeDefs.h"
-uint8 inportb (uint16 _port);
 
+uint8 inportb (uint16 _port);
 void outportb (uint16 _port, uint8 _data);
+void halt();
+void reboot();
 
 void halt();
 
 void reboot();
 
 #endif
-