X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fio%2Fkblock.c;h=69b5b159eba3ce711e0ccfd89a1067c059c39207;hb=30a088bc2641f3e11c414dd32c672242099a9f5b;hp=def111cb598bcfcbdfe1c6a2e1f7bc060e31c393;hpb=06598a5e283451d544f77b10f8eea4f912d5253a;p=bertos.git

diff --git a/bertos/io/kblock.c b/bertos/io/kblock.c
index def111cb..69b5b159 100644
--- a/bertos/io/kblock.c
+++ b/bertos/io/kblock.c
@@ -51,11 +51,11 @@ INLINE size_t kblock_readDirect(struct KBlock *b, block_idx_t index, void *buf,
 	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)
+INLINE size_t kblock_writeDirect(struct KBlock *b, block_idx_t index, const void *buf, size_t offset, size_t size)
 {
-	KB_ASSERT_METHOD(b, writeBlock);
+	KB_ASSERT_METHOD(b, writeDirect);
 	ASSERT(index < b->blk_cnt);
-	return b->priv.vt->writeBlock(b, b->priv.blk_start + index, buf);
+	return b->priv.vt->writeDirect(b, b->priv.blk_start + index, buf, offset, size);
 }
 
 INLINE size_t kblock_readBuf(struct KBlock *b, void *buf, size_t offset, size_t size)
@@ -119,6 +119,9 @@ int kblock_flush(struct KBlock *b)
 {
 	ASSERT(b);
 
+	if (!kblock_buffered(b))
+		return 0;
+
 	if (kblock_cacheDirty(b))
 	{
 		LOG_INFO("flushing block %d\n", b->priv.curr_blk);
@@ -155,7 +158,7 @@ size_t kblock_write(struct KBlock *b, block_idx_t idx, const void *buf, size_t o
 	ASSERT(offset + size <= b->blk_size);
 
 	LOG_INFO("blk_idx %d, offset %d, size %d\n", idx, offset, size);
-	
+
 	if (kblock_buffered(b))
 	{
 		if (!kblock_loadPage(b, idx))
@@ -166,25 +169,53 @@ size_t kblock_write(struct KBlock *b, block_idx_t idx, const void *buf, size_t o
 	}
 	else
 	{
-		ASSERT(offset == 0);
-		ASSERT(size == b->blk_size);
-		return (kblock_writeBlock(b, idx, buf) == 0) ? size : 0;
+		#ifdef _DEBUG
+		if (offset != 0 || size != b->blk_size)
+			ASSERT(kblock_partialWrite(b));
+		#endif
+		return kblock_writeDirect(b, idx, buf, offset, size);
 	}
 }
 
-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(idx1 < b->blk_cnt);
-	ASSERT(idx2 < b->blk_cnt);
-	ASSERT(kblock_buffered(b));
+	ASSERT(src < b->blk_cnt);
+	ASSERT(dest < b->blk_cnt);
 
-	if (!kblock_loadPage(b, idx1))
-		return EOF;
+	if (kblock_buffered(b))
+	{
+		if (!kblock_loadPage(b, src))
+			return EOF;
 
-	b->priv.curr_blk = idx2;
-	kblock_setDirty(b, true);
-	return 0;
+		b->priv.curr_blk = dest;
+		kblock_setDirty(b, true);
+		return 0;
+	}
+	else if (kblock_partialWrite(b))
+	{
+		uint8_t buf[16];
+		size_t blk_size = b->blk_size;
+		size_t offset = 0;
+
+		while (blk_size)
+		{
+			size_t size = MIN(sizeof(buf), blk_size);
+			if (kblock_readDirect(b, src, buf, offset, size) != size)
+				return EOF;
+			if (kblock_writeDirect(b, dest, buf, offset, size) != size)
+				return EOF;
+
+			blk_size -= size;
+			offset += size;
+		}
+		return 0;
+	}
+	else
+	{
+		ASSERT(0);
+		return EOF;
+	}
 }
 
 int kblock_swLoad(struct KBlock *b, block_idx_t index)
@@ -194,14 +225,14 @@ int kblock_swLoad(struct KBlock *b, block_idx_t index)
 
 int kblock_swStore(struct KBlock *b, block_idx_t index)
 {
-	return kblock_writeBlock(b, index, b->priv.buf);
+	return (kblock_writeDirect(b, index, b->priv.buf, 0, b->blk_size) == b->blk_size) ? 0 : EOF;
 }
 
 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;
 }