initial implementation - untested

4 files changed, 344 insertions, 4 deletions

diff --git a/src/gfile/fatfs/fatfs.mk b/src/gfile/fatfs/fatfs.mk
new file mode 100644
index 00000000..279ae56f
--- /dev/null
+++ b/src/gfile/fatfs/fatfs.mk
@@ -0,0 +1,6 @@
+GFXSRC +=    $(GFXLIB)/src/gfile/fatfs/src/ff.c \
+             $(GFXLIB)/src/gfile/fatfs/src/chibios_fatfs_diskio.c \
+             $(GFXLIB)/src/gfile/fatfs/src/chibios_fatfs_syscall.c
+
+GFXINC +=    $(GFXLIB)/src/gfile/fatfs/src
+
diff --git a/src/gfile/fatfs/readme.txt b/src/gfile/fatfs/readme.txt
deleted file mode 100644
index 489327c4..00000000
--- a/src/gfile/fatfs/readme.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-The contents of this directory are not part of the Works of the
-uGFX library. All the contents in this directory are 3rdparty and come with
-their own licenses.
-
diff --git a/src/gfile/fatfs/src/chibios_fatfs_diskio.c b/src/gfile/fatfs/src/chibios_fatfs_diskio.c
new file mode 100644
index 00000000..f882aa41
--- /dev/null
+++ b/src/gfile/fatfs/src/chibios_fatfs_diskio.c
@@ -0,0 +1,254 @@
+/*-----------------------------------------------------------------------*/

+/* Low level disk I/O module skeleton for FatFs     (C)ChaN, 2007        */

+/*-----------------------------------------------------------------------*/

+/* This is a stub disk I/O module that acts as front end of the existing */

+/* disk I/O modules and attach it to FatFs module with common interface. */

+/*-----------------------------------------------------------------------*/

+

+#include "ch.h"

+#include "hal.h"

+#include "ffconf.h"

+#include "diskio.h"

+

+#if HAL_USE_MMC_SPI && HAL_USE_SDC

+#error "cannot specify both MMC_SPI and SDC drivers"

+#endif

+

+#if HAL_USE_MMC_SPI

+extern MMCDriver MMCD1;

+#elif HAL_USE_SDC

+extern SDCDriver SDCD1;

+#else

+#error "MMC_SPI or SDC driver must be specified"

+#endif

+

+#if HAL_USE_RTC

+#include "chrtclib.h"

+extern RTCDriver RTCD1;

+#endif

+

+/*-----------------------------------------------------------------------*/

+/* Correspondence between physical drive number and physical drive.      */

+

+#define MMC     0

+#define SDC     0

+

+

+

+/*-----------------------------------------------------------------------*/

+/* Inidialize a Drive                                                    */

+

+DSTATUS disk_initialize (

+    BYTE drv                /* Physical drive nmuber (0..) */

+)

+{

+  DSTATUS stat;

+

+  switch (drv) {

+#if HAL_USE_MMC_SPI

+  case MMC:

+    stat = 0;

+    /* It is initialized externally, just reads the status.*/

+    if (blkGetDriverState(&MMCD1) != BLK_READY)

+      stat |= STA_NOINIT;

+    if (mmcIsWriteProtected(&MMCD1))

+      stat |=  STA_PROTECT;

+    return stat;

+#else

+  case SDC:

+    stat = 0;

+    /* It is initialized externally, just reads the status.*/

+    if (blkGetDriverState(&SDCD1) != BLK_READY)

+      stat |= STA_NOINIT;

+    if (sdcIsWriteProtected(&SDCD1))

+      stat |=  STA_PROTECT;

+    return stat;

+#endif

+  }

+  return STA_NODISK;

+}

+

+

+

+/*-----------------------------------------------------------------------*/

+/* Return Disk Status                                                    */

+

+DSTATUS disk_status (

+    BYTE drv        /* Physical drive nmuber (0..) */

+)

+{

+  DSTATUS stat;

+

+  switch (drv) {

+#if HAL_USE_MMC_SPI

+  case MMC:

+    stat = 0;

+    /* It is initialized externally, just reads the status.*/

+    if (blkGetDriverState(&MMCD1) != BLK_READY)

+      stat |= STA_NOINIT;

+    if (mmcIsWriteProtected(&MMCD1))

+      stat |= STA_PROTECT;

+    return stat;

+#else

+  case SDC:

+    stat = 0;

+    /* It is initialized externally, just reads the status.*/

+    if (blkGetDriverState(&SDCD1) != BLK_READY)

+      stat |= STA_NOINIT;

+    if (sdcIsWriteProtected(&SDCD1))

+      stat |= STA_PROTECT;

+    return stat;

+#endif

+  }

+  return STA_NODISK;

+}

+

+

+

+/*-----------------------------------------------------------------------*/

+/* Read Sector(s)                                                        */

+

+DRESULT disk_read (

+    BYTE drv,        /* Physical drive nmuber (0..) */

+    BYTE *buff,        /* Data buffer to store read data */

+    DWORD sector,    /* Sector address (LBA) */

+    UINT count        /* Number of sectors to read (1..255) */

+)

+{

+  switch (drv) {

+#if HAL_USE_MMC_SPI

+  case MMC:

+    if (blkGetDriverState(&MMCD1) != BLK_READY)

+      return RES_NOTRDY;

+    if (mmcStartSequentialRead(&MMCD1, sector))

+      return RES_ERROR;

+    while (count > 0) {

+      if (mmcSequentialRead(&MMCD1, buff))

+        return RES_ERROR;

+      buff += MMCSD_BLOCK_SIZE;

+      count--;

+    }

+    if (mmcStopSequentialRead(&MMCD1))

+        return RES_ERROR;

+    return RES_OK;

+#else

+  case SDC:

+    if (blkGetDriverState(&SDCD1) != BLK_READY)

+      return RES_NOTRDY;

+    if (sdcRead(&SDCD1, sector, buff, count))

+      return RES_ERROR;

+    return RES_OK;

+#endif

+  }

+  return RES_PARERR;

+}

+

+

+

+/*-----------------------------------------------------------------------*/

+/* Write Sector(s)                                                       */

+

+#if _READONLY == 0

+DRESULT disk_write (

+    BYTE drv,            /* Physical drive nmuber (0..) */

+    const BYTE *buff,    /* Data to be written */

+    DWORD sector,        /* Sector address (LBA) */

+    UINT count            /* Number of sectors to write (1..255) */

+)

+{

+  switch (drv) {

+#if HAL_USE_MMC_SPI

+  case MMC:

+    if (blkGetDriverState(&MMCD1) != BLK_READY)

+        return RES_NOTRDY;

+    if (mmcIsWriteProtected(&MMCD1))

+        return RES_WRPRT;

+    if (mmcStartSequentialWrite(&MMCD1, sector))

+        return RES_ERROR;

+    while (count > 0) {

+        if (mmcSequentialWrite(&MMCD1, buff))

+            return RES_ERROR;

+        buff += MMCSD_BLOCK_SIZE;

+        count--;

+    }

+    if (mmcStopSequentialWrite(&MMCD1))

+        return RES_ERROR;

+    return RES_OK;

+#else

+  case SDC:

+    if (blkGetDriverState(&SDCD1) != BLK_READY)

+      return RES_NOTRDY;

+    if (sdcWrite(&SDCD1, sector, buff, count))

+      return RES_ERROR;

+    return RES_OK;

+#endif

+  }

+  return RES_PARERR;

+}

+#endif /* _READONLY */

+

+

+

+/*-----------------------------------------------------------------------*/

+/* Miscellaneous Functions                                               */

+

+DRESULT disk_ioctl (

+    BYTE drv,        /* Physical drive nmuber (0..) */

+    BYTE ctrl,        /* Control code */

+    void *buff        /* Buffer to send/receive control data */

+)

+{

+  switch (drv) {

+#if HAL_USE_MMC_SPI

+  case MMC:

+    switch (ctrl) {

+    case CTRL_SYNC:

+        return RES_OK;

+    case GET_SECTOR_SIZE:

+        *((WORD *)buff) = MMCSD_BLOCK_SIZE;

+        return RES_OK;

+#if _USE_ERASE

+    case CTRL_ERASE_SECTOR:

+        mmcErase(&MMCD1, *((DWORD *)buff), *((DWORD *)buff + 1));

+        return RES_OK;

+#endif

+    default:

+        return RES_PARERR;

+    }

+#else

+  case SDC:

+    switch (ctrl) {

+    case CTRL_SYNC:

+        return RES_OK;

+    case GET_SECTOR_COUNT:

+        *((DWORD *)buff) = mmcsdGetCardCapacity(&SDCD1);

+        return RES_OK;

+    case GET_SECTOR_SIZE:

+        *((WORD *)buff) = MMCSD_BLOCK_SIZE;

+        return RES_OK;

+    case GET_BLOCK_SIZE:

+        *((DWORD *)buff) = 256; /* 512b blocks in one erase block */

+        return RES_OK;

+#if _USE_ERASE

+    case CTRL_ERASE_SECTOR:

+        sdcErase(&SDCD1, *((DWORD *)buff), *((DWORD *)buff + 1));

+        return RES_OK;

+#endif

+    default:

+        return RES_PARERR;

+    }

+#endif

+  }

+  return RES_PARERR;

+}

+

+DWORD get_fattime(void) {

+#if HAL_USE_RTC

+    return rtcGetTimeFat(&RTCD1);

+#else

+    return ((uint32_t)0 | (1 << 16)) | (1 << 21); /* wrong but valid time */

+#endif

+}

+

+

+

diff --git a/src/gfile/fatfs/src/chibios_fatfs_syscall.c b/src/gfile/fatfs/src/chibios_fatfs_syscall.c
new file mode 100644
index 00000000..a42cbcff
--- /dev/null
+++ b/src/gfile/fatfs/src/chibios_fatfs_syscall.c
@@ -0,0 +1,84 @@
+/*

+    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio

+

+    Licensed under the Apache License, Version 2.0 (the "License");

+    you may not use this file except in compliance with the License.

+    You may obtain a copy of the License at

+

+        http://www.apache.org/licenses/LICENSE-2.0

+

+    Unless required by applicable law or agreed to in writing, software

+    distributed under the License is distributed on an "AS IS" BASIS,

+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+    See the License for the specific language governing permissions and

+    limitations under the License.

+*/

+

+/*------------------------------------------------------------------------*/

+/* Sample code of OS dependent controls for FatFs R0.08b                  */

+/* (C)ChaN, 2011                                                          */

+/*------------------------------------------------------------------------*/

+

+#include "ch.h"

+#include "ff.h"

+

+#if _FS_REENTRANT

+/*------------------------------------------------------------------------*/

+/* Static array of Synchronization Objects                                */

+/*------------------------------------------------------------------------*/

+static Semaphore ff_sem[_VOLUMES];

+

+/*------------------------------------------------------------------------*/

+/* Create a Synchronization Object                                        */

+/*------------------------------------------------------------------------*/

+int ff_cre_syncobj(BYTE vol, _SYNC_t *sobj) {

+

+  *sobj = &ff_sem[vol];

+  chSemInit(*sobj, 1);

+  return TRUE;

+}

+

+/*------------------------------------------------------------------------*/

+/* Delete a Synchronization Object                                        */

+/*------------------------------------------------------------------------*/

+int ff_del_syncobj(_SYNC_t sobj) {

+

+  chSemReset(sobj, 0);

+  return TRUE;

+}

+

+/*------------------------------------------------------------------------*/

+/* Request Grant to Access the Volume                                     */

+/*------------------------------------------------------------------------*/

+int ff_req_grant(_SYNC_t sobj) {

+

+  msg_t msg = chSemWaitTimeout(sobj, (systime_t)_FS_TIMEOUT);

+  return msg == RDY_OK;

+}

+

+/*------------------------------------------------------------------------*/

+/* Release Grant to Access the Volume                                     */

+/*------------------------------------------------------------------------*/

+void ff_rel_grant(_SYNC_t sobj) {

+

+  chSemSignal(sobj);

+}

+#endif /* _FS_REENTRANT */

+

+#if _USE_LFN == 3	/* LFN with a working buffer on the heap */

+/*------------------------------------------------------------------------*/

+/* Allocate a memory block                                                */

+/*------------------------------------------------------------------------*/

+void *ff_memalloc(UINT size) {

+

+  return chHeapAlloc(NULL, size);

+}

+

+/*------------------------------------------------------------------------*/

+/* Free a memory block                                                    */

+/*------------------------------------------------------------------------*/

+void ff_memfree(void *mblock) {

+

+  chHeapFree(mblock);

+}

+#endif /* _USE_LFN == 3 */