X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fio%2Fkblock.c;h=7355deeded97884c6c010decd54a54f7580d8a83;hb=ec1f9b136d8b9ec44272ba7ab8ddc4b729589af2;hp=65f427903a11ba018e92acbd1d2a2600bf57e8e1;hpb=67a447ed1a103117f947fd3ac6c9d2ea72f38c5d;p=bertos.git

diff --git a/bertos/io/kblock.c b/bertos/io/kblock.c
index 65f42790..7355deed 100644
--- a/bertos/io/kblock.c
+++ b/bertos/io/kblock.c
@@ -42,13 +42,22 @@
 #define LOG_FORMAT LOG_FMT_VERBOSE
 
 #include <cfg/log.h>
+#include <string.h>
 
 INLINE size_t kblock_readDirect(struct KBlock *b, block_idx_t index, void *buf, size_t offset, size_t size)
 {
 	KB_ASSERT_METHOD(b, readDirect);
+	ASSERT(index < b->blk_cnt);
 	return b->priv.vt->readDirect(b, b->priv.blk_start + index, buf, offset, size);
 }
 
+INLINE int kblock_writeBlock(struct KBlock *b, block_idx_t index, const void *buf)
+{
+	KB_ASSERT_METHOD(b, writeBlock);
+	ASSERT(index < b->blk_cnt);
+	return b->priv.vt->writeBlock(b, b->priv.blk_start + index, buf);
+}
+
 INLINE size_t kblock_readBuf(struct KBlock *b, void *buf, size_t offset, size_t size)
 {
 	KB_ASSERT_METHOD(b, readBuf);
@@ -82,6 +91,14 @@ INLINE int kblock_store(struct KBlock *b, block_idx_t index)
 	return b->priv.vt->store(b, b->priv.blk_start + index);
 }
 
+INLINE void kblock_setDirty(struct KBlock *b, bool dirty)
+{
+	if (dirty)
+		b->priv.flags |= KB_CACHE_DIRTY;
+	else
+		b->priv.flags &= ~KB_CACHE_DIRTY;
+}
+
 
 
 size_t kblock_read(struct KBlock *b, block_idx_t idx, void *buf, size_t offset, size_t size)
@@ -91,7 +108,7 @@ size_t kblock_read(struct KBlock *b, block_idx_t idx, void *buf, size_t offset,
 	ASSERT(offset + size <= b->blk_size);
 	LOG_INFO("blk_idx %d, offset %d, size %d\n", idx, offset, size);
 
-	if (idx == b->priv.curr_blk)
+	if (kblock_buffered(b) && idx == b->priv.curr_blk)
 		return kblock_readBuf(b, buf, offset, size);
 	else
 		return kblock_readDirect(b, idx, buf, offset, size);
@@ -102,11 +119,14 @@ int kblock_flush(struct KBlock *b)
 {
 	ASSERT(b);
 
-	if (b->priv.cache_dirty)
+	if (!kblock_buffered(b))
+		return 0;
+
+	if (kblock_cacheDirty(b))
 	{
 		LOG_INFO("flushing block %d\n", b->priv.curr_blk);
 		if (kblock_store(b, b->priv.curr_blk) == 0)
-			b->priv.cache_dirty = false;
+			kblock_setDirty(b, false);
 		else
 			return EOF;
 	}
@@ -134,26 +154,65 @@ size_t kblock_write(struct KBlock *b, block_idx_t idx, const void *buf, size_t o
 {
 	ASSERT(b);
 	ASSERT(buf);
+	ASSERT(idx < b->blk_cnt);
 	ASSERT(offset + size <= b->blk_size);
 
 	LOG_INFO("blk_idx %d, offset %d, size %d\n", idx, offset, size);
 
-	if (!kblock_loadPage(b, idx))
-		return 0;
+	if (kblock_buffered(b))
+	{
+		if (!kblock_loadPage(b, idx))
+			return 0;
 
-	b->priv.cache_dirty = true;
-	return kblock_writeBuf(b, buf, offset, size);
+		kblock_setDirty(b, true);
+		return kblock_writeBuf(b, buf, offset, size);
+	}
+	else
+	{
+		ASSERT(offset == 0);
+		ASSERT(size == b->blk_size);
+		return (kblock_writeBlock(b, idx, buf) == 0) ? size : 0;
+	}
 }
 
-int kblock_copy(struct KBlock *b, block_idx_t idx1, block_idx_t idx2)
+int kblock_copy(struct KBlock *b, block_idx_t src, block_idx_t dest)
 {
 	ASSERT(b);
+	ASSERT(src < b->blk_cnt);
+	ASSERT(dest < b->blk_cnt);
+	ASSERT(kblock_buffered(b));
 
-	if (!kblock_loadPage(b, idx1))
+	if (!kblock_loadPage(b, src))
 		return EOF;
 
-	b->priv.curr_blk = idx2;
-	b->priv.cache_dirty = true;
+	b->priv.curr_blk = dest;
+	kblock_setDirty(b, true);
 	return 0;
 }
 
+int kblock_swLoad(struct KBlock *b, block_idx_t index)
+{
+	return (kblock_readDirect(b, index, b->priv.buf, 0, b->blk_size) == b->blk_size) ? 0 : EOF;
+}
+
+int kblock_swStore(struct KBlock *b, block_idx_t index)
+{
+	return kblock_writeBlock(b, index, b->priv.buf);
+}
+
+size_t kblock_swReadBuf(struct KBlock *b, void *buf, size_t offset, size_t size)
+{
+	ASSERT(buf);
+	ASSERT(offset + size <= b->blk_size);
+
+	memcpy(buf, (uint8_t *)b->priv.buf + offset, size);
+	return size;
+}
+
+size_t kblock_swWriteBuf(struct KBlock *b, const void *buf, size_t offset, size_t size)
+{
+	ASSERT(buf);
+	ASSERT(offset + size <= b->blk_size);
+	memcpy((uint8_t *)b->priv.buf + offset, buf, size);
+	return size;
+}