From 5390621fdd1dff76233b1db6b161dea817dc3421 Mon Sep 17 00:00:00 2001
From: kieron <kieron@6dbc8c32-bb84-406f-8558-d1cf31a0ab0c>
Date: Wed, 17 May 2017 13:15:25 +0000
Subject: [PATCH] hadcf.
git-svn-id: https://spexeah.com:8443/svn/Asuro@53 6dbc8c32-bb84-406f-8558-d1cf31a0ab0c
---
src/isr.pas | 2 +-
src/kernel.pas | 4 +---
src/util.pas | 7 +++++++
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/isr.pas b/src/isr.pas
index d1f243af..54742642 100644
--- a/src/isr.pas
+++ b/src/isr.pas
@@ -4,7 +4,7 @@
* Description: Stub for ISR Driver Initialization
************************************************
* Author: K Morris
- * Contributors:
+ * Contributors: A Hance
************************************************ }
unit isr;
diff --git a/src/kernel.pas b/src/kernel.pas
index f114a6c6..9b6268a5 100644
--- a/src/kernel.pas
+++ b/src/kernel.pas
@@ -43,11 +43,9 @@ begin
asm
MOV dds, CS
end;
- z:=0;
console.setdefaultattribute(console.combinecolors(Red, Black));
if dds = $08 then console.setdefaultattribute(console.combinecolors(Green, Black));
console.writehexln(dds);
- mbm := mbm div z;
console.setdefaultattribute(console.combinecolors(Green, Black));
console.writestringln('Asuro Booted Correctly!');
console.writestringln('');
@@ -62,7 +60,7 @@ begin
console.writeint(((mbinfo^.mem_upper + 1000) div 1024) +1);
console.writestringln('MB');
console.setdefaultattribute(console.combinecolors(lYellow, Black));
- util.halt_and_catch_fire;
+ util.halt_and_dont_catch_fire;
{while true do begin
c:= keyboard.get_scancode;
console.writehexln(c);
diff --git a/src/util.pas b/src/util.pas
index 31f9be50..e26f3c7f 100644
--- a/src/util.pas
+++ b/src/util.pas
@@ -21,6 +21,7 @@ procedure outb(port : uint16; val : uint8);
procedure outw(port : uint16; val : uint16);
procedure outl(port : uint16; val : uint32);
procedure halt_and_catch_fire();
+procedure halt_and_dont_catch_fire();
function inb(port : uint16) : uint8;
function inw(port : uint16) : uint16;
function inl(port : uint16) : uint32;
@@ -95,6 +96,12 @@ begin
end;
end;
+procedure halt_and_dont_catch_fire(); [public, alias: 'util_halt_and_dont_catch_fire'];
+begin
+ while true do begin
+ end;
+end;
+
function inl(port : uint16) : uint32; [public, alias: 'util_inl'];
begin
asm