X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fio%2Fkblock_ram.c;h=a6dc008c5b0ef65f53f71cb6007b45188f8cc8d7;hb=6539fb2d550505f48e8732e887adfe5a3469266c;hp=30aa2afca66ed6863d2980f7c6aa929f1978707b;hpb=7779ebb8f672f1ca26088293a1f61d17ed2e546a;p=bertos.git

diff --git a/bertos/io/kblock_ram.c b/bertos/io/kblock_ram.c
index 30aa2afc..a6dc008c 100644
--- a/bertos/io/kblock_ram.c
+++ b/bertos/io/kblock_ram.c
@@ -43,40 +43,36 @@
 static int kblockram_load(KBlock *b, block_idx_t index)
 {
 	KBlockRam *r = KBLOCKRAM_CAST(b);
-	memcpy(r->b.priv.pagebuf, r->membuf + index * r->b.blk_size, r->b.blk_size);
+	memcpy(r->pagebuf, r->membuf + index * r->b.blk_size, r->b.blk_size);
 	return 0;
 }
 
 static int kblockram_store(struct KBlock *b, block_idx_t index)
 {
 	KBlockRam *r = KBLOCKRAM_CAST(b);
-	memcpy(r->membuf + index * r->b.blk_size, r->b.priv.pagebuf, r->b.blk_size);
+	memcpy(r->membuf + index * r->b.blk_size, r->pagebuf, r->b.blk_size);
 	return 0;
 }
 
 static size_t kblockram_readBuf(struct KBlock *b, void *buf, size_t offset, size_t size)
 {
 	KBlockRam *r = KBLOCKRAM_CAST(b);
-	memcpy(buf, (uint8_t *)r->b.priv.pagebuf + offset, size);
+	memcpy(buf, r->pagebuf + offset, size);
 	return size;
 }
 
-static size_t kblockram_writeBuf(struct KBlock *b, const void *buf, size_t offset, size_t size)
+static size_t kblockram_readDirect(struct KBlock *b, block_idx_t index, void *buf, size_t offset, size_t size)
 {
 	KBlockRam *r = KBLOCKRAM_CAST(b);
-	memcpy((uint8_t *)r->b.priv.pagebuf + offset, buf, size);
+	memcpy(buf, r->membuf + index * r->b.blk_size + offset, size);
 	return size;
 }
 
-static void * kblockram_map(struct KBlock *b, size_t offset, UNUSED_ARG(size_t, size))
-{
-	return (uint8_t *)b->priv.pagebuf + offset;
-}
-
-
-static int kblockram_unmap(UNUSED_ARG(struct KBlock *, b), UNUSED_ARG(size_t, offset), UNUSED_ARG(size_t, size))
+static size_t kblockram_writeBuf(struct KBlock *b, const void *buf, size_t offset, size_t size)
 {
-	return 0;
+	KBlockRam *r = KBLOCKRAM_CAST(b);
+	memcpy(r->pagebuf + offset, buf, size);
+	return size;
 }
 
 static int kblockram_error(struct KBlock *b)
@@ -91,12 +87,12 @@ static int kblockram_dummy(UNUSED_ARG(struct KBlock *,b))
 
 static KBlockVTable kblockram_vt =
 {
+	.readDirect = kblockram_readDirect,
 	.readBuf = kblockram_readBuf,
 	.writeBuf = kblockram_writeBuf,
 	.load = kblockram_load,
 	.store = kblockram_store,
-	.map = kblockram_map,
-	.unmap = kblockram_unmap,
+
 	.error = kblockram_error,
 	.clearerr = kblockram_dummy,
 	.close = kblockram_dummy,
@@ -109,15 +105,14 @@ void kblockram_init(KBlockRam *ram, void *buf, size_t size, size_t block_size)
 	ASSERT(block_size);
 
 	memset(ram, 0, sizeof(*ram));
-	
+
 	DB(ram->b.priv.type = KBT_KBLOCKRAM);
-	
+
 	// First page used as page buffer
 	ram->b.blk_cnt = (size / block_size) - 1;
-	ram->b.priv.pagebuf = buf;
-	ram->b.priv.pagebuf_size = block_size;
-	
+	ram->pagebuf = (uint8_t *)buf;
 	ram->membuf = (uint8_t *)buf + block_size;
-	ram->b.blk_size = block_size;	
-	ram->b.vt = &kblockram_vt;
+	ram->b.blk_size = block_size;
+	ram->b.priv.vt = &kblockram_vt;
+	kblockram_load(&ram->b, 0);
 }