X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Fdataflash_test.c;h=fa8085586d8c038d3624288426ee301435875b2f;hb=57361899689e96564278652c8676b40485a37c41;hp=ae7673beb40cfe0d55b43c153bc71b67ca187b5a;hpb=d22ff0c965c5b8614485fa780044b2d68fd59c90;p=bertos.git

diff --git a/bertos/drv/dataflash_test.c b/bertos/drv/dataflash_test.c
index ae7673be..fa808558 100644
--- a/bertos/drv/dataflash_test.c
+++ b/bertos/drv/dataflash_test.c
@@ -45,7 +45,6 @@
  *
  *
  * \version $Id$
- *
  * \author Daniele Basile <asterix@develer.com>
  */
 
@@ -58,8 +57,8 @@
 #include <cfg/module.h>
 
 // Define logging setting (for cfg/log.h module).
-#define LOG_LEVEL         DATAFLASH_LOG_LEVEL
-#define LOG_VERBOSITY     DATAFLASH_LOG_VERBOSITY
+#define LOG_LEVEL      DATAFLASH_LOG_LEVEL
+#define LOG_FORMAT     DATAFLASH_LOG_FORMAT
 #include <cfg/log.h>   // for logging system
 
 #include <drv/timer.h>
@@ -95,8 +94,8 @@
 /*
  * Kfile structure to test a dataflash.
  */
-static KFileSerial spi_fd;
-static KFileDataflash dflash_fd;
+static Serial spi_fd;
+static DataFlash dflash_fd;
 
 /*
  * Define tmp buffer to stora data for
@@ -109,14 +108,14 @@ 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");
-        SILENT_ASSERT("bertos/drv/dataflash_test.c:119: Assertion failed: !CONFIG_KERNEL");
-        ASSERT(!CONFIG_KERNEL);
+        SILENT_ASSERT("bertos/drv/dataflash_test.c:119: Assertion failed: !CONFIG_KERN");
+        ASSERT(!CONFIG_KERN);
 
         /*
          * This test use a kfile_test module,
@@ -209,11 +208,11 @@ int main(void)
         IRQ_ENABLE;
 	kdbg_init();
 
-	#if CONFIG_KERNEL
+	#if CONFIG_KERN
                 proc_init();
         #endif
 
-        if (!dataflash_testSetup())
+        if (!dataflash_testSetUp())
         {
                 LOG_INFO("DATAFLASH setup..ok\n");
         }
@@ -223,7 +222,7 @@ int main(void)
                 return EOF;
         }
 
-	dataflash_testRun();
+		dataflash_testRun();
 
         for(;;)
         {