darkkirb/old-MTGos-old
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Added a FAT directory listing test in the temporary driver

Browse source
This commit is contained in:
Morten Delenk 2016-07-26 20:49:16 +02:00
parent ceb7d0d743
commit e974af0fad
No known key found for this signature in database
GPG key ID: 3F818D0F65DCB490
2 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
kernel/kernel/disk/fat.cpp
View file

@ -50,6 +50,20 @@ struct BPB {
uint32_t totalSectors_b; uint32_t totalSectors_b;
EBPB ebpb; EBPB ebpb;
}__attribute__((packed)); }__attribute__((packed));
struct dirent {
uint8_t filename[11];
uint8_t flags;
uint8_t reserved;
uint8_t creationTenth;
uint16_t creationTime;
uint16_t creationDate;
uint16_t accessDate;
uint16_t hiClusterNUM;
uint16_t modifyTime;
uint16_t modifyDate;
uint16_t clusterNUM;
uint32_t fileSize;
}__attribute__((packed));
void readFAT() { void readFAT() {
BPB bpb; BPB bpb;
MBR::MBR part(disk.getDriveNumByName("ATA0m")); MBR::MBR part(disk.getDriveNumByName("ATA0m"));
@ -58,7 +72,7 @@ void readFAT() {
out << "Sectors per Cluster: " << (int) bpb.sectorsPerCluster << "\n"; out << "Sectors per Cluster: " << (int) bpb.sectorsPerCluster << "\n";
out << "Reserved Sectors: " << (int) bpb.reservedSectors << "\n"; out << "Reserved Sectors: " << (int) bpb.reservedSectors << "\n";
out << "Number of FATs: " << (int) bpb.numberFAT << "\n"; out << "Number of FATs: " << (int) bpb.numberFAT << "\n";
out << "Number of root directory entries: " << (int) bpb.reservedSectors << "\n"; out << "Number of root directory entries: " << (int) bpb.numDirent << "\n";
uint32_t totalSectors=(bpb.totalSectors_s)?bpb.totalSectors_s:bpb.totalSectors_b; uint32_t totalSectors=(bpb.totalSectors_s)?bpb.totalSectors_s:bpb.totalSectors_b;
out << "Total sectors: " << (int) totalSectors << "\n"; out << "Total sectors: " << (int) totalSectors << "\n";
uint32_t sectorsPerFAT = (bpb.sectorsPerFAT)?bpb.sectorsPerFAT:bpb.ebpb.fat32.sectorsPerFAT; uint32_t sectorsPerFAT = (bpb.sectorsPerFAT)?bpb.sectorsPerFAT:bpb.ebpb.fat32.sectorsPerFAT;
@ -86,5 +100,14 @@ void readFAT() {
if(fatVer>28) { if(fatVer>28) {
out << "Not implemented\n"; out << "Not implemented\n";
return; return;
} }
out << "Reading root directory\n";
dirent *buf=(dirent*)new uint8_t[(sizeRootDir*512)];
disk.readSector(disk.getDriveNumByName("ATA0m"),part.getPartBeg(0)+firstDataSector-sizeRootDir, sizeRootDir, (uint8_t*)buf);
for(int i=0;i<bpb.numDirent;i++) {
buf[i].flags=0;
if(buf[i].fileSize==0)
continue;
out << (char*)buf[i].filename << "@"<<(int)buf[i].clusterNUM << " - Size: " << (int)buf[i].fileSize << ".\n";
}
} }

BIN
test.elf
View file

Binary file not shown.