Refactor KFileDataFlash in DataFlashKFile. Tested and working.

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

diff --git a/bertos/drv/dataflash_test.c b/bertos/drv/dataflash_test.c
index 8bb8757e5fa41cc95e571f418dd0594bdad90ede..8e40168b1e4fd091bfd9097b1c1aaa5e6ce35ab2 100644 (file)
--- a/bertos/drv/dataflash_test.c
+++ b/bertos/drv/dataflash_test.c
@@ -89,14 +89,14 @@
 #define DATAFLASH_TEST_STR_LEN                  12307
 
 // If you want use a rand function of standard library set to 1.
-#define DATAFLASH_USE_RAND_FUNC                     1
+#define DATAFLASH_USE_RAND_FUNC                     0
 /* \} */
 
 /*
  * Kfile structure to test a dataflash.
  */
-static KFileSerial spi_fd;
-static KFileDataflash dflash_fd;
+static SerialKFile spi_fd;
+static DataFlashKFile dflash_fd;
 
 /*
  * Define tmp buffer to stora data for
@@ -109,9 +109,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");
@@ -131,10 +131,10 @@ int dataflash_testSetup(void)
          * Init SPI module and dataflash driver.
          */
         // Open SPI comunication channel
-        spimaster_init(&spi_fd, SER_SPI0);
+        spimaster_init(&spi_fd, CONFIG_SPI_PORT);
         LOG_INFO("SPI0 init..ok\n");
 
-        ser_setbaudrate(&spi_fd, 5000000UL);
+        ser_setbaudrate(&spi_fd, CONFIG_SPI_BAUDRATE);
         LOG_INFO("SPI0 set baudrate..ok\n");
 
         //Init dataflash memory
@@ -213,7 +213,7 @@ int main(void)
                 proc_init();
         #endif
 
-        if (!dataflash_testSetup())
+        if (!dataflash_testSetUp())
         {
                 LOG_INFO("DATAFLASH setup..ok\n");
         }
@@ -223,7 +223,7 @@ int main(void)
                 return EOF;
         }
 
-       dataflash_testRun();
+               dataflash_testRun();
 
         for(;;)
         {