[FAT32, TMP] lamdba fix (sigh)

Author: Diego Ferrari

kernel/filesystem/fat32.cpp

@@ -6,6 +6,7 @@
 #include "std/string.h"
 #include "std/memory.h"
 #include "math/math.h"
+#include "sysregs.h"
 
 #define kprintfv(fmt, ...) \
     ({ \
@@ -114,12 +115,15 @@ void FAT32FS::parse_shortnames(f32file_entry* entry, char* out){
     out[j++] = '\0';
 }
 
+//TODO: we can use lamdas here. But it's after midnight so now's not the time. Or switch this to c
 sizedptr FAT32FS::walk_directory(uint32_t cluster_count, uint32_t root_index, const char *seek, f32_entry_handler handler) {
     uint32_t cluster_size = mbs->sectors_per_cluster;
     sizedptr buf_ptr = read_cluster(data_start_sector, cluster_size, cluster_count, root_index);
     char *buffer = (char*)buf_ptr.ptr;
     f32file_entry *entry = 0;
 
+    handler = (f32_entry_handler)PHYS_TO_VIRT_P(handler);
+
     for (uint64_t i = 0; i < cluster_count * cluster_size * 512;) {
         if (buffer[i] == 0) return {0 , 0};
         if (buffer[i] == 0xE5){
@@ -129,15 +133,15 @@ sizedptr FAT32FS::walk_directory(uint32_t cluster_count, uint32_t root_index, co
         bool long_name = buffer[i + 0xB] == 0xF;
         char filename[256];
         if (long_name){
-            f32longname *first_longname = (f32longname*)&buffer[i];
+            f32longname *first_longname = (f32longname*)PHYS_TO_VIRT_P(&buffer[i]);
             uint16_t count = 0;
             do {
                 i += sizeof(f32longname);
                 count++;
             } while (buffer[i + 0xB] == 0xF);
             parse_longnames(first_longname, count, filename);
         } 
-        entry = (f32file_entry *)&buffer[i];
+        entry = (f32file_entry *)PHYS_TO_VIRT_P(&buffer[i]);
         if (!long_name)
             parse_shortnames(entry, filename);
         sizedptr result = handler(this, entry, filename, seek);
@@ -224,6 +228,8 @@ uint32_t FAT32FS::count_FAT(uint32_t first){
     return count;
 }
 
+typedef sizedptr (FAT32FS::*wlkfunc)(uint32_t cluster_count, uint32_t root_index, const char *seek, f32_entry_handler handler);
+
 sizedptr FAT32FS::read_entry_handler(FAT32FS *instance, f32file_entry *entry, char *filename, const char *seek) {
     if (entry->flags.volume_id) return {0,0};
 
@@ -237,9 +243,12 @@ sizedptr FAT32FS::read_entry_handler(FAT32FS *instance, f32file_entry *entry, ch
     uint32_t bpc = bps * spc;
     uint32_t count = entry->filesize > 0 ? ((entry->filesize + bpc - 1) / bpc) : instance->count_FAT(filecluster);
 
-    return entry->flags.directory
-        ? instance->walk_directory(count, filecluster, seek_to(seek, '/'), read_entry_handler)
-        : instance->read_full_file(instance->data_start_sector, instance->mbs->sectors_per_cluster, count, entry->filesize, filecluster);
+    if (entry->flags.directory){
+        return walk_directory(count, filecluster, seek_to(seek, '/'), [](FAT32FS *instance, f32file_entry *entry, char *filename, const char *seek) -> sizedptr {
+            return instance->read_entry_handler(instance, entry, filename, seek);
+        });
+    }
+    return read_full_file(instance->data_start_sector, instance->mbs->sectors_per_cluster, count, entry->filesize, filecluster);
 }
 
 FS_RESULT FAT32FS::open_file(const char* path, file* descriptor){
@@ -254,7 +263,9 @@ FS_RESULT FAT32FS::open_file(const char* path, file* descriptor){
     }
     path = seek_to(path, '/');
     uint32_t count = count_FAT(mbs->first_cluster_of_root_directory);
-    sizedptr buf_ptr = walk_directory(count, mbs->first_cluster_of_root_directory, path, read_entry_handler);
+    sizedptr buf_ptr = walk_directory(count, mbs->first_cluster_of_root_directory, path, [](FAT32FS *instance, f32file_entry *entry, char *filename, const char *seek) -> sizedptr {
+        return instance->read_entry_handler(instance, entry, filename, seek);
+    });
     void *buf = (void*)buf_ptr.ptr;
     if (!buf) return FS_RESULT_NOTFOUND;
     descriptor->id = fid;
@@ -300,7 +311,9 @@ sizedptr FAT32FS::list_entries_handler(FAT32FS *instance, f32file_entry *entry,
     uint32_t count = instance->count_FAT(filecluster);
 
     if (is_last) return instance->list_directory(count, filecluster);
-    if (entry->flags.directory) return instance->walk_directory(count, filecluster, seek_to(seek, '/'), list_entries_handler);
+    if (entry->flags.directory) return instance->walk_directory(count, filecluster, seek_to(seek, '/'), [](FAT32FS *instance, f32file_entry *entry, char *filename, const char *seek) -> sizedptr {
+        return instance->list_entries_handler(instance, entry, filename, seek);
+    });
     return { 0, 0 };
 }
 
@@ -309,7 +322,9 @@ size_t FAT32FS::list_contents(const char *path, void* buf, size_t size, uint64_t
     path = seek_to(path, '/');
 
     uint32_t count_sectors = count_FAT(mbs->first_cluster_of_root_directory);
-    sizedptr ptr = walk_directory(count_sectors, mbs->first_cluster_of_root_directory, path, list_entries_handler);
+    sizedptr ptr = walk_directory(count_sectors, mbs->first_cluster_of_root_directory, path, [](FAT32FS *instance, f32file_entry *entry, char *filename, const char *seek) -> sizedptr {
+        return instance->list_entries_handler(instance, entry, filename, seek);
+    });
 
     size = min(size, ptr.size);
 

kernel/filesystem/fat32.hpp

@@ -103,8 +103,8 @@ class FAT32FS: public FSDriver {
     uint16_t bytes_per_sector = 0;
     uint32_t partition_first_sector = 0;
 
-    static sizedptr read_entry_handler(FAT32FS *instance, f32file_entry *entry, char *filename, const char *seek);
-    static sizedptr list_entries_handler(FAT32FS *instance, f32file_entry *entry, char *filename, const char *seek);
+    sizedptr read_entry_handler(FAT32FS *instance, f32file_entry *entry, char *filename, const char *seek);
+    sizedptr list_entries_handler(FAT32FS *instance, f32file_entry *entry, char *filename, const char *seek);
 
     void parse_longnames(f32longname entries[], uint16_t count, char* out);
     void parse_shortnames(f32file_entry* entry, char* out);