git-svn-id: https://spexeah.com:8443/svn/Asuro@498 6dbc8c32-bb84-406f-8558-d1cf31a0ab0c

src/driver/storage/IDE.pas

@@ -136,7 +136,7 @@ var
     secotrs : uint32;
     cpacityMB : uint32;
     buffer : puint32;
-    i : uint8;
+    i : uint32;
     d : uint8;
 begin
 
@@ -153,26 +153,26 @@ begin
         console.writeint(cpacityMB);
         console.writestringln('MB');
 
-        buffer := puint32(kalloc(1024));
+        buffer := puint32(kalloc(1024 * 2000));
         //buffer^:= secotrs;
 
         for i:=0 to 20 do begin
             puint32(buffer + (i div 2))^:= $10010110;
         end;
 
-        writePIO28(d, 2, 1, buffer);
+        writePIO28(d, 2, 2, buffer);
         //buffer^:= $FFFF;
         for i:=0 to 20 do begin
             puint32(buffer + (i div 2))^:= $FFFFFFFF;
         end;
         
-        readPIO28(d, 2, 1, buffer);
+        readPIO28(d, 2, 2, buffer);
 
         for i:=0 to 20 do begin
             if puint32(buffer + (i div 2))^ <> $10010110 then begin
                 console.writestringln('Tests failed!');
                 exit;
-        end;
+            end;
         end;
 
     // if uint32(buffer^) = secotrs then begin

src/driver/storage/storagemanagement.pas

@@ -25,11 +25,12 @@ type
     TControllerType = (ControllerIDE, ControllerUSB, ControllerAHCI, ControllerNET);
     PStorage_volume = ^TStorage_Volume;
     PStorage_device = ^TStorage_Device;
+    APStorage_Volume = array[0..10] of PStorage_volume;
 
     PPIOHook = procedure(volume : PStorage_volume; directory : pchar; byteCount : uint32; buffer : puint32);
     PPHIOHook = procedure(volume : PStorage_device; addr : uint32; sectors : uint32; buffer : puint32);
-    PPCreateHook = procedure(disk : PStorage_Device; sectors : uint32; start : uint32);
-    PPDetectHook = procedure(disk : PStorage_Device);
+    PPCreateHook = procedure(disk : PStorage_Device; sectors : uint32; start : uint32; config : puint32);
+    PPDetectHook = procedure(disk : PStorage_Device; volumes : Puint32);
 
     PPHIOHook_ = procedure;
 
@@ -37,8 +38,8 @@ type
         sName : pchar;
         writeCallback  : PPIOHook;
         readCallback   : PPIOHook;
-        createCallback : uint32;
-        detectCallback : uint32;
+        createCallback : PPCreateHook;
+        detectCallback : PPDetectHook;
     end;
 
     TStorage_Volume = record
@@ -49,7 +50,6 @@ type
         filesystemInfo  : Puint32; // type dependant on filesystem. can be null if not creating volume now
         directory       : PLinkedListBase; // type dependant on filesytem?
     end;
-    APStorage_Volume = array[0..10] of PStorage_volume;
 
     TStorage_Device = record
         idx              : uint8;