* invalidate any other reasons why the executable file might be covered by
* the GNU General Public License.
*
- * Copyright 2009 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2010 Develer S.r.l. (http://www.develer.com/)
*
* -->
*
#include "kblock.h"
-#define LOG_LEVEL LOG_LVL_ERR
-#define LOG_FORMAT LOG_FMT_VERBOSE
+#define LOG_LEVEL LOG_LVL_ERR
+#define LOG_FORMAT LOG_FMT_VERBOSE
#include <cfg/log.h>
#include <string.h>
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)
KB_ASSERT_METHOD(b, load);
ASSERT(index < b->blk_cnt);
- LOG_INFO("index %d\n", index);
+ LOG_INFO("index %ld\n", index);
return b->priv.vt->load(b, b->priv.blk_start + index);
}
KB_ASSERT_METHOD(b, store);
ASSERT(index < b->blk_cnt);
- LOG_INFO("index %d\n", index);
+ LOG_INFO("index %ld\n", index);
return b->priv.vt->store(b, b->priv.blk_start + index);
}
}
-
size_t kblock_read(struct KBlock *b, block_idx_t idx, void *buf, size_t offset, size_t size)
{
ASSERT(b);
ASSERT(buf);
ASSERT(offset + size <= b->blk_size);
- LOG_INFO("blk_idx %d, offset %d, size %d\n", idx, offset, size);
+ LOG_INFO("blk_idx %ld, offset %u, size %u\n", idx, offset, size);
if (kblock_buffered(b) && idx == b->priv.curr_blk)
return kblock_readBuf(b, buf, offset, size);
if (kblock_cacheDirty(b))
{
- LOG_INFO("flushing block %d\n", b->priv.curr_blk);
+ LOG_INFO("flushing block %ld\n", b->priv.curr_blk);
if (kblock_store(b, b->priv.curr_blk) == 0)
kblock_setDirty(b, false);
else
if (idx != b->priv.curr_blk)
{
- LOG_INFO("loading block %d\n", idx);
+ LOG_INFO("loading block %ld\n", idx);
if (kblock_flush(b) != 0 || kblock_load(b, idx) != 0)
return false;
}
+int kblock_trim(struct KBlock *b, block_idx_t start, block_idx_t count)
+{
+ ASSERT(start + count <= b->blk_cnt);
+
+ if (kblock_buffered(b))
+ {
+ if (!kblock_loadPage(b, start))
+ return EOF;
+ }
+
+ b->priv.blk_start += start;
+ b->priv.curr_blk = 0; // adjust logical address
+ b->blk_cnt = count;
+ return 0;
+}
+
+
size_t kblock_write(struct KBlock *b, block_idx_t idx, const void *buf, size_t offset, size_t size)
{
ASSERT(b);
ASSERT(idx < b->blk_cnt);
ASSERT(offset + size <= b->blk_size);
- LOG_INFO("blk_idx %d, offset %d, size %d\n", idx, offset, size);
+ LOG_INFO("blk_idx %ld, offset %u, size %u\n", idx, offset, size);
if (kblock_buffered(b))
{
}
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);
}
}
ASSERT(b);
ASSERT(src < b->blk_cnt);
ASSERT(dest < b->blk_cnt);
- ASSERT(kblock_buffered(b));
- if (!kblock_loadPage(b, src))
- return EOF;
+ if (kblock_buffered(b))
+ {
+ if (!kblock_loadPage(b, src))
+ return EOF;
- b->priv.curr_blk = dest;
- 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)
{
- return (kblock_readDirect(b, index, b->priv.buf, 0, b->blk_size) == b->blk_size) ? 0 : EOF;
+ /*
+ * Since this is a low level API, the index here is a fisical index.
+ * If we call another low level API, logical to fisical translation
+ * would be applied twice.
+ * In order to avoid this we subtract the start block index.
+ */
+ ASSERT(index >= b->priv.blk_start);
+ return (kblock_readDirect(b, index - b->priv.blk_start, 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);
+ /*
+ * Since this is a low level API, the index here is a fisical index.
+ * If we call another low level API, logical to fisical translation
+ * would be applied twice.
+ * In order to avoid this we subtract the start block index.
+ */
+ ASSERT(index >= b->priv.blk_start);
+ return (kblock_writeDirect(b, index - b->priv.blk_start, 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)
memcpy((uint8_t *)b->priv.buf + offset, buf, size);
return size;
}
+
+int kblock_swClose(UNUSED_ARG(struct KBlock, *b))
+{
+ return 0;
+}