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

diff --git a/bertos/drv/dataflash_test.c b/bertos/drv/dataflash_test.c
index d8b05610..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
@@ -115,8 +114,8 @@ int dataflash_testSetUp(void)
         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,7 +208,7 @@ int main(void)
         IRQ_ENABLE;
 	kdbg_init();
 
-	#if CONFIG_KERNEL
+	#if CONFIG_KERN
                 proc_init();
         #endif