move flash_disk.c to mrbgems/picoruby-filesystem-fat

Author: hasumikin

CMakeLists.txt

@@ -42,6 +42,7 @@ pico_sdk_init()
 file(GLOB SRCS src/*.c)
 add_executable(${PROJECT_NAME}
   ${SRCS}
+  ${CMAKE_SOURCE_DIR}/lib/picoruby/mrbgems/picoruby-filesystem-fat/ports/rp2040/flash_disk.c
   ${CMAKE_SOURCE_DIR}/lib/picoruby/mrbgems/picoruby-gpio/ports/rp2040/gpio.c
   ${CMAKE_SOURCE_DIR}/lib/picoruby/mrbgems/picoruby-i2c/ports/rp2040/i2c.c
   ${CMAKE_SOURCE_DIR}/lib/picoruby/mrbgems/picoruby-spi/ports/rp2040/spi.c

include/flash_disk.h renamed to include/msc_disk.h

@@ -1,9 +1,7 @@
-#ifndef FLASH_DISK_DEFINED_H_
-#define FLASH_DISK_DEFINED_H_
+#ifndef MSC_DISK_DEFINED_H_
+#define MSC_DISK_DEFINED_H_
 
 #include <hardware/flash.h>
-#include <ff.h>
-#include <diskio.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -20,15 +18,9 @@ extern "C" {
 #define SECTOR_SIZE          4096 /* == FLASH_SECTOR_SIZE */
 #define SECTOR_COUNT         192  /* Seems FatFS allows 192 as the minimum */
 
-int FLASH_disk_initialize(void);
-int FLASH_disk_status(void);
-int FLASH_disk_read(BYTE *buff, LBA_t sector, UINT count);
-int FLASH_disk_write(const BYTE *buff, LBA_t sector, UINT count);
-DRESULT FLASH_disk_ioctl(BYTE cmd, void *buff);
-
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* FLASH_DISK_DEFINED_H_ */
+#endif /* MSC_DISK_DEFINED_H_ */
 

lib/picoruby

@@ -30,7 +30,7 @@
 #include "tusb.h"
 
 #include "../include/keyboard.h"
-#include "../include/flash_disk.h"
+#include "../include/msc_disk.h"
 #include <mrubyc.h>
 
 // whether host does safe-eject

src/flash_disk.c

@@ -527,7 +527,7 @@ c_merge_mouse_report(mrbc_vm *vm, mrbc_value *v, int argc)
 // String Descriptors
 // Note: Tentative and dirty implementation until getting rid of VIA
 //--------------------------------------------------------------------+
-#include "../include/flash_disk.h"
+#include "../include/msc_disk.h"
 static void
 c_save_prk_conf(mrbc_vm *vm, mrbc_value *v, int argc)
 {