Add KFile over a KBlock device (first implementation).

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@4119 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/bertos/io/kfile_block.c b/bertos/io/kfile_block.c
new file mode 100644 (file)
index 0000000..569e1c7
--- /dev/null
+++ b/bertos/io/kfile_block.c
@@ -0,0 +1,115 @@
+/**
+ * \file
+ * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos 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 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2010 Develer S.r.l. (http://www.develer.com/)
+ *
+ * -->
+ *
+ * \brief KFile interface over a KBlock.
+ *
+ */
+
+#include "kfile_block.h"
+#include <string.h>
+
+
+/**
+ * ID for KFile over a KBlock.
+ */
+#define KFT_KFILEBLOCK MAKE_ID('K', 'F', 'B', 'L')
+
+/**
+ * Convert + ASSERT from generic KFile to KFileBlock.
+ */
+INLINE KFileBlock * KFILEBLOCK_CAST(KFile *fd)
+{
+       ASSERT(fd->_type == KFT_KFILEBLOCK);
+       return (KFileBlock *)fd;
+}
+
+#define KFILEBLOCK(dir, fd, buf, size) \
+({ \
+       KFileBlock *fb = KFILEBLOCK_CAST(fd); \
+       block_idx_t id = (fd)->seek_pos / fb->b->blk_size; \
+       size_t offset = (fd)->seek_pos % fb->b->blk_size; \
+       size_t len = kblock_##dir(fb->b, id, buf, offset, size); \
+       (fd)->seek_pos += len; \
+       len; \
+})
+
+static size_t kfileblock_read(struct KFile *fd, void *buf, size_t size)
+{
+       return KFILEBLOCK(read, fd, buf, size);
+}
+
+static size_t kfileblock_write(struct KFile *fd, const void *buf, size_t size)
+{
+       return KFILEBLOCK(write, fd, buf, size);
+}
+
+static int kfileblock_flush(struct KFile *fd)
+{
+       KFileBlock *fb = KFILEBLOCK_CAST(fd);
+       return kblock_flush(fb->b);
+}
+
+static int kfileblock_error(struct KFile *fd)
+{
+       KFileBlock *fb = KFILEBLOCK_CAST(fd);
+       return kblock_error(fb->b);
+}
+
+static void kfileblock_clearerr(struct KFile *fd)
+{
+       KFileBlock *fb = KFILEBLOCK_CAST(fd);
+       return kblock_clearerr(fb->b);
+}
+
+static int kfileblock_close(struct KFile *fd)
+{
+       KFileBlock *fb = KFILEBLOCK_CAST(fd);
+       return kblock_close(fb->b);
+}
+
+void kfileblock_init(KFileBlock *fb, KBlock *b)
+{
+       ASSERT(fb);
+       ASSERT(b);
+       ASSERT(kblock_partialWrite(b));
+       memset(fb, 0, sizeof(*fb));
+       kfile_init(&fb->fd);
+       DB(fb->fd._type = KFT_KFILEBLOCK);
+       fb->b = b;
+       fb->fd.size = b->blk_cnt * b->blk_size;
+       fb->fd.read = kfileblock_read;
+       fb->fd.write = kfileblock_write;
+       fb->fd.flush = kfileblock_flush;
+       fb->fd.error = kfileblock_error;
+       fb->fd.clearerr = kfileblock_clearerr;
+       fb->fd.close = kfileblock_close;
+}

diff --git a/bertos/io/kfile_block.h b/bertos/io/kfile_block.h
new file mode 100644 (file)
index 0000000..9694ea9
--- /dev/null
+++ b/bertos/io/kfile_block.h
@@ -0,0 +1,52 @@
+/**
+ * \file
+ * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos 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 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2010 Develer S.r.l. (http://www.develer.com/)
+ *
+ * -->
+ *
+ * \brief KFile interface over a KBlock.
+ *
+ */
+
+#ifndef IO_KFILE_BLOCK_H
+#define IO_KFILE_BLOCK_H
+
+#include <cfg/compiler.h>
+#include <io/kblock.h>
+#include <io/kfile.h>
+
+typedef struct KFileBlock
+{
+       KFile fd;
+       KBlock *b;
+} KFileBlock;
+
+void kfileblock_init(KFileBlock *fb, KBlock *b);
+
+#endif /* IO_KFILE_KBLOCK_H */