X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fkfile_test.c;h=36fde490048f2157d5e5f83572a03c374a9e8eec;hb=dace4f8d53875eb8cdf1af8c063750185a7b1db5;hp=52afa98a60ab0fd948c358bfec34bc32f2c0b8b9;hpb=e423e63cade618baf616a79b99aaab5de74ec76e;p=bertos.git

diff --git a/bertos/kern/kfile_test.c b/bertos/kern/kfile_test.c
index 52afa98a..36fde490 100644
--- a/bertos/kern/kfile_test.c
+++ b/bertos/kern/kfile_test.c
@@ -41,6 +41,7 @@
 
 
 #include "kfile.h"
+#include <struct/kfile_mem.h>
 
 #include "cfg/cfg_kfile.h"
 #include <cfg/debug.h>
@@ -63,73 +64,11 @@ MOD_DEFINE(kfile_test);
 #define BUF_TEST_LEN     3209
 
 // Buffer for test
-typedef uint8_t fake_t;
-fake_t test_buf[BUF_TEST_LEN];
-fake_t test_buf_save[BUF_TEST_LEN];
-fake_t test_disk[BUF_TEST_LEN];
+uint8_t test_buf[BUF_TEST_LEN];
+uint8_t test_buf_save[BUF_TEST_LEN];
 
-KFile fd;
-
-/*
- * Beckend to use kfile structure on pc.
- */
-static int fake_close(KFile *fd)
-{
-	(void)fd;
-	return 0;
-}
-
-static size_t fake_read(KFile *fd, void *buf, size_t size)
-{
-	fake_t *dest = (fake_t *)buf;
-	size_t rd_len;
-
-	rd_len = MIN((kfile_off_t)size, fd->size - fd->seek_pos);
-
-	memcpy(dest, test_disk, size);
-	fd->seek_pos += rd_len;
-
-	LOG_INFO("Read: real[%ld] expected[%ld]\n", rd_len, size);
-
-	return rd_len;
-}
-
-static size_t fake_write(KFile *fd, const void *buf, size_t size)
-{
-	const fake_t *src = (const fake_t *)buf;
-	size_t wr_len;
-
-	wr_len = MIN((kfile_off_t)size, fd->size - fd->seek_pos);
-
-	memcpy(test_disk, src, wr_len);
-	fd->seek_pos += wr_len;
-
-	LOG_INFO("Write: real[%ld] expected[%ld]\n", wr_len, size);
-
-	return wr_len;
-}
-
-static int fake_flush(KFile *fd)
-{
-	(void)fd;
-
-	return 0;
-}
-
-static void fake_kfileInit(void)
-{
-	// Setup data flash programming functions.
-	fd.reopen = kfile_genericReopen;
-	fd.close = fake_close;
-	fd.read = fake_read;
-	fd.write = fake_write;
-	fd.seek = kfile_genericSeek;
-	fd.flush = fake_flush;
-
-	fd.seek_pos = 0;
-	fd.size = BUF_TEST_LEN;
-
-}
+uint8_t test_disk[BUF_TEST_LEN];
+KFileMem mem;
 
 /*
  * Help function to init disk and the buffers.
@@ -220,7 +159,7 @@ int kfile_testRunGeneric(KFile *fd, uint8_t *test_buf, uint8_t *save_buf, size_t
 	 */
 	if (save_buf)
 	{
-		LOG_INFO("Saved content..form [%d] to [%ld]\n", fd->seek_pos, fd->seek_pos + size);
+		LOG_INFO("Saved content..form [%ld] to [%ld]\n", fd->seek_pos, fd->seek_pos + size);
 		kfile_read(fd, save_buf, size);
 	}
 
@@ -251,12 +190,12 @@ int kfile_testRunGeneric(KFile *fd, uint8_t *test_buf, uint8_t *save_buf, size_t
 		if (kfile_write(fd, save_buf, size) != size)
 			goto kfile_test_end;
 
-		LOG_INFO("Restore content..form [%d] to [%ld]\n", fd->seek_pos, fd->seek_pos + size);
+		LOG_INFO("Restore content..form [%ld] to [%ld]\n", fd->seek_pos, fd->seek_pos + size);
 	}
 	/* TEST 1 END. */
 
 	/* TEST 2 BEGIN. */
-	LOG_INFO("Test 2: write from pos [%d] to [%ld]\n", fd->size/2 , fd->size/2 + size);
+	LOG_INFO("Test 2: write from pos [%ld] to [%ld]\n", fd->size/2 , fd->size/2 + size);
 
 	/*
 	 * Go to half test size.
@@ -271,7 +210,7 @@ int kfile_testRunGeneric(KFile *fd, uint8_t *test_buf, uint8_t *save_buf, size_t
 	{
 		kfile_read(fd, save_buf, size);
 		kfile_seek(fd, -(kfile_off_t)size, KSM_SEEK_CUR);
-		LOG_INFO("Saved content..form [%d] to [%ld]\n", fd->seek_pos, fd->seek_pos + size);
+		LOG_INFO("Saved content..form [%ld] to [%ld]\n", fd->seek_pos, fd->seek_pos + size);
 	}
 
 	/*
@@ -292,14 +231,13 @@ int kfile_testRunGeneric(KFile *fd, uint8_t *test_buf, uint8_t *save_buf, size_t
 		if (kfile_write(fd, save_buf, size) != size)
 			goto kfile_test_end;
 
-		LOG_INFO("Restore content..form [%d] to [%ld]\n", fd->seek_pos, fd->seek_pos + size);
+		LOG_INFO("Restore content..form [%ld] to [%ld]\n", fd->seek_pos, fd->seek_pos + size);
 	}
 
 	/* TEST 2 END. */
 
 	/* TEST 3 BEGIN. */
-	LOG_INFO("Test 3: write outside of fd->size limit [%d]\n", fd->size);
-	LOG_INFO("This test should FAIL!, you must see an assertion fail message.\n");
+	LOG_INFO("Test 3: write outside of fd->size limit [%ld]\n", fd->size);
 
 	/*
 	 * Go to the Flash end
@@ -314,7 +252,7 @@ int kfile_testRunGeneric(KFile *fd, uint8_t *test_buf, uint8_t *save_buf, size_t
 	{
 		kfile_read(fd, save_buf, len);
 		kfile_seek(fd, -len, KSM_SEEK_CUR);
-		LOG_INFO("Saved content..form [%d] to [%d]\n", fd->seek_pos, fd->seek_pos + len);
+		LOG_INFO("Saved content..form [%ld] to [%ld]\n", fd->seek_pos, fd->seek_pos + len);
 	}
 
 	/*
@@ -335,7 +273,7 @@ int kfile_testRunGeneric(KFile *fd, uint8_t *test_buf, uint8_t *save_buf, size_t
 		if ((kfile_off_t)kfile_write(fd, save_buf, len) != len)
 			goto kfile_test_end;
 
-		LOG_INFO("Restore content..form [%d] to [%d]\n", fd->seek_pos, fd->seek_pos + len);
+		LOG_INFO("Restore content..form [%ld] to [%ld]\n", fd->seek_pos, fd->seek_pos + len);
 	}
 
 	/* TEST 3 END. */
@@ -361,7 +299,7 @@ int kfile_testSetup(void)
         LOG_INFO("Mod init..ok\n");
 
 		// Init our backend and the buffers
-		fake_kfileInit();
+		kfilemem_init(&mem, test_disk, BUF_TEST_LEN);
 		init_testBuf();
 
         return 0;
@@ -369,7 +307,7 @@ int kfile_testSetup(void)
 
 int kfile_testRun(void)
 {
-	return kfile_testRunGeneric(&fd, test_buf, test_buf_save, BUF_TEST_LEN);
+	return kfile_testRunGeneric(&mem.fd, test_buf, test_buf_save, BUF_TEST_LEN);
 }
 
 /**