git-svn-id: https://spexeah.com:8443/svn/Asuro@759 6dbc8c32-bb84-406f-8558-d1cf31a0ab0c
This commit is contained in:
aaron
parent
775733ff51
commit
6330b1bc72
113
src/driver/storage/asfs.pas
Normal file
113
src/driver/storage/asfs.pas
Normal file
@ -0,0 +1,113 @@
|
|||||||
|
{ ************************************************
|
||||||
|
* Asuro
|
||||||
|
* Unit: Drivers/storage/asfs
|
||||||
|
* Description: asfs file system driver
|
||||||
|
*
|
||||||
|
************************************************
|
||||||
|
* Author: Aaron Hance
|
||||||
|
* Contributors:
|
||||||
|
************************************************ }
|
||||||
|
|
||||||
|
unit asfs;
|
||||||
|
|
||||||
|
interface
|
||||||
|
|
||||||
|
uses
|
||||||
|
console,
|
||||||
|
storagemanagement,
|
||||||
|
util, terminal,
|
||||||
|
lmemorymanager,
|
||||||
|
strings,
|
||||||
|
lists,
|
||||||
|
tracer,
|
||||||
|
serial,
|
||||||
|
rtc;
|
||||||
|
|
||||||
|
type
|
||||||
|
|
||||||
|
TFilesystemRecord = bitpacked record
|
||||||
|
magicNumber : uint32;
|
||||||
|
sectorSize : uint16;
|
||||||
|
sectorsPerTable : uint8;
|
||||||
|
totalSectors : uint32;
|
||||||
|
volumeLabel : array[0..15] of uint8;
|
||||||
|
endOfData : uint32;
|
||||||
|
end;
|
||||||
|
PFilesystemRecord = ^TFilesystemRecord;
|
||||||
|
|
||||||
|
//File or folder entry for file table
|
||||||
|
TFileEntry = bitpacked record
|
||||||
|
filename : array[0..15] of uint8;
|
||||||
|
lastWriteDate : array[0..3] of uint8; // year (2000 + x), month, day, hour
|
||||||
|
lastReadDate : array[0..3] of uint8;
|
||||||
|
attributes : uint8; // 0 null entry, 1 file, 2 folder, 3 this folder, 4 parent folder, 5 table continuation, 6 volume root
|
||||||
|
extension : array[0..6] of uint8;
|
||||||
|
location : uint32; // location on disk
|
||||||
|
numSectors : uint32; // size in sectors
|
||||||
|
end;
|
||||||
|
PFileEntry = ^TFileEntry;
|
||||||
|
|
||||||
|
var
|
||||||
|
filesystem : TFilesystemRecord;
|
||||||
|
//nullsectors : array[0..1024] of TFileEntry; //cache some null entry pointers for effeciency sake
|
||||||
|
|
||||||
|
procedure init;
|
||||||
|
procedure create_volume(disk : PStorage_Device; sectors : uint32; start : uint32; config : puint32);
|
||||||
|
procedure detect_volumes(disk : PStorage_Device);
|
||||||
|
|
||||||
|
implementation
|
||||||
|
|
||||||
|
procedure init() begin
|
||||||
|
push_trace('asfs.init()');
|
||||||
|
filesystem.sName:= 'asfs';
|
||||||
|
//filesystem.readDirCallback:= @readDirectoryGen;
|
||||||
|
//filesystem.createDirCallback:= @writeDirectoryGen;
|
||||||
|
filesystem.createcallback:= @create_volume;
|
||||||
|
filesystem.detectcallback:= @detect_volumes;
|
||||||
|
//filesystem.writecallback:= @writeFile;
|
||||||
|
|
||||||
|
storagemanagement.register_filesystem(@filesystem);
|
||||||
|
end;
|
||||||
|
|
||||||
|
procedure create_volume(disk : PStorage_Device; sectors : uint32; start : uint32; config : puint32)
|
||||||
|
var
|
||||||
|
filesystemRecord : PFilesystemRecord;
|
||||||
|
fileEntry : PFileEntry;
|
||||||
|
buffer : puint32;
|
||||||
|
|
||||||
|
thisArray : byteArray8 = ('.',' ',' ',' ',' ',' ',' ',' ');
|
||||||
|
parentArray : byteArray8 = ('.','.',' ',' ',' ',' ',' ',' ');
|
||||||
|
begin
|
||||||
|
|
||||||
|
buffer := puint32(kalloc(disk^.sectorSize))
|
||||||
|
memset(uint32(buffer), 0, disk^.sectorSize);
|
||||||
|
PFilesystemRecord := PFilesystemRecord(buffer);
|
||||||
|
|
||||||
|
filesystemRecord^.magicNumber := $A2F2;
|
||||||
|
filesystemRecord^.sectorSize := disk^.sectorsize;
|
||||||
|
filesystemRecord^.sectorsPerTable := 8;
|
||||||
|
filesystemRecord^.totalSectors := sectors;
|
||||||
|
filesystemRecord^.endOfData := filesystemRecord.sectorsPerTable;
|
||||||
|
//filesystemRecord.volumeLabel := config^
|
||||||
|
|
||||||
|
disk^.writecallback(disk, start, 1, buffer);
|
||||||
|
memset(uint32(buffer), 0, disk^.sectorSize);
|
||||||
|
|
||||||
|
fileEntry := PFileEntry(buffer)[0];
|
||||||
|
fileEntry^.filename := thisArray;
|
||||||
|
fileEntry^.attributes := 6;
|
||||||
|
fileEntry^.location := 1;
|
||||||
|
|
||||||
|
fileEntry := PFileEntry(buffer)[1];
|
||||||
|
fileEntry^.filename := parentArray;
|
||||||
|
fileEntry^.attributes := 0;
|
||||||
|
fileEntry^.location := 1;
|
||||||
|
|
||||||
|
disk^.writecallback(disk, start + 1, 1, buffer);
|
||||||
|
|
||||||
|
|
||||||
|
end;
|
||||||
|
|
||||||
|
|
||||||
|
procedure detect_volumes(disk : PStorage_Device) begin
|
||||||
|
end;
|
||||||
604
src/driver/storage/fat32_OLD.pas
Normal file
604
src/driver/storage/fat32_OLD.pas
Normal file
@ -0,0 +1,604 @@
|
|||||||
|
{ ************************************************
|
||||||
|
* Asuro
|
||||||
|
* Unit: Drivers/storage/fat32
|
||||||
|
* Description: fat32 file system driver
|
||||||
|
*
|
||||||
|
************************************************
|
||||||
|
* Author: Aaron Hance
|
||||||
|
* Contributors:
|
||||||
|
************************************************ }
|
||||||
|
|
||||||
|
{
|
||||||
|
Todo in the future, optimise by prvoiding batch read/write commands
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
unit FAT32;
|
||||||
|
|
||||||
|
interface
|
||||||
|
|
||||||
|
uses
|
||||||
|
console,
|
||||||
|
storagemanagement,
|
||||||
|
util, terminal,
|
||||||
|
lmemorymanager,
|
||||||
|
strings,
|
||||||
|
lists,
|
||||||
|
tracer,
|
||||||
|
serial;
|
||||||
|
|
||||||
|
type
|
||||||
|
|
||||||
|
TBootRecord = bitpacked record
|
||||||
|
jmp2boot : ubit24;
|
||||||
|
OEMName : array[0..7] of char;
|
||||||
|
sectorSize : uint16;
|
||||||
|
spc : uint8;
|
||||||
|
rsvSectors : uint16;
|
||||||
|
numFats : uint8;
|
||||||
|
numDirEnt : uint16;
|
||||||
|
numSectors : uint16;
|
||||||
|
mediaDescp : uint8;
|
||||||
|
sectorsPerFat : uint16;
|
||||||
|
sectorsPerTrack : uint16;
|
||||||
|
heads : uint16;
|
||||||
|
hiddenSectors : uint32;
|
||||||
|
manySectors : uint32;
|
||||||
|
FATSize : uint32;
|
||||||
|
flags : uint16;
|
||||||
|
signature : uint8;
|
||||||
|
FATVersion : uint16;
|
||||||
|
rootCluster : uint32;
|
||||||
|
FSInfoCluster : uint16;
|
||||||
|
backupCluster : uint16;
|
||||||
|
reserved0 : array[0..11] of uint8;
|
||||||
|
driveNumber : uint8;
|
||||||
|
reserved1 : uint8;
|
||||||
|
bsignature : uint8;// = $28;
|
||||||
|
volumeID : uint32;
|
||||||
|
volumeLabel : array[0..10] of uint8;
|
||||||
|
identString : array[0..7] of char;// = 'FAT32 ';
|
||||||
|
end;
|
||||||
|
PBootRecord = ^TBootRecord;
|
||||||
|
|
||||||
|
byteArray8 = array[0..7] of char;
|
||||||
|
|
||||||
|
TDirectory = packed record
|
||||||
|
fileName : array[0..7] of char;
|
||||||
|
fileExtension : array[0..2] of char;
|
||||||
|
attributes : uint8;
|
||||||
|
reserved0 : uint8;
|
||||||
|
timeFine : uint8;
|
||||||
|
time : uint16;
|
||||||
|
date : uint16;
|
||||||
|
accessTime : uint16;
|
||||||
|
clusterHigh : uint16;
|
||||||
|
modifiedTime : uint16;
|
||||||
|
modifiedDate : uint16;
|
||||||
|
clusterLow : uint16;
|
||||||
|
byteSize : uint32;
|
||||||
|
end;
|
||||||
|
PDirectory = ^TDirectory;
|
||||||
|
|
||||||
|
TFilesystemInfo = record
|
||||||
|
leadSignature : uint32;
|
||||||
|
reserved0 : array[0..479] of uint8;
|
||||||
|
structSignature : uint32;
|
||||||
|
freeSectors : uint32;
|
||||||
|
nextFreeSector : uint32;
|
||||||
|
reserved1 : array[0..11] of uint8;
|
||||||
|
trailSignature : uint32;
|
||||||
|
end;
|
||||||
|
|
||||||
|
TFatVolumeInfo = record
|
||||||
|
sectorsPerCluster : uint8; // must be power of 2 and mult by sectorsize to max 32k
|
||||||
|
end;
|
||||||
|
PFatVolumeInfo = ^TFatVolumeInfo;
|
||||||
|
|
||||||
|
var
|
||||||
|
filesystem : TFilesystem;
|
||||||
|
|
||||||
|
procedure init;
|
||||||
|
procedure create_volume(disk : PStorage_Device; sectors : uint32; start : uint32; config : puint32);
|
||||||
|
procedure detect_volumes(disk : PStorage_Device);
|
||||||
|
//function writeDirectory(volume : PStorage_volume; directory : pchar; attributes : uint32) : uint8; // need to handle parent table cluster overflow, need to take attributes
|
||||||
|
//function readDirectory(volume : PStorage_volume; directory : pchar; listPtr : PLinkedListBase) : uint8; //returns: 0 = success, 1 = dir not exsist, 2 = not directory, 3 = error
|
||||||
|
|
||||||
|
|
||||||
|
implementation
|
||||||
|
|
||||||
|
procedure STOS(str : PChar);
|
||||||
|
var
|
||||||
|
i : uint32;
|
||||||
|
|
||||||
|
begin
|
||||||
|
for i:=0 to StringSize(str)-1 do begin
|
||||||
|
serial.send(COM1, uint8(str[i]), 100);
|
||||||
|
end;
|
||||||
|
serial.send(COM1, 13, 100);
|
||||||
|
end;
|
||||||
|
|
||||||
|
function load(ptr : void) : boolean;
|
||||||
|
begin
|
||||||
|
console.outputln('DUMMY DRIVER', 'LOADED.')
|
||||||
|
end;
|
||||||
|
|
||||||
|
function readBootRecord(volume : PStorage_volume) : TBootRecord; // need write functions for boot record!
|
||||||
|
var
|
||||||
|
buffer : puint32;
|
||||||
|
begin
|
||||||
|
buffer:= puint32(kalloc(512 + 512));
|
||||||
|
volume^.device^.readcallback(volume^.device, volume^.sectorStart + 1, 1, buffer);
|
||||||
|
readBootRecord:= PBootRecord(buffer)^;
|
||||||
|
kfree(buffer);
|
||||||
|
end;
|
||||||
|
|
||||||
|
function readFat(volume : PStorage_volume; cluster : uint32): uint32; //TODO need KFREE after use
|
||||||
|
var
|
||||||
|
buffer : puint32;
|
||||||
|
bootRecord : TBootRecord;
|
||||||
|
BytesPerFatEntree: uint8 = 4;
|
||||||
|
sectorLocation: uint32;
|
||||||
|
fatEntriesPerSector : uint32;
|
||||||
|
begin
|
||||||
|
push_trace('fat32.readFat');
|
||||||
|
bootRecord := readBootRecord(volume);
|
||||||
|
fatEntriesPerSector:= bootRecord.sectorSize div BytesPerFatEntree;
|
||||||
|
sectorLocation:= cluster div fatEntriesPerSector;
|
||||||
|
|
||||||
|
buffer:= puint32(kalloc(bootRecord.sectorSize + 512));
|
||||||
|
//console.writeintlnWND(sectorLocation, );
|
||||||
|
volume^.device^.readcallback(volume^.device, volume^.sectorStart + 2 + sectorLocation, 1, buffer);
|
||||||
|
readFat:= buffer[cluster - (sectorLocation * fatEntriesPerSector)];
|
||||||
|
kfree(buffer);
|
||||||
|
end;
|
||||||
|
|
||||||
|
procedure writeFat(volume : PStorage_volume; cluster : uint32; value : uint32); // untested, but should work
|
||||||
|
var
|
||||||
|
buffer : puint32;
|
||||||
|
bootRecord : TBootRecord;
|
||||||
|
BytesPerFatEntree: uint8 = 4;
|
||||||
|
sectorLocation: uint32;
|
||||||
|
fatEntriesPerSector : uint32;
|
||||||
|
begin
|
||||||
|
push_trace('fat32.writeFat');
|
||||||
|
bootRecord := readBootRecord(volume);
|
||||||
|
fatEntriesPerSector:= bootRecord.sectorSize div BytesPerFatEntree;
|
||||||
|
sectorLocation:= cluster div fatEntriesPerSector;
|
||||||
|
|
||||||
|
buffer:= puint32(kalloc(bootrecord.sectorSize + 512));
|
||||||
|
memset(uint32(buffer), 0, 512);
|
||||||
|
|
||||||
|
volume^.device^.readcallback(volume^.device, volume^.sectorStart + 2 + sectorLocation, 1, buffer);
|
||||||
|
buffer[cluster - (sectorLocation * fatEntriesPerSector)]:= value; // not gonna work boi
|
||||||
|
volume^.device^.writecallback(volume^.device, volume^.sectorStart + 2 + sectorLocation, 1, buffer);
|
||||||
|
kfree(buffer);
|
||||||
|
end;
|
||||||
|
|
||||||
|
function readDirectory(volume : PStorage_volume; directory : pchar; listPtr : PLinkedListBase) : uint8; //returns: 0 = success, 1 = dir not exsist, 2 = not directory, 3 = error
|
||||||
|
var
|
||||||
|
directories : PLinkedListBase;
|
||||||
|
rootTable : PLinkedListBase;
|
||||||
|
clusters : PLinkedListBase;
|
||||||
|
dirElm : void;
|
||||||
|
buffer : puint32;
|
||||||
|
//buffer : puint32;
|
||||||
|
bootRecord : TBootRecord;
|
||||||
|
clusterInfo : uint32;
|
||||||
|
cc : uint32;
|
||||||
|
clusterByteSize : uint32;
|
||||||
|
fatSectorSize : uint32;
|
||||||
|
device : PStorage_Device;
|
||||||
|
i : uint32;
|
||||||
|
dirI : uint32 = 0;
|
||||||
|
str : pchar;
|
||||||
|
targetStr : pchar;
|
||||||
|
dir : PDirectory;
|
||||||
|
clusterAllocSize : uint32;
|
||||||
|
begin
|
||||||
|
push_trace('freadDirectory');
|
||||||
|
|
||||||
|
console.writestringln('r1');
|
||||||
|
console.redrawWindows();
|
||||||
|
|
||||||
|
rootTable := LL_New(sizeof(TDirectory));
|
||||||
|
clusters := LL_New(sizeof(uint32));
|
||||||
|
directories := stringToLL(directory, '/');
|
||||||
|
bootRecord := readBootRecord(volume);
|
||||||
|
device := volume^.device;
|
||||||
|
clusterByteSize := bootrecord.spc * bootrecord.sectorSize;
|
||||||
|
fatSectorSize := bootrecord.fatSize;
|
||||||
|
|
||||||
|
readDirectory:= 0;
|
||||||
|
// if readFat(volume, bootrecord.rootCluster) = $FFFFFFF8 then begin
|
||||||
|
// buffer:= puint32(kalloc((bootrecord.spc * 512) + 1));
|
||||||
|
// volume^.device^.readcallback(volume^.device, volume^.sectorStart + 1 + (bootrecord.fatSize div 512) + (bootRecord.spc * bootRecord.rootCluster), bootrecord.spc, buffer);
|
||||||
|
// end else if readFat(volume, bootrecord.rootCluster) <> $FFFFFFF7 then begin
|
||||||
|
// //need to read multiple clusters to get full directory table
|
||||||
|
// end;
|
||||||
|
|
||||||
|
|
||||||
|
cc:= bootrecord.rootCluster;
|
||||||
|
|
||||||
|
while true do begin
|
||||||
|
|
||||||
|
targetStr:= pchar(LL_Get(directories, dirI));
|
||||||
|
|
||||||
|
//build list of clusters for current directory table
|
||||||
|
while true do begin
|
||||||
|
clusterInfo:= readFat(volume, cc);
|
||||||
|
if clusterInfo = $FFFFFFF7 then begin
|
||||||
|
readDirectory:= 3; //ERROR
|
||||||
|
break;
|
||||||
|
end else if clusterInfo = $FFFFFFF8 then begin
|
||||||
|
//last dir table cluster
|
||||||
|
dirElm:= LL_Add(clusters);
|
||||||
|
uint32(dirElm^):= cc;
|
||||||
|
break;
|
||||||
|
end else if clusterInfo = 0 then begin
|
||||||
|
break;
|
||||||
|
end else begin
|
||||||
|
//dir is longer than one cluster
|
||||||
|
dirElm:= LL_Add(clusters);
|
||||||
|
uint32(dirElm^):= cc;
|
||||||
|
cc:= clusterInfo;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
|
||||||
|
console.writestringln('r2');
|
||||||
|
console.redrawWindows();
|
||||||
|
|
||||||
|
//load clusters into buffer
|
||||||
|
clusterAllocSize:= (clusterByteSize * (LL_size(clusters))) + 1024; //TODO FIX
|
||||||
|
buffer:= puint32(kalloc(clusterAllocSize + 512));
|
||||||
|
memset(uint32(buffer), 0, clusterAllocSize);
|
||||||
|
//buffer := buffer;
|
||||||
|
for i:= 0 to LL_size(clusters) - 1 do begin
|
||||||
|
cc:= uint32(LL_Get(clusters, i)^);
|
||||||
|
device^.readcallback(device, volume^.sectorStart + 1 + fatSectorSize + (bootRecord.spc * cc), bootrecord.spc, @buffer[i * (clusterByteSize div 4)] );
|
||||||
|
end;
|
||||||
|
|
||||||
|
console.writestringln('r2.5');
|
||||||
|
console.redrawWindows();
|
||||||
|
|
||||||
|
if dirI = LL_size(directories) - 1 then break;
|
||||||
|
if LL_size(directories) = 0 then break;
|
||||||
|
|
||||||
|
console.writestringln('r3');
|
||||||
|
console.redrawWindows();
|
||||||
|
|
||||||
|
//get elements in the directory table
|
||||||
|
i:=0;
|
||||||
|
while true do begin
|
||||||
|
dir:= PDirectory(buffer);
|
||||||
|
console.writestringln(dir[i].fileName);
|
||||||
|
|
||||||
|
if dir[i].fileName[0] = char(0) then break; //need to check if I have found the right directoy and set cc if not last
|
||||||
|
if (dir[i].attributes and $10) = $10 then begin // is a directory;
|
||||||
|
str:= dir[i].fileName;
|
||||||
|
str[9]:= char(0);
|
||||||
|
if stringEquals(str, targetStr) then begin //need to get current folder searching for
|
||||||
|
cc:= dir[i].clusterLow;
|
||||||
|
cc:= cc or (dir[i].clusterHigh shl 16);
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
|
||||||
|
//dirElm:= LL_Add(rootTable);
|
||||||
|
//PDirectory(dirElm)^:= dir[i];
|
||||||
|
i+=1;
|
||||||
|
end;
|
||||||
|
|
||||||
|
//set CC
|
||||||
|
dirI += 1;
|
||||||
|
end;
|
||||||
|
|
||||||
|
console.writestringln('r3.5');
|
||||||
|
console.redrawWindows();
|
||||||
|
|
||||||
|
i:=0;
|
||||||
|
while true do begin
|
||||||
|
dir:= PDirectory(buffer);
|
||||||
|
if dir[i].fileName[0] = char(0) then break;
|
||||||
|
|
||||||
|
dirElm:= LL_Add(listPtr);
|
||||||
|
PDirectory(dirElm)^:= dir[i];
|
||||||
|
i+=1;
|
||||||
|
end;
|
||||||
|
|
||||||
|
console.writestringln('r4');
|
||||||
|
console.redrawWindows();
|
||||||
|
|
||||||
|
kfree(buffer);
|
||||||
|
//listPtr := rootTable;
|
||||||
|
//console.writeintln(uint32(listPtr));
|
||||||
|
|
||||||
|
// while true do begin // I need to be inside another loop
|
||||||
|
// if PDirectory(buffer)^.fileName[0] = char(0) then break;
|
||||||
|
// dirElm:= LL_Add(rootTable);
|
||||||
|
// PDirectory(dirElm)^:= PDirectory(buffer)^;
|
||||||
|
|
||||||
|
// console.writestring('FileName: ');
|
||||||
|
// console.writechar(PDirectory(buffer)^.fileName[0]);
|
||||||
|
// //console.writecharln(PDirectory(buffer)^.fileName[1]);
|
||||||
|
// buffer:= puint32(buffer + 8);
|
||||||
|
// end;
|
||||||
|
|
||||||
|
end;
|
||||||
|
|
||||||
|
function findFreeCluster(volume : PStorage_volume) : uint32;
|
||||||
|
var
|
||||||
|
i : uint32 = 1;
|
||||||
|
currentCluster : uint32;
|
||||||
|
begin
|
||||||
|
push_trace('fat32.findFreeCluster');
|
||||||
|
while true do begin
|
||||||
|
currentCluster:= readFat(volume, i);
|
||||||
|
if currentCluster = 0 then begin
|
||||||
|
findFreeCluster:= i;
|
||||||
|
break;
|
||||||
|
end;
|
||||||
|
i+=1;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
|
||||||
|
//expects dirName to be packed with spaces.
|
||||||
|
function writeDirectory(volume : PStorage_volume; directory : pchar; dirName : pchar; attributes : uint32) : uint8; // need to handle parent table cluster overflow, need to take attributes
|
||||||
|
var
|
||||||
|
dirList : PLinkedListBase;
|
||||||
|
i : uint32 = 0;
|
||||||
|
ii : uint32 = 0;
|
||||||
|
buffer : puint32;
|
||||||
|
bootRecord : TBootRecord;
|
||||||
|
device : PStorage_Device;
|
||||||
|
dataStart : uint32;
|
||||||
|
cluster : uint32;
|
||||||
|
parentDir : PDirectory;
|
||||||
|
parentCluster : uint32;
|
||||||
|
emptyEntree : uint32;
|
||||||
|
dirIndex : uint32;
|
||||||
|
entriesPerSector: uint32;
|
||||||
|
entrySector : uint32;
|
||||||
|
|
||||||
|
meArray : byteArray8 = ('.', ' ', ' ', ' ', ' ', ' ', ' ', ' ');
|
||||||
|
parentArray : byteArray8 = ('.', '.', ' ', ' ', ' ', ' ', ' ', ' ');
|
||||||
|
begin
|
||||||
|
push_trace('fat32.writeDirectory'); //////////////////////////TODO need to make sure writing is to data area not fat area DERRRRRRRPPPP!!!
|
||||||
|
bootRecord := readBootRecord(volume);
|
||||||
|
device := volume^.device;
|
||||||
|
buffer := puint32(kalloc(sizeof(volume^.sectorSize) + 512));
|
||||||
|
memset(uint32(buffer), 0, 512);
|
||||||
|
|
||||||
|
dataStart:= (bootrecord.fatSize) + 1 + volume^.sectorStart;
|
||||||
|
|
||||||
|
dirList:= LL_New(sizeof(TDirectory));
|
||||||
|
readDirectory(volume, directory, dirList);
|
||||||
|
parentDir:= PDirectory(LL_Get(dirList, 0));
|
||||||
|
parentCluster:= parentDir^.clusterLow and (parentDir^.clusterHigh shl 16);
|
||||||
|
|
||||||
|
//write to the fat to allocate area
|
||||||
|
cluster:= findFreeCluster(volume);
|
||||||
|
writeFat(volume, cluster, $FFFFFFF8);
|
||||||
|
|
||||||
|
//write new dir table
|
||||||
|
|
||||||
|
//construct buffer
|
||||||
|
PDirectory(buffer)[0].fileName:= meArray;
|
||||||
|
PDirectory(buffer)[0].attributes:= $10;
|
||||||
|
PDirectory(buffer)[0].clusterLow:= uint16($0000FFFF and cluster);
|
||||||
|
PDirectory(buffer)[0].clusterHigh:= uint16($0000FFFF and (cluster shr 16));
|
||||||
|
|
||||||
|
PDirectory(buffer)[0].fileName:= parentArray;
|
||||||
|
PDirectory(buffer)[0].attributes:= $10;
|
||||||
|
PDirectory(buffer)[0].clusterLow:= parentDir^.clusterLow;
|
||||||
|
PDirectory(buffer)[0].clusterHigh:= parentDir^.clusterHigh;
|
||||||
|
|
||||||
|
//write buffer
|
||||||
|
volume^.device^.writecallback(volume^.device, dataStart + (cluster * bootrecord.spc), 1, buffer);
|
||||||
|
|
||||||
|
//write to parent dir table
|
||||||
|
|
||||||
|
kfree(buffer);
|
||||||
|
buffer:= puint32(kalloc(bootrecord.sectorSize * 4 + 512));
|
||||||
|
memset(uint32(buffer), 0, bootrecord.sectorsize * 4);
|
||||||
|
|
||||||
|
emptyEntree:= LL_size(dirList) * 4;
|
||||||
|
entriesPerSector:= bootrecord.sectorSize div sizeof(TDirectory);
|
||||||
|
entrySector:= emptyEntree div entriesPerSector + 7;
|
||||||
|
|
||||||
|
volume^.device^.readcallback(volume^.device, dataStart + (parentCluster * bootrecord.spc) + entrySector, 4, buffer);
|
||||||
|
dirIndex:= emptyEntree - (entrySector * entriesPerSector);
|
||||||
|
|
||||||
|
|
||||||
|
PDirectory(buffer)[dirIndex].fileName:= byteArray8(dirName);
|
||||||
|
PDirectory(buffer)[dirIndex].attributes:= $10;
|
||||||
|
PDirectory(buffer)[dirIndex].clusterLow:= uint16($0000FFFF and cluster);
|
||||||
|
PDirectory(buffer)[dirIndex].clusterHigh:= uint16($0000FFFF and (cluster shr 16));
|
||||||
|
|
||||||
|
volume^.device^.writecallback(volume^.device, dataStart + (parentCluster * bootrecord.spc) + entrySector, 4, buffer);
|
||||||
|
|
||||||
|
kfree(buffer);
|
||||||
|
|
||||||
|
end;
|
||||||
|
|
||||||
|
procedure readFile(volume : PStorage_volume; directory : pchar; byteCount : uint32; buffer : puint32);
|
||||||
|
begin
|
||||||
|
|
||||||
|
end;
|
||||||
|
//need to be able to increase no of clusted used by a directory
|
||||||
|
procedure writeFile(volume : PStorage_volume; directory : pchar; byteCount : uint32; buffer : puint32);
|
||||||
|
begin
|
||||||
|
|
||||||
|
end;
|
||||||
|
|
||||||
|
procedure init;
|
||||||
|
begin
|
||||||
|
filesystem.sName:= 'FAT32';
|
||||||
|
filesystem.writecallback:= @writeFile;
|
||||||
|
filesystem.readcallback:= @readFile;
|
||||||
|
filesystem.createcallback:= @create_volume;
|
||||||
|
filesystem.detectcallback:= @detect_volumes;
|
||||||
|
filesystem.createDirCallback:= @writeDirectory;
|
||||||
|
filesystem.readDirCallback:= @readDirectory;
|
||||||
|
storagemanagement.register_filesystem(@filesystem);
|
||||||
|
end;
|
||||||
|
|
||||||
|
procedure create_volume(disk : PStorage_Device; sectors : uint32; start : uint32; config : puint32);
|
||||||
|
var
|
||||||
|
i : uint32;
|
||||||
|
bootRecord : TBootRecord;
|
||||||
|
buffer : puint32;
|
||||||
|
asuroArray : byteArray8 = ('A','S','U','R','O',' ','V','1');
|
||||||
|
fatArray : byteArray8 = ('F','A','T','3','2',' ',' ',' ');
|
||||||
|
tmpArray : byteArray8;
|
||||||
|
|
||||||
|
fatStart : uint32;
|
||||||
|
dataStart: uint32;
|
||||||
|
|
||||||
|
begin
|
||||||
|
buffer:= puint32(kalloc(1024));
|
||||||
|
memset(uint32(buffer), 0, 512);
|
||||||
|
|
||||||
|
for i:=1 to 512 do begin
|
||||||
|
disk^.writeCallback(disk, i, 1, buffer);
|
||||||
|
end;
|
||||||
|
|
||||||
|
bootrecord.jmp2boot:= $00; // TODO what ahppens here???
|
||||||
|
bootRecord.OEMName:= asuroArray;
|
||||||
|
bootrecord.sectorsize:= disk^.sectorSize;
|
||||||
|
bootrecord.spc:= config^;
|
||||||
|
console.writeintln(uint32(config^));
|
||||||
|
bootrecord.rsvSectors:= 32; //Is this acceptable?
|
||||||
|
bootrecord.numFats:= 1;
|
||||||
|
bootrecord.numDirEnt:= 0;
|
||||||
|
bootRecord.numSectors:= 0;
|
||||||
|
bootrecord.mediaDescp:= $F8;
|
||||||
|
bootrecord.sectorsPerFat:= 0;
|
||||||
|
bootRecord.sectorsPerTrack:= 0;
|
||||||
|
bootRecord.heads:= 0;
|
||||||
|
bootRecord.hiddenSectors:= start;
|
||||||
|
bootRecord.manySectors:= sectors;
|
||||||
|
|
||||||
|
//BootRecord.FATSize:= ((sectors DIV PFatVolumeInfo(config)^.sectorsPerCluster) * 16 DIV disk^.sectorSize);
|
||||||
|
//BootRecord.FATSize:= ((sectors DIV 4) * 2 DIV disk^.sectorSize);
|
||||||
|
BootRecord.FATSize:= ((sectors DIV bootrecord.spc) * 4) DIV 512;
|
||||||
|
//sectors div spc, *
|
||||||
|
BootRecord.flags:= 0; //1 shl 7 for mirroring
|
||||||
|
BootRecord.FATVersion:= 0;
|
||||||
|
BootRecord.rootCluster:= start + 1; // can be changed if needed.
|
||||||
|
BootRecord.FSInfoCluster:= start + 1 + bootrecord.fatSize; //TODO need FSINFO
|
||||||
|
BootRecord.driveNumber:= $80;
|
||||||
|
//BootRecord.reserved0:=0;
|
||||||
|
//BootRecord.reserved1:=0;
|
||||||
|
BootRecord.volumeID := 53424; //need random number generator
|
||||||
|
//BootRecord.volumeLabel[0] := 0; //needs to be set later !!!
|
||||||
|
BootRecord.bsignature:= $29;
|
||||||
|
BootRecord.identString:= fatArray;
|
||||||
|
|
||||||
|
buffer:= @bootrecord;
|
||||||
|
puint32(buffer + (127))^:= $55AA; //end marker
|
||||||
|
|
||||||
|
disk^.writeCallback(disk, start + 1, 1, buffer);
|
||||||
|
|
||||||
|
dataStart:= (bootrecord.fatSize) + 1 + start;
|
||||||
|
|
||||||
|
//TODO FSINFO struct
|
||||||
|
|
||||||
|
//write fat
|
||||||
|
buffer := puint32(kalloc((sectors DIV bootrecord.spc) * 4 + 512));
|
||||||
|
memset(uint32(buffer), 0, (sectors DIV bootrecord.spc) * 4);
|
||||||
|
puint32(buffer + bootRecord.rootCluster - 1)^:= $FFFFFFF7; //make space for fsinfo, by setting this field to bad.
|
||||||
|
puint32(buffer + bootRecord.rootCluster)^:= $FFFFFFF8; //root directory table cluster, currently root is only 1 cluster long
|
||||||
|
disk^.writeCallback(disk, start + 2, (sectors DIV bootrecord.spc) * 4, buffer);
|
||||||
|
//disk^.writeCallback(disk, start + 2 + (sectors Div bootrecord.sectorsPerCluster DIV 512), sectors DIV bootrecord.sectorsPerCluster, buffer);
|
||||||
|
kfree(buffer);
|
||||||
|
|
||||||
|
//setup root directory
|
||||||
|
buffer:= puint32(kalloc(1024));
|
||||||
|
memset(uint32(buffer), 0, 512);
|
||||||
|
|
||||||
|
tmpArray[0]:= '.';
|
||||||
|
tmpArray[1]:= ' ';
|
||||||
|
tmpArray[2]:= ' ';
|
||||||
|
tmpArray[3]:= ' ';
|
||||||
|
tmpArray[4]:= ' ';
|
||||||
|
tmpArray[5]:= ' ';
|
||||||
|
tmpArray[6]:= ' ';
|
||||||
|
tmpArray[7]:= ' ';
|
||||||
|
|
||||||
|
PDirectory(buffer)^.fileName:= tmpArray;
|
||||||
|
PDirectory(buffer)^.attributes:= $10; // is directory
|
||||||
|
PDirectory(buffer)^.clusterLow:= 2; //my cluster location
|
||||||
|
|
||||||
|
tmpArray[1]:= '.';
|
||||||
|
PDirectory(buffer + (sizeof(TDirectory) DIV 4 ) )^.fileName:= tmpArray;
|
||||||
|
PDirectory(buffer + (sizeof(TDirectory) DIV 4) )^.attributes:= $08; // volume id
|
||||||
|
PDirectory(buffer + (sizeof(TDirectory) DIV 4) )^.clusterLow:= 2; //my cluster location
|
||||||
|
|
||||||
|
tmpArray[0]:= 'M';
|
||||||
|
tmpArray[1]:= 'U';
|
||||||
|
tmpArray[2]:= 'S';
|
||||||
|
tmpArray[3]:= 'I';
|
||||||
|
tmpArray[4]:= 'C';
|
||||||
|
PDirectory(buffer + (sizeof(TDirectory) * 2 DIV 4 ) )^.fileName:= tmpArray;
|
||||||
|
PDirectory(buffer + (sizeof(TDirectory) * 2 DIV 4) )^.attributes:= $10; // volume id
|
||||||
|
PDirectory(buffer + (sizeof(TDirectory) * 2 DIV 4) )^.clusterLow:= 2; //my cluster location
|
||||||
|
|
||||||
|
disk^.writeCallback(disk, dataStart + (bootRecord.spc * bootrecord.rootCluster), 1, buffer);
|
||||||
|
|
||||||
|
end;
|
||||||
|
|
||||||
|
procedure detect_volumes(disk : PStorage_Device);
|
||||||
|
var
|
||||||
|
buffer : puint32;
|
||||||
|
i : uint8;
|
||||||
|
volume : PStorage_volume;
|
||||||
|
|
||||||
|
dir : PDirectory;
|
||||||
|
dirs : PLinkedListBase;
|
||||||
|
begin
|
||||||
|
push_trace('detect volume');
|
||||||
|
redrawWindows();
|
||||||
|
//sleep(1);
|
||||||
|
|
||||||
|
volume:= PStorage_volume(kalloc(sizeof(TStorage_Volume)));
|
||||||
|
//check first address for MBR
|
||||||
|
//if found then add volume and use info to see if there is another volume
|
||||||
|
buffer := puint32(kalloc(512));
|
||||||
|
memset(uint32(buffer), 0, 512);
|
||||||
|
disk^.readcallback(disk, 2, 1, buffer);
|
||||||
|
|
||||||
|
if (puint32(buffer)[127] = $55AA) and (PBootRecord(buffer)^.bsignature = $29) then begin
|
||||||
|
console.writestringln('FAT32: volume found!');
|
||||||
|
volume^.device:= disk;
|
||||||
|
volume^.sectorStart:= 1;
|
||||||
|
volume^.sectorSize:= PBootRecord(buffer)^.sectorSize;
|
||||||
|
volume^.freeSectors:= 1000000; //TODO implement get free sectors need FSINFO implemented first
|
||||||
|
volume^.filesystem := @filesystem;
|
||||||
|
storagemanagement.register_volume(disk, volume);
|
||||||
|
end;
|
||||||
|
redrawWindows();
|
||||||
|
|
||||||
|
// dirs:= LL_New(sizeof(TDirectory));
|
||||||
|
// readDirectory(volume, '', dirs);
|
||||||
|
|
||||||
|
// for i:=0 to LL_size(dirs) - 1 do begin
|
||||||
|
// dir:= PDirectory(LL_Get(dirs, i));
|
||||||
|
// console.writestringln(pchar(dir^.fileName));
|
||||||
|
// end;
|
||||||
|
|
||||||
|
console.writeintln(findFreeCluster(volume));
|
||||||
|
redrawWindows();
|
||||||
|
while true do begin end;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
//writeFat(volume, 3, $ADABABAD);
|
||||||
|
//writeDirectory(volume, '', 'hello', $10);
|
||||||
|
//writeDirectory(volume, '', 'poo', $10);
|
||||||
|
//readDirectory(volume, '.', dirs);
|
||||||
|
push_trace('end detect');
|
||||||
|
redrawWindows();
|
||||||
|
kfree(buffer);
|
||||||
|
end;
|
||||||
|
|
||||||
|
end.
|
||||||
51
src/driver/storage/partitiontable.pas
Normal file
51
src/driver/storage/partitiontable.pas
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
{ ************************************************
|
||||||
|
* Asuro
|
||||||
|
* Unit: Drivers/storage/partitontable
|
||||||
|
* Description: partionTable
|
||||||
|
*
|
||||||
|
************************************************
|
||||||
|
* Author: Aaron Hance
|
||||||
|
* Contributors:
|
||||||
|
************************************************ }
|
||||||
|
|
||||||
|
unit partitontable;
|
||||||
|
|
||||||
|
interface
|
||||||
|
|
||||||
|
uses
|
||||||
|
console,
|
||||||
|
storagemanagement,
|
||||||
|
util, terminal,
|
||||||
|
lmemorymanager,
|
||||||
|
strings,
|
||||||
|
lists,
|
||||||
|
tracer,
|
||||||
|
rtc;
|
||||||
|
|
||||||
|
type
|
||||||
|
|
||||||
|
TPartitonTable = record
|
||||||
|
|
||||||
|
end;
|
||||||
|
PPartitonTable = ^TPartitonTable;
|
||||||
|
|
||||||
|
var
|
||||||
|
location = $1BE;
|
||||||
|
|
||||||
|
procedure create_new(device : PStorage_Device);
|
||||||
|
function get_table() : PPartitonTable;
|
||||||
|
procedure add_volume(volume : TStorage_Volume);
|
||||||
|
|
||||||
|
implementation
|
||||||
|
|
||||||
|
procedure create_new(device : PStorage_Device);
|
||||||
|
var
|
||||||
|
|
||||||
|
begin
|
||||||
|
|
||||||
|
end;
|
||||||
|
|
||||||
|
function get_table() : PPartitonTable;
|
||||||
|
procedure add_volume(volume : TStorage_Volume);
|
||||||
|
|
||||||
|
end.
|
||||||
@ -9,15 +9,15 @@ const
|
|||||||
VERSION_SUB = '1';
|
VERSION_SUB = '1';
|
||||||
REVISION = '754';
|
REVISION = '754';
|
||||||
RELEASE = 'ia';
|
RELEASE = 'ia';
|
||||||
LINE_COUNT = 31304;
|
LINE_COUNT = 31279;
|
||||||
FILE_COUNT = 111;
|
FILE_COUNT = 110;
|
||||||
DRIVER_COUNT = 35;
|
DRIVER_COUNT = 35;
|
||||||
FPC_VERSION = '2.6.4';
|
FPC_VERSION = '2.6.4';
|
||||||
NASM_VERSION = '2.10.09';
|
NASM_VERSION = '2.10.09';
|
||||||
MAKE_VERSION = '3.81';
|
MAKE_VERSION = '3.81';
|
||||||
COMPILE_DATE = '25/01/19';
|
COMPILE_DATE = '25/01/19';
|
||||||
COMPILE_TIME = '15:15:03';
|
COMPILE_TIME = '15:20:16';
|
||||||
CHECKSUM = '7cf8fc67ca06334f944ebe3096db755e';
|
CHECKSUM = 'aa0b1316f6cb8af40d3236128528634c';
|
||||||
|
|
||||||
implementation
|
implementation
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user