*
*/
-#include <kfile.h>
+#include <kern/kfile.h>
+#include <cfg/debug.h>
+#include <string.h>
+
+#include <appconfig.h>
+
+/**
+ * Move \a fd file seek position of \a offset bytes
+ * from current position.
+ * This is a generic implementation of seek function, you should redefine
+ * it in your local module.
+ */
+kfile_off_t kfile_seek(struct _KFile *fd, kfile_off_t offset, KSeekMode whence)
+{
+ uint32_t seek_pos;
+
+ switch(whence)
+ {
+
+ case KSM_SEEK_SET:
+ seek_pos = 0;
+ break;
+ case KSM_SEEK_END:
+ seek_pos = fd->size - 1;
+ break;
+ case KSM_SEEK_CUR:
+ seek_pos = fd->seek_pos;
+ break;
+ default:
+ ASSERT(0);
+ return -1;
+ break;
+
+ }
+
+ /* Bound check */
+ if (seek_pos + offset > fd->size)
+ {
+ ASSERT(0);
+ return -1;
+ }
+
+ fd->seek_pos = seek_pos + offset;
+ kprintf("Flash seek to [%lu]\n", fd->seek_pos);
+
+ return fd->seek_pos;
+}
#if CONFIG_TEST
/**
* Test for program memory read/write.
+ * This function write and read \p test_buf long \p _size
+ * on \p fd handler. If you want not overwrite exist data
+ * you should pass an \p save_buf where test store exist data,
+ * otherwise su must pass NULL.
*/
-bool kfile_test(uint8_t *buf, size_t _size , uint8_t *save_buf, size_t * save_buf_size)
+bool kfile_test(KFile *fd, uint8_t *test_buf, size_t _size , uint8_t *save_buf, size_t save_buf_size)
{
- KFile fd;
int32_t size = _size;
/*
*/
int32_t len = size/2;
- /*
- * Fill in test buffer
- */
- for (int i = 0; i < size; i++)
- test_buf[i] = (i & 0xff);
- kprintf("Generated test string..\n");
+ /* Fill test buffer */
+ for (size_t i = 0; i < size; i++)
+ test_buf[i] = (i & 0xff);
/*
* Open fd handler
*/
- fd.open(&fd, NULL, 0);
+ fd->open(fd, NULL, 0);
kprintf("Opened fd handler..\n");
/*
*/
if (save_buf != NULL)
{
- fd.read(&fd, save_buf, save_buf_size);
- kprintf("Saved content..form [%lu] to [%lu]\n", fd.seek_pos, fd.seek_pos + save_buf_size);
+ fd->read(fd, save_buf, save_buf_size);
+ kprintf("Saved content..form [%lu] to [%lu]\n", fd->seek_pos, fd->seek_pos + save_buf_size);
}
/* TEST 1 BEGIN. */
- kprintf("Test 1: write from pos 0 to [%lu]\n", fd.size);
+ kprintf("Test 1: write from pos 0 to [%lu]\n", size);
/*
* Seek to addr 0
*/
- if (fd.seek(&fd, 0, KSM_SEEK_SET) != 0)
+ if (fd->seek(fd, 0, KSM_SEEK_SET) != 0)
goto kfile_test_end;
- kprintf("Seek to [%lu], expected[0]\n", fd.seek_pos);
-
/*
* Test flash read/write to address 0..size
*/
- if (!Kfile_rwTest(&fd, test_buf, size))
+ if (!kfile_rwTest(fd, test_buf, size))
goto kfile_test_end;
kprintf("Test 1: ok!\n");
*/
if (save_buf != NULL)
{
- fd.seek(&fd, 0, KSM_SEEK_SET);
+ fd->seek(fd, 0, KSM_SEEK_SET);
- if (fd.write(&fd, save_buf, save_buf_size) != size)
+ if (fd->write(fd, save_buf, save_buf_size) != size)
goto kfile_test_end;
- kprintf("Restore content..form [%lu] to [%lu]\n", fd.seek_pos, fd.seek_pos + save_buf_size);
+ kprintf("Restore content..form [%lu] to [%lu]\n", fd->seek_pos, fd->seek_pos + save_buf_size);
}
/* TEST 1 END. */
/* TEST 2 BEGIN. */
- kprintf("Test 2: write from pos [%lu] to [%lu]\n", fd.size/2 , size);
+ kprintf("Test 2: write from pos [%lu] to [%lu]\n", fd->size/2 , size);
/*
* Go to half test size.
*/
- fd.seek(&fd, (fd.size/ 2), KSM_SEEK_SET);
-
- kprintf("Seek to [%lu], expected[%lu]\n", fd.seek_pos, fd.size/2);
+ fd->seek(fd, (fd->size/ 2), KSM_SEEK_SET);
/*
* If necessary, user could save content,
*/
if (save_buf != NULL)
{
- fd.read(&fd, save_buf, save_buf_size);
- fd.seek(&fd, -size, KSM_SEEK_CUR);
- kprintf("Saved content..form [%lu] to [%lu]\n", fd.seek_pos, fd.seek_pos + save_buf_size);
+ fd->read(fd, save_buf, save_buf_size);
+ fd->seek(fd, -size, KSM_SEEK_CUR);
+ kprintf("Saved content..form [%lu] to [%lu]\n", fd->seek_pos, fd->seek_pos + save_buf_size);
}
/*
* Test flash read/write to address FLASHEND/2 ... FLASHEND/2 + size
*/
- if (!Kfile_rwTest(&fd, test_buf, size))
+ if (!kfile_rwTest(fd, test_buf, size))
goto kfile_test_end;
kprintf("Test 2: ok!\n");
*/
if (save_buf != NULL)
{
- fd.seek(&fd, -size, KSM_SEEK_CUR);
+ fd->seek(fd, -size, KSM_SEEK_CUR);
- if (fd.write(&fd, save_buf, save_buf_size) != size)
+ if (fd->write(fd, save_buf, save_buf_size) != size)
goto kfile_test_end;
- kprintf("Restore content..form [%lu] to [%lu]\n", fd.seek_pos, fd.seek_pos + save_buf_size);
+ kprintf("Restore content..form [%lu] to [%lu]\n", fd->seek_pos, fd->seek_pos + save_buf_size);
}
/* TEST 2 END. */
/* TEST 3 BEGIN. */
- kprintf("Test 3: write outside of fd.size limit [%lu]\n", fd.size);
+ kprintf("Test 3: write outside of fd->size limit [%lu]\n", fd->size);
/*
* Go to the Flash end
*/
- fd.seek(&fd, -len, KSM_SEEK_END);
- kprintf("Seek to [%lu], expected[%lu]\n", fd.seek_pos, fd.size - len);
+ fd->seek(fd, -len, KSM_SEEK_END);
/*
* If necessary, user could save content,
{
ASSERT(len > save_buf_size);
- fd.read(&fd, save_buf, len);
- fd.seek(&fd, -len, KSM_SEEK_CUR);
- kprintf("Saved content..form [%lu] to [%lu]\n", fd.seek_pos, fd.seek_pos + len);
+ fd->read(fd, save_buf, len);
+ fd->seek(fd, -len, KSM_SEEK_CUR);
+ kprintf("Saved content..form [%lu] to [%lu]\n", fd->seek_pos, fd->seek_pos + len);
}
/*
* Test flash read/write to address (FLASHEND - size) ... FLASHEND
*/
- if (!Kfile_rwTest(&fd, test_buf, size))
+ if (kfile_rwTest(fd, test_buf, size))
goto kfile_test_end;
kprintf("Test 3: ok !\n");
*/
if (save_buf != NULL)
{
- fd.seek(&fd, -len, KSM_SEEK_END);
+ fd->seek(fd, -len, KSM_SEEK_END);
- if (fd.write(&fd, save_buf, len) != len)
+ if (fd->write(fd, save_buf, len) != len)
goto kfile_test_end;
- kprintf("Restore content..form [%lu] to [%lu]\n", fd.seek_pos, fd.seek_pos + len);
+ kprintf("Restore content..form [%lu] to [%lu]\n", fd->seek_pos, fd->seek_pos + len);
}
/* TEST 3 END. */
- fd.close(&fd);
+ fd->close(fd);
return true;
kfile_test_end:
- fd.close(&fd);
+ fd->close(fd);
return false;
}
-#endif /* CONFIG_TEST */
\ No newline at end of file
+#endif /* CONFIG_TEST */
projects / bertos.git / blobdiff