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

3 files changed, 181 insertions, 1 deletions

diff --git a/os/fs/fatfs/fatfs_fsimpl.cpp b/os/fs/fatfs/fatfs_fsimpl.cpp
new file mode 100644
index 000000000..8c9fd73c7
--- /dev/null
+++ b/os/fs/fatfs/fatfs_fsimpl.cpp
@@ -0,0 +1,93 @@
+/*

+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

+                 2011,2012 Giovanni Di Sirio.

+

+    This file is part of ChibiOS/RT.

+

+    ChibiOS/RT is free software; you can redistribute it and/or modify

+    it under the terms of the GNU General Public License as published by

+    the Free Software Foundation; either version 3 of the License, or

+    (at your option) any later version.

+

+    ChibiOS/RT is distributed in the hope that it will be useful,

+    but WITHOUT ANY WARRANTY; without even the implied warranty of

+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+    GNU General Public License for more details.

+

+    You should have received a copy of the GNU General Public License

+    along with this program.  If not, see <http://www.gnu.org/licenses/>.

+*/

+/**

+ * @file    fs_fatfs_impl.cpp

+ * @brief   FatFS file system wrapper.

+ *

+ * @addtogroup fs_fatfs_wrapper

+ * @{

+ */

+

+#include "ch.hpp"

+#include "fs.hpp"

+#include "fatfs_fsimpl.hpp"

+#include "hal.h"

+

+#define MSG_TERMINATE                   (msg_t)0

+

+#define ERR_OK                          (msg_t)0

+#define ERR_TERMINATING                 (msg_t)1

+#define ERR_UNKNOWN_MSG                 (msg_t)2

+

+/**

+ * @brief   FatFS wrapper-related classes and interfaces.

+ */

+namespace chibios_fatfs {

+

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

+   * chibios_fatfs::FatFSWrapper::FatFSServerThread                         *

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

+  FatFSWrapper::FatFSServerThread::FatFSServerThread(::BaseBlockDevice *blkdev) :

+      BaseStaticThread<FATFS_THREAD_STACK_SIZE>(),

+      blkdev(blkdev) {

+

+    start(FATFS_THREAD_PRIORITY);

+  }

+

+  FatFSWrapper::FatFSServerThread::~FatFSServerThread() {

+

+    sendMessage(MSG_TERMINATE);

+    wait();

+  }

+

+  msg_t FatFSWrapper::FatFSServerThread::main() {

+    msg_t sts;

+

+    /* Synchronous messages processing loop.*/

+    while (true) {

+      ThreadReference tr = waitMessage();

+      msg_t msg = tr.getMessage();

+      switch (msg) {

+      case MSG_TERMINATE:

+        /* The server object is being destroyed, terminating.*/

+        tr.releaseMessage(ERR_TERMINATING);

+        return 0;

+      default:

+        sts = ERR_UNKNOWN_MSG;

+      }

+      tr.releaseMessage(sts);

+    }

+  }

+

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

+   * chibios_fatfs::FatFSWrapper                                           *

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

+  FatFSWrapper::FatFSWrapper(::BaseBlockDevice *blkdev) : server(blkdev) {

+

+    server.start(FATFS_THREAD_PRIORITY);

+  }

+

+  FatFSWrapper::~FatFSWrapper() {

+

+    server.~FatFSServerThread();

+  }

+}

+

+/** @} */

diff --git a/os/fs/fatfs/fatfs_fsimpl.hpp b/os/fs/fatfs/fatfs_fsimpl.hpp
new file mode 100644
index 000000000..c8a454c3c
--- /dev/null
+++ b/os/fs/fatfs/fatfs_fsimpl.hpp
@@ -0,0 +1,86 @@
+/*

+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

+                 2011,2012 Giovanni Di Sirio.

+

+    This file is part of ChibiOS/RT.

+

+    ChibiOS/RT is free software; you can redistribute it and/or modify

+    it under the terms of the GNU General Public License as published by

+    the Free Software Foundation; either version 3 of the License, or

+    (at your option) any later version.

+

+    ChibiOS/RT is distributed in the hope that it will be useful,

+    but WITHOUT ANY WARRANTY; without even the implied warranty of

+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+    GNU General Public License for more details.

+

+    You should have received a copy of the GNU General Public License

+    along with this program.  If not, see <http://www.gnu.org/licenses/>.

+*/

+

+/**

+ * @file    fs_fatfs_impl.hpp

+ * @brief   FatFS file system wrapper header.

+ *

+ * @addtogroup cpp_library

+ * @{

+ */

+

+#include "ch.hpp"

+#include "hal.h"

+

+#ifndef _FS_FATFS_IMPL_HPP_

+#define _FS_FATFS_IMPL_HPP_

+

+/**

+ * @brief   Stack size for the internal server thread.

+ */

+#if !defined(FATFS_THREAD_STACK_SIZE) || defined(__DOXYGEN__)

+#define FATFS_THREAD_STACK_SIZE         1024

+#endif

+

+/**

+ * @brief   Priority for the internal server thread.

+ */

+#if !defined(FATFS_THREAD_PRIORITY) || defined(__DOXYGEN__)

+#define FATFS_THREAD_PRIORITY           NORMALPRIO

+#endif

+

+using namespace chibios_rt;

+

+/**

+ * @brief   FatFS wrapper-related classes and interfaces.

+ */

+namespace chibios_fatfs {

+

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

+   * chibios_fatfs::FatFSWrapper                                            *

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

+  /**

+   * @brief   Class of the FatFS wrapper.

+   */

+  class FatFSWrapper : public chibios_fs::BaseFileSystemInterface {

+  protected:

+    /**

+     * @brief   Class of the internal server thread.

+     */

+    class FatFSServerThread : public BaseStaticThread<FATFS_THREAD_STACK_SIZE> {

+    private:

+      ::BaseBlockDevice *blkdev;

+    protected:

+      virtual msg_t main(void);

+    public:

+      FatFSServerThread(::BaseBlockDevice *blkdev);

+      ~FatFSServerThread();

+    } server;

+

+  public:

+    FatFSWrapper(::BaseBlockDevice *blkdev);

+

+    ~FatFSWrapper();

+  };

+}

+

+#endif /* _FS_FATFS_IMPL_HPP_ */

+

+/** @} */

diff --git a/os/fs/fs.hpp b/os/fs/fs.hpp
index 57f776844..1ba2cfdc2 100644
--- a/os/fs/fs.hpp
+++ b/os/fs/fs.hpp
@@ -29,7 +29,7 @@
 #ifndef _FS_HPP_

 #define _FS_HPP_

 

-#include <ch.hpp>

+#include "ch.hpp"

 

 /**

  * @name    Error codes

@@ -122,6 +122,7 @@ namespace chibios_fs {
    *          classes can offer an extended interface.

    */

   class BaseFileSystemInterface {

+  public:

     /**

      * @brief   File system unmount and object destruction.

      */