Rename macros.

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

diff --git a/bertos/drv/eeprom.c b/bertos/drv/eeprom.c
index ceca24d21005e95ffc13bfbde557ad7a4ee3b9a6..92ddac731cf8f7f3694233ed909e8266be073b1f 100644 (file)
--- a/bertos/drv/eeprom.c
+++ b/bertos/drv/eeprom.c
@@ -102,7 +102,7 @@ STATIC_ASSERT(countof(mem_info) == EEPROM_CNT);
  */
 static size_t eeprom_writeRaw(struct KFile *_fd, const void *buf, size_t size)
 {
-       Eeprom *fd = EEPROM(_fd);
+       Eeprom *fd = EEPROM_CAST(_fd);
        e2dev_addr_t dev_addr;
        uint8_t addr_buf[2];
        uint8_t addr_len;
@@ -175,7 +175,7 @@ static size_t eeprom_writeRaw(struct KFile *_fd, const void *buf, size_t size)
  */
 static size_t eeprom_writeVerify(struct KFile *_fd, const void *_buf, size_t size)
 {
-       Eeprom *fd = EEPROM(_fd);
+       Eeprom *fd = EEPROM_CAST(_fd);
        int retries = 5;
        size_t wr_len;
 
@@ -204,7 +204,7 @@ static size_t eeprom_writeVerify(struct KFile *_fd, const void *_buf, size_t siz
  */
 static size_t eeprom_read(struct KFile *_fd, void *_buf, size_t size)
 {
-       Eeprom *fd = EEPROM(_fd);
+       Eeprom *fd = EEPROM_CAST(_fd);
        uint8_t addr_buf[2];
        uint8_t addr_len;
        size_t rd_len = 0;

diff --git a/bertos/drv/eeprom.h b/bertos/drv/eeprom.h
index 15c565535e343bd77d6d3bc78ef0146fb4e29b94..60ef15696f38fad7520a5d3424097c10fdca9fe4 100644 (file)
--- a/bertos/drv/eeprom.h
+++ b/bertos/drv/eeprom.h
@@ -83,7 +83,7 @@ typedef struct Eeprom
 /**
  * Convert + ASSERT from generic KFile to Eeprom.
  */
-INLINE Eeprom * EEPROM(KFile *fd)
+INLINE Eeprom * EEPROM_CAST(KFile *fd)
 {
        ASSERT(fd->_type == KFT_EEPROM);
        return (Eeprom *)fd;

diff --git a/bertos/drv/ft245rl.c b/bertos/drv/ft245rl.c
index 40ffe0fda3fe9d563bff6f42d7c17b376590af47..9afe76474246d6a734ef90ef810c426b89d5d8ad 100644 (file)
--- a/bertos/drv/ft245rl.c
+++ b/bertos/drv/ft245rl.c
@@ -59,7 +59,7 @@ MOD_DEFINE(ft245rl);
  */
 static size_t ft245rl_read(struct KFile *_fd, void *_buf, size_t size)
 {
-       Ft245rl *fd = FT245RL(_fd);
+       Ft245rl *fd = FT245RL_CAST(_fd);
        (void)fd; //unused
        uint8_t *buf = (uint8_t *)_buf;
        size_t total_read = 0;
@@ -81,7 +81,7 @@ static size_t ft245rl_read(struct KFile *_fd, void *_buf, size_t size)
  */
 static size_t ft245rl_write(struct KFile *_fd, const void *_buf, size_t size)
 {
-       Ft245rl *fd = FT245RL(_fd);
+       Ft245rl *fd = FT245RL_CAST(_fd);
        (void)fd; //unused
        const uint8_t *buf = (const uint8_t *)_buf;
        size_t total_write = 0;

diff --git a/bertos/drv/ft245rl.h b/bertos/drv/ft245rl.h
index e120ab9c75a140d190da63d642b3808df7c3f1cd..a4a8dcaee6f0bd3006e11ec4318f3ac33f68bf61 100644 (file)
--- a/bertos/drv/ft245rl.h
+++ b/bertos/drv/ft245rl.h
@@ -61,7 +61,7 @@ typedef struct Ft245rl
 /**
  * Convert + ASSERT from generic KFile to KFileFt245rl.
  */
-INLINE Ft245rl * FT245RL(KFile *fd)
+INLINE Ft245rl * FT245RL_CAST(KFile *fd)
 {
        ASSERT(fd->_type == KFT_FT245RL);
        return (Ft245rl *)fd;