Add FatFs submodule.

Now FAT file system in a separate library and I'll remove the original code from here.
Unfortunately I had to sacrifice ext2 support, but it hasn't been in demand for all these years, so it's not a pity.

Author: DC-SWAT

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "lib/fatfs"]
+	path = lib/fatfs
+	url = https://github.com/DC-SWAT/FatFs.git

Makefile

@@ -18,7 +18,7 @@ TARGET_BIN_CD = 1$(TARGET_BIN)
 TRAGET_VERSION = -DVER_MAJOR=4 \
 				-DVER_MINOR=0 \
 				-DVER_MICRO=2 \
-				-DVER_BUILD=0x11
+				-DVER_BUILD=0x12
 # TARGET_DEBUG = 1 # or 2 for GDB
 # TARGET_EMU = 1
 # TARGET_PROF = 1
@@ -34,7 +34,8 @@ SRC_DIR = $(DS_BASE)/src
 LIB_DIR = $(DS_BASE)/lib
 
 KOS_LDFLAGS += -L$(LIB_DIR)
-KOS_CFLAGS += -I$(INC_DIR) -I$(INC_DIR)/img -I$(INC_DIR)/SDL -I$(INC_DIR)/fatfs \
+KOS_CFLAGS += -I$(INC_DIR) -I$(INC_DIR)/img -I$(INC_DIR)/SDL \
+			-I$(LIB_DIR)/fatfs/include \
 			-I$(INC_DIR)/tsunami \
 			-DHAVE_SDLIMAGE $(TRAGET_VERSION)
 
@@ -57,7 +58,7 @@ TSUNAMI_VER = 2.0.0
 PARALLAX_VER = 2.0.0
 FREETYPE_VER = 2.4.4
 
-EXTRA_LIBS = -lcfg -lmxml
+EXTRA_LIBS = -lcfg -lmxml -lfatfs
 
 SDL_LIBS = -lSDL_$(SDL_VER) \
 			-lSDL_image_$(SDL_IMAGE_VER) \
@@ -68,7 +69,7 @@ SDL_LIBS = -lSDL_$(SDL_VER) \
 
 IMAGE_LIBS = -lkmg -ljpeg -lpng -lz
 LUA_LIBS = -llua_$(LUA_VER)
-KLIBS = -lkosext2fs -lpthread -lkosutils -lstdc++ -lm
+KLIBS = -lpthread -lkosutils -lstdc++ -lm
 GRAPHICS_LIBS = -ltsunami_$(TSUNAMI_VER) \
 				-lparallax_$(PARALLAX_VER)
 
@@ -96,10 +97,6 @@ DRIVERS_OBJ = $(SRC_DIR)/drivers/spi.o $(SRC_DIR)/drivers/sd.o \
 				$(SRC_DIR)/drivers/enc28j60.o $(SRC_DIR)/drivers/asic.o \
 				$(SRC_DIR)/drivers/rtc.o
 
-FATFS_DIR = $(SRC_DIR)/fs/fat
-FATFS = $(FATFS_DIR)/option/ccsbcs.o $(FATFS_DIR)/option/syscall.o \
-		$(FATFS_DIR)/ff.o $(FATFS_DIR)/dc.o
-	
 UTILS_DIR = $(SRC_DIR)/utils
 UTILS_OBJ = $(SRC_DIR)/utils.o $(UTILS_DIR)/gmtime.o $(UTILS_DIR)/strftime.o \
 			$(UTILS_DIR)/debug_console.o $(UTILS_DIR)/memcpy.op \
@@ -117,7 +114,7 @@ OBJS = $(SRC_DIR)/main.o $(SRC_DIR)/video.o $(SRC_DIR)/console.o \
 		$(SRC_DIR)/irq/exceptions.o $(SRC_DIR)/irq/setjmp.o \
 		$(SRC_DIR)/settings.o $(SRC_DIR)/sfx.o \
 		$(DRIVERS_OBJ) $(GUI_OBJS) $(CONSOLE_OBJ) \
-		$(UTILS_OBJ) $(FATFS) $(SRC_DIR)/exports.o $(SRC_DIR)/exports_gcc.o \
+		$(UTILS_OBJ) $(SRC_DIR)/exports.o $(SRC_DIR)/exports_gcc.o \
 		romdisk.o
 
 ifdef TARGET_PROF
@@ -216,6 +213,7 @@ release: build cdi
 update:
 	@echo Fetching DreamShell from GitHub...
 	@git fetch && git checkout origin/master
+	@git submodule update --init --recursive
 	@echo Fetching KallistiOS from GitHub...
 	@cd $(KOS_BASE) && git fetch && git checkout `cat $(DS_BASE)/sdk/doc/KallistiOS.txt`
 	@echo Fetching kos-ports from GitHub...
@@ -224,6 +222,7 @@ update:
 update-build:
 	@echo Fetching DreamShell from GitHub...
 	@git fetch && git checkout origin/master
+	@git submodule update --init --recursive
 	@echo Fetching and build KallistiOS from GitHub...
 	@cd $(KOS_BASE) && git fetch && git checkout `cat $(DS_BASE)/sdk/doc/KallistiOS.txt` && make clean && make
 	@echo Fetching and build kos-ports from GitHub...

README.md

@@ -36,6 +36,8 @@ git clone https://github.com/DC-SWAT/DreamShell.git ds
 git checkout `cat ds/sdk/doc/KallistiOS.txt`
 cp ds/sdk/toolchain/environ.sh environ.sh
 cp ds/sdk/toolchain/patches/*.diff utils/dc-chain/patches
+cd /usr/local/dc/kos/kos/ds
+git submodule update --init --recursive
 ```
 ##### Toolchain
 ```console
@@ -92,6 +94,10 @@ make toolchain
 ```console
 make
 ```
+##### Libraries only
+```console
+cd ${KOS_BASE}/ds/lib && make
+```
 ##### Modules, applications and commands only
 ```console
 cd ${KOS_BASE}/ds/modules && make

exports.txt

@@ -24,6 +24,7 @@ include dc/sound/sound.h
 
 include ds.h
 include fs.h
+include fatfs.h
 include img/SegaPVRImage.h
 include img/decode.h
 include img/load.h
@@ -2089,12 +2090,6 @@ sdc_print_ident
 sdc_blockdev_for_partition
 sdc_blockdev_for_device
 #
-# Ext2 Filesystem
-fs_ext2_init
-fs_ext2_shutdown
-fs_ext2_mount
-fs_ext2_unmount
-#
 # FAT Filesystem
 fs_fat_init
 fs_fat_shutdown

firmware/bootloader/Makefile

@@ -1,10 +1,10 @@
 #
 # DreamShell boot loader
-# (c)2011-2024 SWAT
+# (c)2011-2025 SWAT
 #
 
 TARGET = bootloader
-VERSION = 2.7
+VERSION = 2.8
 TARGET_NAME = DreamShell_$(TARGET)_v$(VERSION)
 TARGET_CD = cd/1DS_BOOT.BIN
 KOS_ROMDISK_DIR = romdisk
@@ -22,22 +22,18 @@ rm-elf:
 
 include ../../sdk/Makefile.cfg
 
-FATFS = $(DS_BASE)/src/fs/fat
-DRIVERS = $(DS_BASE)/src/drivers
 UTILS = $(DS_BASE)/src/utils
 
 OBJS = src/main.o src/spiral.o src/menu.o src/descramble.o \
-		$(DRIVERS)/spi.o $(DRIVERS)/sd.o \
-		$(FATFS)/option/ccsbcs.o $(FATFS)/option/syscall.o \
-		$(FATFS)/ff.o $(FATFS)/dc.o $(FATFS)/../fs.o \
+		$(DS_BASE)/src/fs/fs.o \
 		$(UTILS)/memcpy.op $(UTILS)/memset.op romdisk.o
 
-KOS_CFLAGS += -I$(DS_BASE)/include -I$(DS_BASE)/include/fatfs -I./include -DVERSION="$(VERSION)"
+KOS_CFLAGS += -I$(DS_BASE)/include -I$(DS_BASE)/lib/fatfs/include -I./include -DVERSION="$(VERSION)"
 
 $(TARGET).bin: $(TARGET).elf
 $(TARGET).elf: $(OBJS)
 	$(KOS_CC) $(KOS_CFLAGS) $(KOS_LDFLAGS) -o $(TARGET).elf \
-		$(OBJS) $(OBJEXTRA) -lkosext2fs -lz -lkmg $(KOS_LIBS)
+		$(OBJS) $(OBJEXTRA) -lz -lkmg -lfatfs $(KOS_LIBS)
 	$(KOS_STRIP) $(TARGET).elf
 	$(KOS_OBJCOPY) -R .stack -O binary $(TARGET).elf $(TARGET).bin
 

include/fs.h

@@ -1,7 +1,7 @@
 /** 
  * \file    fs.h
  * \brief   DreamShell filesystem
- * \date    2007-2024
+ * \date    2007-2025
  * \author  SWAT www.dc-swat.ru
  */
 
@@ -10,18 +10,16 @@
 #define _DS_FS_H
 
 #include <arch/types.h>
-#include <kos/blockdev.h>
-#include <ext2/fs_ext2.h>
 
 /**
  * Initialize SD Card 
- * and mount all partitions with FAT or EXT2 filesystems
+ * and mount all partitions with FAT filesystems
  */
 int InitSDCard();
 
 /**
  * Initialize G1-ATA device
- * and mount all partitions with FAT or EXT2 filesystems
+ * and mount all partitions with FAT filesystems
  */
 int InitIDE();
 
@@ -41,59 +39,5 @@ int SearchRoot();
  */
 int RootDeviceIsSupported(const char *name);
 
-/**
- * FAT filesystem API
- */
-
-typedef enum fatfs_ioctl {
-
-	FATFS_IOCTL_CTRL_SYNC = 0,        /* Flush disk cache (for write functions) */
-	FATFS_IOCTL_GET_SECTOR_COUNT,     /* Get media size (for only f_mkfs()), 4 byte unsigned */
-	FATFS_IOCTL_GET_SECTOR_SIZE,      /* Get sector size (for multiple sector size (_MAX_SS >= 1024)), 2 byte unsigned */
-	FATFS_IOCTL_GET_BLOCK_SIZE,       /* Get erase block size (for only f_mkfs()), 2 byte unsigned */
-	FATFS_IOCTL_CTRL_ERASE_SECTOR,    /* Force erased a block of sectors (for only _USE_ERASE) */
-	FATFS_IOCTL_GET_BOOT_SECTOR_DATA, /* Get first sector data, ffconf.h _MAX_SS bytes */
-	FATFS_IOCTL_GET_FD_LBA,           /* Get file LBA, 4 byte unsigned */
-	FATFS_IOCTL_GET_FD_LINK_MAP       /* Get file clusters linkmap, 128+ bytes */
-
-} fatfs_ioctl_t;
-
-/**
- * Initialize and shutdown FAT filesystem
- * return 0 on success, or < 0 if error
- */
-int fs_fat_init(void);
-int fs_fat_shutdown(void);
-
-/**
- * Mount FAT filesystem on specified partition
- * For block device need reset to 0 start_block number
- * return 0 on success, or < 0 if error
- */
-int fs_fat_mount(const char *mp, kos_blockdev_t *dev_pio, kos_blockdev_t *dev_dma, int partition);
-
-/**
- * Unmount FAT filesystem
- * return 0 on success, or < 0 if error
- */
-int fs_fat_unmount(const char *mp);
-
-/**
- * Check mount point for FAT filesystem
- * return 0 is not FAT
- */
-int fs_fat_is_mounted(const char *mp);
-
-/**
- * Check partition type for FAT
- * return 0 if not FAT or 16/32 if FAT partition
- */
-int is_fat_partition(uint8 partition_type);
-
-/**
- * Check partition type for EXT2
- */
-#define is_ext2_partition(partition_type) (partition_type == 0x83)
-
 
 #endif /* _DS_FS_H */

lib/Makefile

@@ -6,9 +6,9 @@
 
 _SUBDIRS = libcfg/src libparallax SDL_rtf \
 	lua SDL SDL_gfx SDL_image SDL_ttf \
-	libtsunami
+	libtsunami fatfs/fatfs
 
-_SUBDIRS_CLEAN = $(_SUBDIRS) freetype mxml
+_SUBDIRS_CLEAN = $(_SUBDIRS) freetype mxml fatfs/fatfs
 
 all: build_freetype build_mxml $(patsubst %, _dir_%, $(_SUBDIRS))