Reformat.

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

diff --git a/bertos/drv/flash25.c b/bertos/drv/flash25.c
index e2356bdf7d0c1d32398e7d8ef529abba0eccb1a3..807ff2114286be9b8b94600224c19487352337b7 100644 (file)
--- a/bertos/drv/flash25.c
+++ b/bertos/drv/flash25.c
@@ -56,7 +56,9 @@
 #include <kern/kfile.h>
 
 #if CONFIG_KERNEL
-#include <kern/proc.h>
+       #include <kern/proc.h>
+#else
+       #define proc_yield() do {} while(0)
 #endif
 
 #warning FIXME:This file was change, but is untest!
@@ -64,7 +66,7 @@
 /**
  * Wait until flash memory is ready.
  */
-static void flash25_waitReady(KFileFlash25 *fd)
+static void flash25_waitReady(Flash25 *fd)
 {
        uint8_t stat;
 
@@ -79,17 +81,15 @@ static void flash25_waitReady(KFileFlash25 *fd)
 
                if (!(stat & RDY_BIT))
                        break;
-               #if CONFIG_KERNEL
                else
-                       proc_switch();
-               #endif
+                       proc_yield();
        }
 }
 
 /**
  * Send a single command to serial flash memory.
  */
-static void flash25_sendCmd(KFileFlash25 *fd, Flash25Opcode cmd)
+static void flash25_sendCmd(Flash25 *fd, Flash25Opcode cmd)
 {
        CS_ENABLE();
 
@@ -104,7 +104,7 @@ static void flash25_sendCmd(KFileFlash25 *fd, Flash25Opcode cmd)
  * try to read manufacturer id of serial memory,
  * then check if is equal to selected type.
  */
-static bool flash25_pin_init(KFileFlash25 *fd)
+static bool flash25_pin_init(Flash25 *fd)
 {
        uint8_t device_id;
        uint8_t manufacturer;
@@ -140,7 +140,7 @@ static bool flash25_pin_init(KFileFlash25 *fd)
  */
 static KFile * flash25_reopen(struct KFile *_fd)
 {
-       KFileFlash25 *fd = KFILEFLASH25(_fd);
+       Flash25 *fd = FLASH25_CAST(_fd);
 
        fd->fd.seek_pos = 0;
        fd->fd.size = FLASH25_MEM_SIZE;
@@ -176,7 +176,7 @@ static size_t flash25_read(struct KFile *_fd, void *buf, size_t size)
 {
        uint8_t *data = (uint8_t *)buf;
 
-       KFileFlash25 *fd = KFILEFLASH25(_fd);
+       Flash25 *fd = FLASH25_CAST(_fd);
 
        ASSERT(fd->fd.seek_pos + (kfile_size_t)size <= fd->fd.size);
        size = MIN((kfile_size_t)size, fd->fd.size - fd->fd.seek_pos);
@@ -229,7 +229,7 @@ static size_t flash25_write(struct KFile *_fd, const void *_buf, size_t size)
        flash25Size_t wr_len;
        const uint8_t *data = (const uint8_t *) _buf;
 
-       KFileFlash25 *fd = KFILEFLASH25(_fd);
+       Flash25 *fd = FLASH25_CAST(_fd);
 
        ASSERT(fd->fd.seek_pos + (kfile_size_t)size <= fd->fd.size);
 
@@ -294,7 +294,7 @@ static size_t flash25_write(struct KFile *_fd, const void *_buf, size_t size)
  * \note A sector size is FLASH25_SECTOR_SIZE.
  * This operation could take a while.
  */
-void flash25_sectorErase(KFileFlash25 *fd, Flash25Sector sector)
+void flash25_sectorErase(Flash25 *fd, Flash25Sector sector)
 {
 
        /*
@@ -341,7 +341,7 @@ void flash25_sectorErase(KFileFlash25 *fd, Flash25Sector sector)
  *
  * \note This operation could take a while.
  */
-void flash25_chipErase(KFileFlash25 *fd)
+void flash25_chipErase(Flash25 *fd)
 {
        /*
         * Erase all chip could take a while,
@@ -371,7 +371,7 @@ void flash25_chipErase(KFileFlash25 *fd)
 /**
  * Init data flash memory interface.
  */
-void flash25_init(KFileFlash25 *fd, KFile *ch)
+void flash25_init(Flash25 *fd, KFile *ch)
 {
 
        ASSERT(fd);