#ifndef CFG_KFILE_H
#define CFG_KFILE_H
#ifndef CFG_KFILE_H
#define CFG_KFILE_H
+/**
+ * Logging level definition.
+ *
+ * Use 0 to log only the error messages
+ * Use 1 to log the error and warning messages
+ * Use 2 to log all messages
+ */
+#define KFILE_LOG_LEVEL 2
+
+/**
+ * Set logging verbosity.
+ *
+ * If verbosity is zero print short log messages.
+ */
+#define KFILE_LOG_VERBOSITY 1
+
-#define CONFIG_KFILE_GETS 1
+#define CONFIG_KFILE_GETS 0
/**
* Kfile test function.
*/
/**
* Kfile test function.
*/
-bool kfile_test(KFile *fd, uint8_t *test_buf, uint8_t *save_buf, size_t size);
+int kfile_testSetup(void);
+int kfile_testRun(KFile *fd, uint8_t *test_buf, uint8_t *save_buf, size_t size);
+int kfile_testTearDown(void);
#endif /* KERN_KFILE_H */
#endif /* KERN_KFILE_H */
#include "cfg/cfg_kfile.h"
#include <cfg/debug.h>
#include "cfg/cfg_kfile.h"
#include <cfg/debug.h>
+#include <cfg/module.h>
+
+// Define logging setting (for cfg/log.h module).
+#define LOG_LEVEL KFILE_LOG_LEVEL
+#define LOG_VERBOSITY KFILE_LOG_VERBOSITY
+#include <cfg/log.h>
#include <mware/formatwr.h>
#include <string.h>
#include <mware/formatwr.h>
#include <string.h>
-#warning TODO:Refactor this module..
+
+
+MOD_DEFINE(kfile_test);
+
/**
* KFile read/write subtest.
/**
* KFile read/write subtest.
+/**
+ * Setup all needed for kfile test
+ */
+int kfile_testSetup(void)
+{
+ MOD_INIT(kfile_test);
+ LOG_INFO("Mod init..ok\n");
+
+ return 0;
+}
+
+
/**
* KFile read/write test.
* This function write and read \a test_buf long \a size
* on \a fd handler.
* \a save_buf can be NULL or a buffer where to save previous file content.
*/
/**
* KFile read/write test.
* This function write and read \a test_buf long \a size
* on \a fd handler.
* \a save_buf can be NULL or a buffer where to save previous file content.
*/
-bool kfile_test(KFile *fd, uint8_t *test_buf, uint8_t *save_buf, size_t size)
+int kfile_testRun(KFile *fd, uint8_t *test_buf, uint8_t *save_buf, size_t size)
/*
* Part of test buf size that you would write.
* This var is used in test 3 to check kfile_write
/*
* Part of test buf size that you would write.
* This var is used in test 3 to check kfile_write
if (save_buf)
{
kfile_read(fd, save_buf, size);
if (save_buf)
{
kfile_read(fd, save_buf, size);
- kprintf("Saved content..form [%lu] to [%lu]\n", fd->seek_pos, fd->seek_pos + size);
+ LOG_INFO("Saved content..form [%lu] to [%lu]\n", fd->seek_pos, fd->seek_pos + size);
- kprintf("Test 1: write from pos 0 to [%lu]\n", size);
+ LOG_INFO("Test 1: write from pos 0 to [%lu]\n", size);
if (!kfile_rwTest(fd, test_buf, size))
goto kfile_test_end;
if (!kfile_rwTest(fd, test_buf, size))
goto kfile_test_end;
- kprintf("Test 1: ok!\n");
+ LOG_INFO("Test 1: ok!\n");
/*
* Restore previous read content.
/*
* Restore previous read content.
if (kfile_write(fd, save_buf, size) != size)
goto kfile_test_end;
if (kfile_write(fd, save_buf, size) != size)
goto kfile_test_end;
- kprintf("Restore content..form [%lu] to [%lu]\n", fd->seek_pos, fd->seek_pos + size);
+ LOG_INFO("Restore content..form [%lu] to [%lu]\n", fd->seek_pos, fd->seek_pos + size);
}
/* TEST 1 END. */
/* TEST 2 BEGIN. */
}
/* TEST 1 END. */
/* TEST 2 BEGIN. */
- kprintf("Test 2: write from pos [%lu] to [%lu]\n", fd->size/2 , fd->size/2 + size);
+ LOG_INFO("Test 2: write from pos [%lu] to [%lu]\n", fd->size/2 , fd->size/2 + size);
/*
* Go to half test size.
/*
* Go to half test size.
{
kfile_read(fd, save_buf, size);
kfile_seek(fd, -(kfile_off_t)size, KSM_SEEK_CUR);
{
kfile_read(fd, save_buf, size);
kfile_seek(fd, -(kfile_off_t)size, KSM_SEEK_CUR);
- kprintf("Saved content..form [%lu] to [%lu]\n", fd->seek_pos, fd->seek_pos + size);
+ LOG_INFO("Saved content..form [%lu] to [%lu]\n", fd->seek_pos, fd->seek_pos + size);
if (!kfile_rwTest(fd, test_buf, size))
goto kfile_test_end;
if (!kfile_rwTest(fd, test_buf, size))
goto kfile_test_end;
- kprintf("Test 2: ok!\n");
+ LOG_INFO("Test 2: ok!\n");
/*
* Restore previous content.
/*
* Restore previous content.
if (kfile_write(fd, save_buf, size) != size)
goto kfile_test_end;
if (kfile_write(fd, save_buf, size) != size)
goto kfile_test_end;
- kprintf("Restore content..form [%lu] to [%lu]\n", fd->seek_pos, fd->seek_pos + size);
+ LOG_INFO("Restore content..form [%lu] to [%lu]\n", fd->seek_pos, fd->seek_pos + size);
}
/* TEST 2 END. */
/* TEST 3 BEGIN. */
}
/* TEST 2 END. */
/* TEST 3 BEGIN. */
- kprintf("Test 3: write outside of fd->size limit [%lu]\n", fd->size);
- kprintf("This test should FAIL!, you must see an assertion fail message.\n");
+ LOG_INFO("Test 3: write outside of fd->size limit [%lu]\n", fd->size);
+ LOG_INFO("This test should FAIL!, you must see an assertion fail message.\n");
{
kfile_read(fd, save_buf, len);
kfile_seek(fd, -len, KSM_SEEK_CUR);
{
kfile_read(fd, save_buf, len);
kfile_seek(fd, -len, KSM_SEEK_CUR);
- kprintf("Saved content..form [%lu] to [%lu]\n", fd->seek_pos, fd->seek_pos + len);
+ LOG_INFO("Saved content..form [%lu] to [%lu]\n", fd->seek_pos, fd->seek_pos + len);
{
kfile_seek(fd, -len, KSM_SEEK_END);
{
kfile_seek(fd, -len, KSM_SEEK_END);
- if (kfile_write(fd, save_buf, len) != len)
+ if ((kfile_off_t)kfile_write(fd, save_buf, len) != len)
- kprintf("Restore content..form [%lu] to [%lu]\n", fd->seek_pos, fd->seek_pos + len);
+ LOG_INFO("Restore content..form [%lu] to [%lu]\n", fd->seek_pos, fd->seek_pos + len);
}
/* TEST 3 END. */
kfile_close(fd);
}
/* TEST 3 END. */
kfile_close(fd);
kfile_test_end:
kfile_close(fd);
kfile_test_end:
kfile_close(fd);
+ LOG_ERR("One kfile_test fail!\n");
+ return EOF;
+/**
+ * End a dataflash Test.
+ * (Unused)
+ */
+int kfile_testTearDown(void)
+{
+ /* */
+ return 0;
+}