From bce58215eb6702134b51afc8ad9305c7329c2a1d Mon Sep 17 00:00:00 2001 From: aaron Date: Tue, 10 Apr 2018 12:40:34 +0000 Subject: [PATCH] git-svn-id: https://spexeah.com:8443/svn/Asuro@462 6dbc8c32-bb84-406f-8558-d1cf31a0ab0c --- src/driver/storage/storagemanagement.pas | 12 +++++------- src/kernel.pas | 6 ++++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/driver/storage/storagemanagement.pas b/src/driver/storage/storagemanagement.pas index 2e9b0faa..b0626d59 100644 --- a/src/driver/storage/storagemanagement.pas +++ b/src/driver/storage/storagemanagement.pas @@ -17,8 +17,6 @@ uses console, terminal, drivermanagement, - vmemorymanager, - lmemorymanager, strings; type @@ -34,8 +32,8 @@ type sName : pchar; writeCallback : PPIOHook; readCallback : PPIOHook; - createCallback : PPCreateHook; - detectCallback : PPDetectHook; + createCallback : uint32; + detectCallback : uint32; end; TStorage_Volume = record @@ -44,7 +42,7 @@ type sectorSize : uint32; filesystem : TFilesystem; end; - APStorage_Volume = array[0..255] of PStorage_volume; + APStorage_Volume = array[0..10] of PStorage_volume; TStorage_Device = record idx : uint8; @@ -59,8 +57,8 @@ type var - storageDevices : array[0..255] of TStorage_Device; //index in this array is global drive id - fileSystems : array[0..31] of TFilesystem; + storageDevices : array[0..25] of PStorage_Device; //index in this array is global drive id + fileSystems : array[0..31] of PFilesystem; procedure init(); diff --git a/src/kernel.pas b/src/kernel.pas index 77dfce4c..34b11dd8 100644 --- a/src/kernel.pas +++ b/src/kernel.pas @@ -93,7 +93,6 @@ begin console.init(); console.writestringln('A'); - terminal.init(); console.writestringln('B'); @@ -104,6 +103,9 @@ begin console.writestringln('Booting Asuro...'); + while true do begin + end; + if (multibootmagic <> MULTIBOOT_BOOTLOADER_MAGIC) then begin console.setdefaultattribute(console.combinecolors(Red, Black)); console.outputln('KERNEL', 'Multiboot Compliant Boot-Loader Needed!'); @@ -135,7 +137,7 @@ begin bios_data_area.init(); drivermanagement.init(); - //storagemanagement.init(); + storagemanagement.init(); //asm INT 13 end; STI;