Refactor Dataflash macro to the new name specs.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1558 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/bertos/drv/dataflash.c b/bertos/drv/dataflash.c
index 43eca7de24780271667259d636e3921dd06a248d..5347d451aa97c3812ba4012d397aaf2d0237c678 100644 (file)
--- a/bertos/drv/dataflash.c
+++ b/bertos/drv/dataflash.c
@@ -287,7 +287,7 @@ static void dataflash_loadPage(DataFlash *fd, dataflash_page_t page_addr)
  */
 static int dataflash_flush(KFile *_fd)
 {
-       DataFlash *fd = DATAFLASHKFILE(_fd);
+       DataFlash *fd = DATAFLASH(_fd);
        if (fd->page_dirty)
        {
                dataflash_cmd(fd, fd->current_page, 0x00, DFO_WRITE_BUFF1_TO_MEM_E);
@@ -316,7 +316,7 @@ static int dataflash_close(struct KFile *_fd)
  */
 static KFile *dataflash_reopen(KFile *_fd)
 {
-       DataFlash *fd = DATAFLASHKFILE(_fd);
+       DataFlash *fd = DATAFLASH(_fd);
        dataflash_close(_fd);
 
        fd->current_page = 0;
@@ -344,7 +344,7 @@ static KFile *dataflash_reopen(KFile *_fd)
  */
 static size_t dataflash_read(struct KFile *_fd, void *buf, size_t size)
 {
-       DataFlash *fd = DATAFLASHKFILE(_fd);
+       DataFlash *fd = DATAFLASH(_fd);
 
        dataflash_offset_t byte_addr;
        dataflash_page_t page_addr;
@@ -394,7 +394,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 = DATAFLASHKFILE(_fd);
+       DataFlash *fd = DATAFLASH(_fd);
 
        dataflash_offset_t offset;
        dataflash_page_t new_page;

diff --git a/bertos/drv/dataflash.h b/bertos/drv/dataflash.h
index 1ad87ef4af6c9feb38c3000c1861b7fb3ffa6e33..ff5b662bd9e57b6ec3b9f2e027b6209f3e082720 100644 (file)
--- a/bertos/drv/dataflash.h
+++ b/bertos/drv/dataflash.h
@@ -100,7 +100,7 @@ typedef struct DataFlash
 /**
  * Convert + ASSERT from generic KFile to DataFlash.
  */
-INLINE DataFlash * DATAFLASHKFILE(KFile *fd)
+INLINE DataFlash * DATAFLASH(KFile *fd)
 {
        ASSERT(fd->_type == KFT_DATAFLASH);
        return (DataFlash *)fd;