Added contributed FatFS code, thanks Eddie.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@7008 35acf78f-673a-0410-8e92-d51de3d6d3f4

os/ext/readme.txt

@@ -0,0 +1,6 @@
+All the code contained under ./os/ext is not part of the ChibiOS project and
+supplied as-is without any additional warranty by ChibiOS. For ownership and
+copyright statements see the license details inside the code.
+
+Some modules may contain changes from the ChibiOS team in order to increase
+compatibility or usability with ChibiOS itself.

os/various/fatfs_bindings/fatfs.mk

@@ -0,0 +1,7 @@
+# FATFS files.
+FATFSSRC = ${CHIBIOS}/os/various/fatfs_bindings/fatfs_diskio.c \
+           ${CHIBIOS}/os/various/fatfs_bindings/fatfs_syscall.c \
+           ${CHIBIOS}/os/ext/fatfs/src/ff.c \
+           ${CHIBIOS}/os/ext/fatfs/src/option/unicode.c
+
+FATFSINC = ${CHIBIOS}/os/ext/fatfs/src

os/various/fatfs_bindings/fatfs_diskio.c

@@ -0,0 +1,252 @@
+/*-----------------------------------------------------------------------*/
+/* 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 "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 pdrv                /* Physical drive nmuber (0..) */
+)
+{
+  DSTATUS stat;
+
+  switch (pdrv) {
+#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_NOINIT;
+}
+
+
+
+/*-----------------------------------------------------------------------*/
+/* Return Disk Status                                                    */
+
+DSTATUS disk_status (
+    BYTE pdrv        /* Physical drive nmuber (0..) */
+)
+{
+  DSTATUS stat;
+
+  switch (pdrv) {
+#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_NOINIT;
+}
+
+
+
+/*-----------------------------------------------------------------------*/
+/* Read Sector(s)                                                        */
+
+DRESULT disk_read (
+    BYTE pdrv,        /* 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 (pdrv) {
+#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 _USE_WRITE
+DRESULT disk_write (
+    BYTE pdrv,            /* 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 (pdrv) {
+#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 /* _USE_WRITE */
+
+
+
+/*-----------------------------------------------------------------------*/
+/* Miscellaneous Functions                                               */
+
+#if _USE_IOCTL
+DRESULT disk_ioctl (
+    BYTE pdrv,        /* Physical drive nmuber (0..) */
+    BYTE cmd,        /* Control code */
+    void *buff        /* Buffer to send/receive control data */
+)
+{
+  switch (pdrv) {
+#if HAL_USE_MMC_SPI
+  case MMC:
+    switch (cmd) {
+    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 (cmd) {
+    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;
+}
+#endif /* _USE_IOCTL */
+
+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
+}

os/various/fatfs_bindings/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 "hal.h"
+#include "ff.h"
+
+#if _FS_REENTRANT
+/*------------------------------------------------------------------------*/
+/* Static array of Synchronization Objects                                */
+/*------------------------------------------------------------------------*/
+static semaphore_t ff_sem[_VOLUMES];
+
+/*------------------------------------------------------------------------*/
+/* Create a Synchronization Object                                        */
+/*------------------------------------------------------------------------*/
+int ff_cre_syncobj(BYTE vol, _SYNC_t *sobj) {
+
+  *sobj = &ff_sem[vol];
+  chSemObjectInit(*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 == MSG_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 */

os/various/fatfs_bindings/readme.txt

@@ -0,0 +1,6 @@
+This directory contains the ChibiOS/RT "official" bindings with the FatFS
+library by ChaN: http://elm-chan.org
+
+In order to use FatFS within ChibiOS/RT project, unzip FatFS under
+./ext/fatfs then include $(CHIBIOS)/os/various/fatfs_bindings/fatfs.mk
+in your makefile.