From e974af0fadeacaa13cdeebc34a1aa030343ffcd9 Mon Sep 17 00:00:00 2001
From: Morten Delenk <mtg.morten@googlemail.com>
Date: Tue, 26 Jul 2016 20:49:16 +0200
Subject: [PATCH] Added a FAT directory listing test in the temporary driver

---
 kernel/kernel/disk/fat.cpp |  27 +++++++++++++++++++++++++--
 test.elf                   | Bin 14876 -> 0 bytes
 2 files changed, 25 insertions(+), 2 deletions(-)
 delete mode 100755 test.elf

diff --git a/kernel/kernel/disk/fat.cpp b/kernel/kernel/disk/fat.cpp
index d95b585..520acb4 100644
--- a/kernel/kernel/disk/fat.cpp
+++ b/kernel/kernel/disk/fat.cpp
@@ -50,6 +50,20 @@ struct BPB {
     uint32_t totalSectors_b;
     EBPB ebpb;
 }__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() {
     BPB bpb;
     MBR::MBR part(disk.getDriveNumByName("ATA0m"));
@@ -58,7 +72,7 @@ void readFAT() {
     out << "Sectors per Cluster: " << (int) bpb.sectorsPerCluster << "\n";
     out << "Reserved Sectors: " << (int) bpb.reservedSectors << "\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;
     out << "Total sectors: " << (int) totalSectors << "\n";
     uint32_t sectorsPerFAT = (bpb.sectorsPerFAT)?bpb.sectorsPerFAT:bpb.ebpb.fat32.sectorsPerFAT;
@@ -86,5 +100,14 @@ void readFAT() {
     if(fatVer>28) {
         out << "Not implemented\n";
         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";
+    }
 }
\ No newline at end of file
diff --git a/test.elf b/test.elf
deleted file mode 100755
index f944b5a282fe8760eb90852205f493ed209efd95..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14876
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