proc_yield(): Rename from proc_switch()

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

diff --git a/bertos/drv/dataflash.c b/bertos/drv/dataflash.c
index 5347d451aa97c3812ba4012d397aaf2d0237c678..ac1eeaf551b72bc4de4167dd5920d7cc06a27194 100644 (file)
--- a/bertos/drv/dataflash.c
+++ b/bertos/drv/dataflash.c
@@ -30,7 +30,7 @@
  *
  * -->
  *
- *  \brief Function library for dataflash AT45DB family (implementation).
+ * \brief Function library for dataflash AT45DB family (implementation).
  *
  *
  * \version $Id: dataflash.c 21658 2008-06-05 16:42:54Z asterix $
@@ -46,8 +46,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>
 
 #include <drv/timer.h>
@@ -55,7 +55,9 @@
 #include <kern/kfile.h>
 
 #if CONFIG_KERNEL
-#include <kern/proc.h>
+       #include <kern/proc.h>
+#else
+       #define proc_yield() do {} while(0)
 #endif
 
 #include <string.h>
@@ -213,11 +215,7 @@ static uint8_t dataflash_cmd(DataFlash *fd, dataflash_page_t page_addr, dataflas
         * is high.
         */
        while (!(dataflash_stat(fd) & BUSY_BIT))
-       {
-               #if CONFIG_KERNEL
-               proc_switch();
-               #endif
-       }
+               proc_yield();
 
        stat = dataflash_stat(fd);
 
@@ -287,7 +285,7 @@ static void dataflash_loadPage(DataFlash *fd, dataflash_page_t page_addr)
  */
 static int dataflash_flush(KFile *_fd)
 {
-       DataFlash *fd = DATAFLASH(_fd);
+       DataFlash *fd = DATAFLASH_CAST(_fd);
        if (fd->page_dirty)
        {
                dataflash_cmd(fd, fd->current_page, 0x00, DFO_WRITE_BUFF1_TO_MEM_E);
@@ -316,7 +314,7 @@ static int dataflash_close(struct KFile *_fd)
  */
 static KFile *dataflash_reopen(KFile *_fd)
 {
-       DataFlash *fd = DATAFLASH(_fd);
+       DataFlash *fd = DATAFLASH_CAST(_fd);
        dataflash_close(_fd);
 
        fd->current_page = 0;
@@ -344,7 +342,7 @@ static KFile *dataflash_reopen(KFile *_fd)
  */
 static size_t dataflash_read(struct KFile *_fd, void *buf, size_t size)
 {
-       DataFlash *fd = DATAFLASH(_fd);
+       DataFlash *fd = DATAFLASH_CAST(_fd);
 
        dataflash_offset_t byte_addr;
        dataflash_page_t page_addr;
@@ -394,7 +392,7 @@ static size_t dataflash_read(struct KFile *_fd, void *buf, size_t size)
  */
 static size_t dataflash_write(struct KFile *_fd, const void *_buf, size_t size)
 {
-       DataFlash *fd = DATAFLASH(_fd);
+       DataFlash *fd = DATAFLASH_CAST(_fd);
 
        dataflash_offset_t offset;
        dataflash_page_t new_page;