timer_delayTicks(): Re-enable check for interrupts to be enabled wheen sleeping.

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

diff --git a/bertos/drv/dataflash.c b/bertos/drv/dataflash.c
index 158a9b3fd90e68959514d2ce86240b0de297f6da..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>
@@ -106,7 +108,7 @@ STATIC_ASSERT(countof(mem_info) == DFT_CNT);
  * Macro that toggle CS of dataflash.
  * \note This is equivalent to fd->setCS(false) immediately followed by fd->setCS(true).
  */
-INLINE void CS_TOGGLE(DataFlashKFile *fd)
+INLINE void CS_TOGGLE(DataFlash *fd)
 {
        fd->setCS(false);
        fd->setCS(true);
@@ -117,7 +119,7 @@ INLINE void CS_TOGGLE(DataFlashKFile *fd)
  * This function send only 4 byte: opcode, page address and
  * byte address.
  */
-static void send_cmd(DataFlashKFile *fd, dataflash_page_t page_addr, dataflash_offset_t byte_addr, DataFlashOpcode opcode)
+static void send_cmd(DataFlash *fd, dataflash_page_t page_addr, dataflash_offset_t byte_addr, DataFlashOpcode opcode)
 {
 
        /*
@@ -166,7 +168,7 @@ static void send_cmd(DataFlashKFile *fd, dataflash_page_t page_addr, dataflash_o
  * with one pulse reset long about 10usec.
  *
  */
-static void dataflash_reset(DataFlashKFile *fd)
+static void dataflash_reset(DataFlash *fd)
 {
        fd->setCS(false);
 
@@ -183,7 +185,7 @@ static void dataflash_reset(DataFlashKFile *fd)
 /**
  * Read status register of dataflah memory.
  */
-static uint8_t dataflash_stat(DataFlashKFile *fd)
+static uint8_t dataflash_stat(DataFlash *fd)
 {
        /*
         * Make sure to toggle CS signal
@@ -200,7 +202,7 @@ static uint8_t dataflash_stat(DataFlashKFile *fd)
  * return status register value.
  *
  */
-static uint8_t dataflash_cmd(DataFlashKFile *fd, dataflash_page_t page_addr, dataflash_offset_t byte_addr, DataFlashOpcode opcode)
+static uint8_t dataflash_cmd(DataFlash *fd, dataflash_page_t page_addr, dataflash_offset_t byte_addr, DataFlashOpcode opcode)
 {
        uint8_t stat;
 
@@ -213,11 +215,7 @@ static uint8_t dataflash_cmd(DataFlashKFile *fd, dataflash_page_t page_addr, dat
         * is high.
         */
        while (!(dataflash_stat(fd) & BUSY_BIT))
-       {
-               #if CONFIG_KERNEL
-               proc_switch();
-               #endif
-       }
+               proc_yield();
 
        stat = dataflash_stat(fd);
 
@@ -234,7 +232,7 @@ static uint8_t dataflash_cmd(DataFlashKFile *fd, dataflash_page_t page_addr, dat
  * Read \a len bytes from main data flash memory or buffer data
  * flash memory, and put it in \a *block.
  */
-static void dataflash_readBlock(DataFlashKFile *fd, dataflash_page_t page_addr, dataflash_offset_t byte_addr, DataFlashOpcode opcode, uint8_t *block, dataflash_size_t len)
+static void dataflash_readBlock(DataFlash *fd, dataflash_page_t page_addr, dataflash_offset_t byte_addr, DataFlashOpcode opcode, uint8_t *block, dataflash_size_t len)
 {
        send_cmd(fd, page_addr, byte_addr, opcode);
 
@@ -261,7 +259,7 @@ static void dataflash_readBlock(DataFlashKFile *fd, dataflash_page_t page_addr,
  * To perform a write in main memory you must first write in dataflash buffer
  * memory and then send a command to write the page in main memory.
  */
-static void dataflash_writeBlock(DataFlashKFile *fd, dataflash_offset_t offset, DataFlashOpcode opcode, const uint8_t *block, dataflash_size_t len)
+static void dataflash_writeBlock(DataFlash *fd, dataflash_offset_t offset, DataFlashOpcode opcode, const uint8_t *block, dataflash_size_t len)
 {
        ASSERT(offset + len <= mem_info[fd->dev].page_size);
 
@@ -277,7 +275,7 @@ static void dataflash_writeBlock(DataFlashKFile *fd, dataflash_offset_t offset,
 /**
  * Load selct page from dataflash memory to buffer.
  */
-static void dataflash_loadPage(DataFlashKFile *fd, dataflash_page_t page_addr)
+static void dataflash_loadPage(DataFlash *fd, dataflash_page_t page_addr)
 {
        dataflash_cmd(fd, page_addr, 0x00, DFO_MOV_MEM_TO_BUFF1);
 }
@@ -287,7 +285,7 @@ static void dataflash_loadPage(DataFlashKFile *fd, dataflash_page_t page_addr)
  */
 static int dataflash_flush(KFile *_fd)
 {
-       DataFlashKFile *fd = DATAFLASHKFILE(_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)
 {
-       DataFlashKFile *fd = DATAFLASHKFILE(_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)
 {
-       DataFlashKFile *fd = DATAFLASHKFILE(_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)
 {
-       DataFlashKFile *fd = DATAFLASHKFILE(_fd);
+       DataFlash *fd = DATAFLASH_CAST(_fd);
 
        dataflash_offset_t offset;
        dataflash_page_t new_page;
@@ -458,7 +456,7 @@ MOD_DEFINE(dataflash);
  * \return true if ok, false if memory density read from dataflash is not compliant with the
  * configured one.
  */
-bool dataflash_init(DataFlashKFile *fd, KFile *ch, DataflashType dev, dataflash_setCS_t *setCS, dataflash_setReset_t *setReset)
+bool dataflash_init(DataFlash *fd, KFile *ch, DataflashType dev, dataflash_setCS_t *setCS, dataflash_setReset_t *setReset)
 {
        uint8_t stat;