Move kfile interface to the io/ directory.

[bertos.git] / bertos / drv / dataflash_hwtest.c

diff --git a/bertos/drv/dataflash_hwtest.c b/bertos/drv/dataflash_hwtest.c
index 8c46215008b3230b42432b5fc03a49792d698501..7dcd9eb2bf5a90c0dfec5e16952c0beb76eafd6d 100644 (file)
--- a/bertos/drv/dataflash_hwtest.c
+++ b/bertos/drv/dataflash_hwtest.c
@@ -66,7 +66,7 @@
 #include <drv/dataflash.h>
 
 #include <kern/proc.h>
-#include <kern/kfile.h>
+#include <io/kfile.h>
 
 #include <string.h>
 
@@ -108,9 +108,9 @@ static uint8_t save_buf[DATAFLASH_TEST_STR_LEN];
  * Setup all needed to test dataflash memory
  *
  */
-int dataflash_testSetUp(void)
+int dataflash_testSetup(void)
 {
-        kfile_testSetUp();
+        kfile_testSetup();
         LOG_INFO("KFILE setup..ok\n");
 
         LOG_INFO("Check if kernel is enable (if enable you should see the assert message.)\n");
@@ -130,10 +130,10 @@ int dataflash_testSetUp(void)
          * Init SPI module and dataflash driver.
          */
         // Open SPI comunication channel
-        spimaster_init(&spi_fd, CONFIG_SPI_PORT);
+        spimaster_init(&spi_fd, 0);
         LOG_INFO("SPI0 init..ok\n");
 
-        ser_setbaudrate(&spi_fd, CONFIG_SPI_BAUDRATE);
+        ser_setbaudrate(&spi_fd, 5000000UL);
         LOG_INFO("SPI0 set baudrate..ok\n");
 
         //Init dataflash memory
@@ -173,7 +173,7 @@ int dataflash_testRun(void)
         LOG_INFO("Run KFILE test.\n");
 
         SILENT_ASSERT("bertos/drv/dataflash.c:405: Assertion failed: fd->fd.seek_pos + size <= fd->fd.size");
-        if (kfile_testRun(&dflash_fd.fd, test_buf, save_buf, sizeof(test_buf)) != EOF)
+        if (kfile_testRunGeneric(&dflash_fd.fd, test_buf, save_buf, sizeof(test_buf)) != EOF)
         {
                 LOG_INFO("KFILE test..ok\n");
         }
@@ -212,7 +212,7 @@ int main(void)
        proc_init();
     #endif
 
-       if (!dataflash_testSetUp())
+       if (!dataflash_testSetup())
        {
                        LOG_INFO("DATAFLASH setup..ok\n");
        }