From: qwert Date: Tue, 5 Aug 2008 13:02:41 +0000 (+0000) Subject: Re-Refactor code under new specs. FlashAvr. X-Git-Tag: 2.0.0~388 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=37df46aa8f8cb8e89b92c6c8de6a047fcaad9e37;p=bertos.git Re-Refactor code under new specs. FlashAvr. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1546 38d2e660-2303-0410-9eaa-f027e97ec537 --- diff --git a/app/triface/boot/main.c b/app/triface/boot/main.c index 0a236cb8..d4c863ee 100644 --- a/app/triface/boot/main.c +++ b/app/triface/boot/main.c @@ -63,7 +63,7 @@ int main(void) { - FlashAvrKFile flash; + FlashAvr flash; SerialKFile ser; diff --git a/bertos/cpu/avr/drv/flash_avr.c b/bertos/cpu/avr/drv/flash_avr.c index c64f935b..8bdd2f91 100644 --- a/bertos/cpu/avr/drv/flash_avr.c +++ b/bertos/cpu/avr/drv/flash_avr.c @@ -83,7 +83,7 @@ typedef uint16_t avr_page_addr_t; * * This function is only use internally in this module. */ -static void flash_avr_flush(FlashAvrKFile *fd) +static void flash_avr_flush(FlashAvr *fd) { if (fd->page_dirty) { @@ -141,7 +141,7 @@ static void flash_avr_flush(FlashAvrKFile *fd) */ static int flash_avr_kfileFlush(struct KFile *_fd) { - FlashAvrKFile *fd = FLASHAVRKFILE(_fd); + FlashAvr *fd = FLASHAVRKFILE(_fd); flash_avr_flush(fd); return 0; } @@ -151,7 +151,7 @@ static int flash_avr_kfileFlush(struct KFile *_fd) * Check current page and if \a page is different, load it in * temporary buffer. */ -static void flash_avr_loadPage(FlashAvrKFile *fd, avr_page_t page) +static void flash_avr_loadPage(FlashAvr *fd, avr_page_t page) { if (page != fd->curr_page) { @@ -170,7 +170,7 @@ static void flash_avr_loadPage(FlashAvrKFile *fd, avr_page_t page) */ static size_t flash_avr_write(struct KFile *_fd, const void *_buf, size_t size) { - FlashAvrKFile *fd = FLASHAVRKFILE(_fd); + FlashAvr *fd = FLASHAVRKFILE(_fd); const uint8_t *buf =(const uint8_t *)_buf; avr_page_t page; @@ -207,7 +207,7 @@ static size_t flash_avr_write(struct KFile *_fd, const void *_buf, size_t size) * \a name and \a mode are unused, cause flash memory is * threated like one file. */ -static void flash_avr_open(struct FlashAvrKFile *fd) +static void flash_avr_open(struct FlashAvr *fd) { fd->curr_page = 0; memcpy_P(fd->page_buf, (const char *)(fd->curr_page * SPM_PAGESIZE), SPM_PAGESIZE); @@ -224,7 +224,7 @@ static void flash_avr_open(struct FlashAvrKFile *fd) */ static int flash_avr_close(struct KFile *_fd) { - FlashAvrKFile *fd = FLASHAVRKFILE(_fd); + FlashAvr *fd = FLASHAVRKFILE(_fd); flash_avr_flush(fd); LOG_INFO("Flash file closed\n"); return 0; @@ -235,7 +235,7 @@ static int flash_avr_close(struct KFile *_fd) */ static struct KFile *flash_avr_reopen(struct KFile *fd) { - FlashAvrKFile *_fd = FLASHAVRKFILE(fd); + FlashAvr *_fd = FLASHAVRKFILE(fd); flash_avr_close(fd); flash_avr_open(_fd); return fd; @@ -248,7 +248,7 @@ static struct KFile *flash_avr_reopen(struct KFile *fd) */ static size_t flash_avr_read(struct KFile *_fd, void *buf, size_t size) { - FlashAvrKFile *fd = FLASHAVRKFILE(_fd); + FlashAvr *fd = FLASHAVRKFILE(_fd); ASSERT(fd->fd.seek_pos + (kfile_off_t)size <= (kfile_off_t)fd->fd.size); size = MIN((uint32_t)size, fd->fd.size - fd->fd.seek_pos); @@ -272,7 +272,7 @@ static size_t flash_avr_read(struct KFile *_fd, void *buf, size_t size) /** * Init AVR flash read/write file. */ -void flash_avr_init(struct FlashAvrKFile *fd) +void flash_avr_init(struct FlashAvr *fd) { memset(fd, 0, sizeof(*fd)); DB(fd->fd._type = KFT_FLASHAVR); diff --git a/bertos/cpu/avr/drv/flash_avr.h b/bertos/cpu/avr/drv/flash_avr.h index 4a0aea73..5b8dd6b1 100644 --- a/bertos/cpu/avr/drv/flash_avr.h +++ b/bertos/cpu/avr/drv/flash_avr.h @@ -54,7 +54,7 @@ typedef uint16_t avr_page_t; /** * FlashAvr KFile context structure. */ -typedef struct FlashAvrKFile +typedef struct FlashAvr { /** * File descriptor. @@ -78,7 +78,7 @@ typedef struct FlashAvrKFile uint8_t page_buf[SPM_PAGESIZE]; -} FlashAvrKFile; +} FlashAvr; @@ -88,16 +88,16 @@ typedef struct FlashAvrKFile #define KFT_FLASHAVR MAKE_ID('F', 'L', 'A', 'V') /** - * Convert + ASSERT from generic KFile to FlashAvrKFile. + * Convert + ASSERT from generic KFile to FlashAvr. */ -INLINE FlashAvrKFile * FLASHAVRKFILE(KFile *fd) +INLINE FlashAvr * FLASHAVRKFILE(KFile *fd) { ASSERT(fd->_type == KFT_FLASHAVR); - return (FlashAvrKFile *)fd; + return (FlashAvr *)fd; } -void flash_avr_init(struct FlashAvrKFile *fd); +void flash_avr_init(struct FlashAvr *fd);