Added FAT filesystem support

Author: maccasoft

SDL2/src/core/raspberry/SDL_raspberry.c

@@ -206,3 +206,8 @@ void SDL_Interrupt_Handler() {
         USPiInterruptHandler ();
 #endif
 }
+
+void log_printf (const char *ptr, ...)
+{
+    // Do nothing
+}

kernel/Makefile

@@ -6,6 +6,7 @@ OBJS = \
 	console.o \
 	emmc.o \
 	fb.o \
+	ff.o \
 	platform.o \
 	wiring.o
 

kernel/common.mk

@@ -11,12 +11,12 @@ OBJCOPY := $(TOOLCHAIN)-objcopy
 DEPDIR := .deps
 
 ASFLAGS = --warn -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp
-CFLAGS = -Wall -O2 -ffreestanding -marm -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp -D__RASPBERRY_PI__ -I../kernel
+CFLAGS = -Wall -O2 -ffreestanding -marm -mcpu=arm1176jzf-s -mfpu=vfp -mfloat-abi=softfp -D__RASPBERRY_PI__ -I../kernel -I../uspi/include
 CPPFLAGS = $(CFLAGS) -fno-exceptions -fno-unwind-tables -fno-rtti
 LDFLAGS = -T ../kernel/raspberry.ld -nostartfiles -fno-exceptions -fno-unwind-tables -fno-rtti -Wl,-Map=kernel.map -o kernel.elf
 
-LIBS = -L../kernel -lkernel
-LIBS_DEP = ../kernel/libkernel.a
+LIBS = -L../kernel -lkernel -L../uspi -luspi
+LIBS_DEP = ../kernel/libkernel.a ../uspi/libuspi.a
 
 %.o: %.c
 	@mkdir -p $(DEPDIR)/$(@D)

kernel/emmc.c

@@ -97,37 +97,7 @@ struct sd_scr
     int         sd_version;
 };
 
-struct emmc_block_dev
-{
-	struct block_device bd;
-	uint32_t card_supports_sdhc;
-	uint32_t card_supports_18v;
-	uint32_t card_ocr;
-	uint32_t card_rca;
-	uint32_t last_interrupt;
-	uint32_t last_error;
-
-	struct sd_scr *scr;
-
-	int failed_voltage_switch;
-
-    uint32_t last_cmd_reg;
-    uint32_t last_cmd;
-	uint32_t last_cmd_success;
-	uint32_t last_r0;
-	uint32_t last_r1;
-	uint32_t last_r2;
-	uint32_t last_r3;
-
-	void *buf;
-	int blocks_to_transfer;
-	size_t block_size;
-	int use_sdma;
-	int card_removal;
-	uint32_t base_clock;
-};
-
-static struct emmc_block_dev emmc_dev;
+struct emmc_block_dev emmc_dev;
 
 #define EMMC_BASE		0x20300000
 #define	EMMC_ARG2		0

kernel/emmc.h

@@ -47,10 +47,39 @@ struct block_device
     struct fs *fs;
 };
 
-int sd_card_init(struct block_device **dev);
+struct sd_scr;
+
+struct emmc_block_dev
+{
+    struct block_device bd;
+    uint32_t card_supports_sdhc;
+    uint32_t card_supports_18v;
+    uint32_t card_ocr;
+    uint32_t card_rca;
+    uint32_t last_interrupt;
+    uint32_t last_error;
+
+    struct sd_scr *scr;
+
+    int failed_voltage_switch;
 
-size_t sd_get_block_size();
-size_t sd_get_num_blocks();
+    uint32_t last_cmd_reg;
+    uint32_t last_cmd;
+    uint32_t last_cmd_success;
+    uint32_t last_r0;
+    uint32_t last_r1;
+    uint32_t last_r2;
+    uint32_t last_r3;
+
+    void *buf;
+    int blocks_to_transfer;
+    size_t block_size;
+    int use_sdma;
+    int card_removal;
+    uint32_t base_clock;
+};
+
+int sd_card_init(struct block_device **dev);
 
 size_t sd_read(uint8_t *buf, size_t buf_size, uint32_t block_no);
 size_t sd_write(uint8_t *buf, size_t buf_size, uint32_t block_no);