FatFS moved

# Conflicts:
#	OS/FileSystem/File.cpp

Author: 203Null

.gitmodules

@@ -7,6 +7,3 @@
 [submodule "Library/cb0r"]
 	path = Library/cb0r
 	url = https://github.com/203-Systems/cb0r.git
-[submodule "Library/FatFs"]
-	path = Library/FatFs
-	url = https://github.com/abbrev/fatfs.git

Library/FatFs

@@ -1,14 +1,14 @@
 file(GLOB_RECURSE FILE_HEADERS "*.h")
 set(FILE_SOURCES
     File.cpp
-    diskio.cpp
 )
 
-set(FATFS_DIR ${CMAKE_SOURCE_DIR}/Library/FatFs/)
-
-# FATFS_SOURCES - exclude the template diskio.c, use our own
+# Local FatFS sources
 set(FATFS_SOURCES
-    ${FATFS_DIR}/source/ff.c
+    FatFS/ff.c
+    FatFS/ffunicode.c
+    FatFS/diskio.cpp
+    FatFS/ffsystem.c
 )
 
 add_library(MatrixOSFile
@@ -19,7 +19,7 @@ add_library(MatrixOSFile
 
 target_include_directories(MatrixOSFile PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${FATFS_DIR}/source
+    ${CMAKE_CURRENT_SOURCE_DIR}/FatFS
 )
 
 target_link_libraries(MatrixOSFile PUBLIC MatrixOSInterface MatrixOSAPPInterface)

OS/FileSystem/CMakeLists.txt

@@ -0,0 +1,14 @@
+# FatFS for MatrixOS
+
+This directory contains a copy of the FatFS library with MatrixOS-specific configuration.
+
+## Source
+
+Original FatFS library: http://elm-chan.org/fsw/ff/00index_e.html
+GitHub mirror: https://github.com/abbrev/fatfs
+
+## MatrixOS Modifications
+
+- **`ffconf.h`**: Custom configuration with Long File Name (LFN) support enabled
+  - `FF_USE_LFN = 2` - Enables long filenames with dynamic stack buffer
+  - `FF_CODE_PAGE = 437` - U.S. ASCII code page

OS/FileSystem/FatFS/README.md

@@ -0,0 +1,77 @@
+/*-----------------------------------------------------------------------/
+/  Low level disk interface modlue include file   (C)ChaN, 2025          /
+/-----------------------------------------------------------------------*/
+
+#ifndef _DISKIO_DEFINED
+#define _DISKIO_DEFINED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Status of Disk Functions */
+typedef BYTE	DSTATUS;
+
+/* Results of Disk Functions */
+typedef enum {
+	RES_OK = 0,		/* 0: Successful */
+	RES_ERROR,		/* 1: R/W Error */
+	RES_WRPRT,		/* 2: Write Protected */
+	RES_NOTRDY,		/* 3: Not Ready */
+	RES_PARERR		/* 4: Invalid Parameter */
+} DRESULT;
+
+
+/*---------------------------------------*/
+/* Prototypes for disk control functions */
+
+
+DSTATUS disk_initialize (BYTE pdrv);
+DSTATUS disk_status (BYTE pdrv);
+DRESULT disk_read (BYTE pdrv, BYTE* buff, LBA_t sector, UINT count);
+DRESULT disk_write (BYTE pdrv, const BYTE* buff, LBA_t sector, UINT count);
+DRESULT disk_ioctl (BYTE pdrv, BYTE cmd, void* buff);
+
+
+/* Disk Status Bits (DSTATUS) */
+
+#define STA_NOINIT		0x01	/* Drive not initialized */
+#define STA_NODISK		0x02	/* No medium in the drive */
+#define STA_PROTECT		0x04	/* Write protected */
+
+
+/* Command code for disk_ioctrl fucntion */
+
+/* Generic command (Used by FatFs) */
+#define CTRL_SYNC			0	/* Complete pending write process (needed at FF_FS_READONLY == 0) */
+#define GET_SECTOR_COUNT	1	/* Get media size (needed at FF_USE_MKFS == 1) */
+#define GET_SECTOR_SIZE		2	/* Get sector size (needed at FF_MAX_SS != FF_MIN_SS) */
+#define GET_BLOCK_SIZE		3	/* Get erase block size (needed at FF_USE_MKFS == 1) */
+#define CTRL_TRIM			4	/* Inform device that the data on the block of sectors is no longer used (needed at FF_USE_TRIM == 1) */
+
+/* Generic command (Not used by FatFs) */
+#define CTRL_POWER			5	/* Get/Set power status */
+#define CTRL_LOCK			6	/* Lock/Unlock media removal */
+#define CTRL_EJECT			7	/* Eject media */
+#define CTRL_FORMAT			8	/* Create physical format on the media */
+
+/* MMC/SDC specific ioctl command (Not used by FatFs) */
+#define MMC_GET_TYPE		10	/* Get card type */
+#define MMC_GET_CSD			11	/* Get CSD */
+#define MMC_GET_CID			12	/* Get CID */
+#define MMC_GET_OCR			13	/* Get OCR */
+#define MMC_GET_SDSTAT		14	/* Get SD status */
+#define ISDIO_READ			55	/* Read data form SD iSDIO register */
+#define ISDIO_WRITE			56	/* Write data to SD iSDIO register */
+#define ISDIO_MRITE			57	/* Masked write data to SD iSDIO register */
+
+/* ATA/CF specific ioctl command (Not used by FatFs) */
+#define ATA_GET_REV			20	/* Get F/W revision */
+#define ATA_GET_MODEL		21	/* Get model name */
+#define ATA_GET_SN			22	/* Get serial number */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif