From 7ab18994e7ac71872b9aa4684546dffe01c5c3f0 Mon Sep 17 00:00:00 2001
From: Konstantin Oblaukhov <oblaukhov.konstantin@gmail.com>
Date: Mon, 24 Sep 2018 20:29:02 +0700
Subject: Adopt sources to new HAL.

---
 os/various/fatfs_bindings/fatfs.mk       |  4 ++++
 os/various/fatfs_bindings/fatfs_diskio.c | 12 ++++++------
 os/various/ramdisk.c                     |  1 +
 3 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'os/various')

diff --git a/os/various/fatfs_bindings/fatfs.mk b/os/various/fatfs_bindings/fatfs.mk
index f2feeb5..2a3b4d6 100644
--- a/os/various/fatfs_bindings/fatfs.mk
+++ b/os/various/fatfs_bindings/fatfs.mk
@@ -5,3 +5,7 @@ FATFSSRC = ${CHIBIOS_CONTRIB}/os/various/fatfs_bindings/fatfs_diskio.c \
            $(CHIBIOS)/ext/fatfs/src/ffunicode.c
 
 FATFSINC = ${CHIBIOS}/ext/fatfs/src
+
+# Shared variables
+ALLCSRC += $(FATFSSRC)
+ALLINC  += $(FATFSINC)
diff --git a/os/various/fatfs_bindings/fatfs_diskio.c b/os/various/fatfs_bindings/fatfs_diskio.c
index 80d1502..eb732fd 100644
--- a/os/various/fatfs_bindings/fatfs_diskio.c
+++ b/os/various/fatfs_bindings/fatfs_diskio.c
@@ -243,12 +243,12 @@ DRESULT disk_ioctl (
     switch (cmd) {
     case CTRL_SYNC:
         return RES_OK;
-#if _MAX_SS > _MIN_SS
+#if FF_MAX_SS > FF_MIN_SS
     case GET_SECTOR_SIZE:
         *((WORD *)buff) = MMCSD_BLOCK_SIZE;
         return RES_OK;
 #endif
-#if _USE_TRIM
+#if FF_USE_TRIM
     case CTRL_TRIM:
         mmcErase(&MMCD1, *((DWORD *)buff), *((DWORD *)buff + 1));
         return RES_OK;
@@ -264,7 +264,7 @@ DRESULT disk_ioctl (
     case GET_SECTOR_COUNT:
         *((DWORD *)buff) = mmcsdGetCardCapacity(&SDCD1);
         return RES_OK;
-#if _MAX_SS > _MIN_SS
+#if FF_MAX_SS > FF_MIN_SS
     case GET_SECTOR_SIZE:
         *((WORD *)buff) = MMCSD_BLOCK_SIZE;
         return RES_OK;
@@ -272,7 +272,7 @@ DRESULT disk_ioctl (
     case GET_BLOCK_SIZE:
         *((DWORD *)buff) = 256; /* 512b blocks in one erase block */
         return RES_OK;
-#if _USE_TRIM
+#if FF_USE_TRIM
     case CTRL_TRIM:
         sdcErase(&SDCD1, *((DWORD *)buff), *((DWORD *)buff + 1));
         return RES_OK;
@@ -289,12 +289,12 @@ DRESULT disk_ioctl (
       case GET_SECTOR_COUNT:
           *((DWORD *)buff) = MSBLKD[0].info.blk_num;
           return RES_OK;
-#if _MAX_SS > _MIN_SS
+#if FF_MAX_SS > FF_MIN_SS
       case GET_SECTOR_SIZE:
           *((WORD *)buff) = MSBLKD[0].info.blk_size;
           return RES_OK;
 #endif
-#if _USE_TRIM
+#if FF_USE_TRIM
 #error "unimplemented yet!"
 //    case CTRL_TRIM:
 //      ....
diff --git a/os/various/ramdisk.c b/os/various/ramdisk.c
index 23bf658..d0d366a 100644
--- a/os/various/ramdisk.c
+++ b/os/various/ramdisk.c
@@ -139,6 +139,7 @@ static bool get_info(void *instance, BlockDeviceInfo *bdip) {
  *
  */
 static const struct BaseBlockDeviceVMT vmt = {
+    (size_t)0,
     is_inserted,
     is_protected,
     connect,
-- 
cgit v1.2.3