X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fdrv%2Fdataflash.c;h=a9135968e525e275b02033dc90c89d8aeeca2cee;hb=911d2706a86d326786bfe721dcc3d63aeade7f28;hp=c8af42650e32890e6a04a45d4285ab22f0b5c6ec;hpb=a625fd2523a0c960351f124baa7cd5c3c69c3272;p=bertos.git diff --git a/bertos/drv/dataflash.c b/bertos/drv/dataflash.c index c8af4265..a9135968 100644 --- a/bertos/drv/dataflash.c +++ b/bertos/drv/dataflash.c @@ -27,13 +27,11 @@ * the GNU General Public License. * * Copyright 2007 Develer S.r.l. (http://www.develer.com/) - * * --> * - * \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 $ + * \version $Id$ * \author Daniele Basile * \author Francesco Sacchi */ @@ -46,17 +44,17 @@ #include // 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 #include -#include +#include -#if CONFIG_KERNEL -#include -#endif +#include + +#include /* cpu_relax() */ #include @@ -106,7 +104,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(KFileDataflash *fd) +INLINE void CS_TOGGLE(DataFlash *fd) { fd->setCS(false); fd->setCS(true); @@ -117,7 +115,7 @@ INLINE void CS_TOGGLE(KFileDataflash *fd) * This function send only 4 byte: opcode, page address and * byte address. */ -static void send_cmd(KFileDataflash *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) { /* @@ -133,7 +131,7 @@ static void send_cmd(KFileDataflash *fd, dataflash_page_t page_addr, dataflash_o * page address, in last byte we write a byte page address. * (see datasheet for more detail). * - * \note Generaly a defaul memory page size is more than 256 byte. + * \note Generally a default memory page size is more than 256 byte. * In this case we need for addressing a byte in one page more than * 8 bit, so we put in fourth byte low part of address byte, and * hight part of address byte in third byte togheter low par of page @@ -166,7 +164,7 @@ static void send_cmd(KFileDataflash *fd, dataflash_page_t page_addr, dataflash_o * with one pulse reset long about 10usec. * */ -static void dataflash_reset(KFileDataflash *fd) +static void dataflash_reset(DataFlash *fd) { fd->setCS(false); @@ -183,7 +181,7 @@ static void dataflash_reset(KFileDataflash *fd) /** * Read status register of dataflah memory. */ -static uint8_t dataflash_stat(KFileDataflash *fd) +static uint8_t dataflash_stat(DataFlash *fd) { /* * Make sure to toggle CS signal @@ -200,7 +198,7 @@ static uint8_t dataflash_stat(KFileDataflash *fd) * return status register value. * */ -static uint8_t dataflash_cmd(KFileDataflash *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 +211,7 @@ static uint8_t dataflash_cmd(KFileDataflash *fd, dataflash_page_t page_addr, dat * is high. */ while (!(dataflash_stat(fd) & BUSY_BIT)) - { - #if CONFIG_KERNEL - proc_switch(); - #endif - } + cpu_relax(); stat = dataflash_stat(fd); @@ -234,8 +228,9 @@ static uint8_t dataflash_cmd(KFileDataflash *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(KFileDataflash *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, uint8_t *block, dataflash_size_t len) { + DataFlashOpcode opcode = mem_info[fd->dev].read_cmd; send_cmd(fd, page_addr, byte_addr, opcode); if (opcode == DFO_READ_FLASH_MEM_BYTE_B) @@ -261,11 +256,11 @@ static void dataflash_readBlock(KFileDataflash *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(KFileDataflash *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, const uint8_t *block, dataflash_size_t len) { ASSERT(offset + len <= mem_info[fd->dev].page_size); - send_cmd(fd, 0x00, offset, opcode); + send_cmd(fd, 0x00, offset, DFO_WRITE_BUFF1); kfile_write(fd->channel, block, len); //Write len bytes. kfile_flush(fd->channel); // Flush channel @@ -275,19 +270,110 @@ static void dataflash_writeBlock(KFileDataflash *fd, dataflash_offset_t offset, /** - * Load selct page from dataflash memory to buffer. + * Load selected page from dataflash memory to buffer. */ -static void dataflash_loadPage(KFileDataflash *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); } +/* Battfs disk interface section */ +#if 0 +static size_t dataflash_disk_page_read(struct BattFsSuper *d, pgcnt_t page, pgaddr_t addr, void *buf, size_t len) +{ + DataFlash *fd = DATAFLASH_CAST((KFile *)d->disk_ctx); + dataflash_readBlock(fd, page, addr, buf, len); + return len; +} + +static bool dataflash_disk_page_load(struct BattFsSuper *d, pgcnt_t page) +{ + DataFlash *fd = DATAFLASH_CAST((KFile *)d->disk_ctx); + dataflash_loadPage(fd, page); + return true; +} + +static size_t dataflash_disk_buffer_write(struct BattFsSuper *d, pgaddr_t addr, const void *buf, size_t len) +{ + DataFlash *fd = DATAFLASH_CAST((KFile *)d->disk_ctx); + dataflash_writeBlock(fd, addr, buf, len); + return len; +} + +static size_t dataflash_disk_buffer_read(struct BattFsSuper *d, pgaddr_t addr, void *buf, size_t len) +{ + DataFlash *fd = DATAFLASH_CAST((KFile *)d->disk_ctx); + ASSERT(addr + len <= mem_info[fd->dev].page_size); + + CS_TOGGLE(fd); + + kfile_putc(DFO_READ_BUFF1, fd->channel); + + uint32_t byte_addr = addr; + + kfile_putc((byte_addr >> 16) & 0xff, fd->channel); + kfile_putc((byte_addr >> 8) & 0xff, fd->channel); + kfile_putc(byte_addr & 0xff, fd->channel); + + /* Send additional don't care byte to start read operation */ + kfile_putc(0, fd->channel); + + kfile_read(fd->channel, buf, len); //Read len bytes ad put in buffer. + kfile_flush(fd->channel); // Flush channel + fd->setCS(false); + return len; +} + +static bool dataflash_disk_page_save(struct BattFsSuper *d, pgcnt_t page) +{ + DataFlash *fd = DATAFLASH_CAST((KFile *)d->disk_ctx); + dataflash_cmd(fd, page, 0x00, DFO_WRITE_BUFF1_TO_MEM); + return true; +} + +static bool dataflash_disk_page_erase(struct BattFsSuper *d, pgcnt_t page) +{ + DataFlash *fd = DATAFLASH_CAST((KFile *)d->disk_ctx); + dataflash_cmd(fd, page, 0x00, DFO_ERASE_PAGE); + return true; +} + +static int dataflash_close(struct KFile *_fd); + +static bool dataflash_disk_close(struct BattFsSuper *d) +{ + DataFlash *fd = DATAFLASH_CAST((KFile *)d->disk_ctx); + return dataflash_close(&fd->fd) == 0; +} + +bool dataflash_diskInit(struct BattFsSuper *d, DataFlash *fd, pgcnt_t *page_array) +{ + ASSERT(d); + ASSERT(fd); + d->read = dataflash_disk_page_read; + d->load = dataflash_disk_page_load; + d->bufferWrite = dataflash_disk_buffer_write; + d->bufferRead = dataflash_disk_buffer_read; + d->save = dataflash_disk_page_save; + d->erase = dataflash_disk_page_erase; + d->close = dataflash_disk_close; + d->disk_ctx = fd; + d->page_size = mem_info[fd->dev].page_size; + d->page_count = mem_info[fd->dev].page_cnt; + ASSERT(page_array); + d->page_array = page_array; + return d->page_array && fd; +} +#endif + +/* Kfile interface section */ + /** * Flush select page (stored in buffer) in data flash main memory page. */ static int dataflash_flush(KFile *_fd) { - KFileDataflash *fd = KFILEDATAFLASH(_fd); + DataFlash *fd = DATAFLASH_CAST(_fd); if (fd->page_dirty) { dataflash_cmd(fd, fd->current_page, 0x00, DFO_WRITE_BUFF1_TO_MEM_E); @@ -299,7 +385,6 @@ static int dataflash_flush(KFile *_fd) return 0; } -/* Kfile interface section */ /** * Close file \a fd. @@ -316,7 +401,7 @@ static int dataflash_close(struct KFile *_fd) */ static KFile *dataflash_reopen(KFile *_fd) { - KFileDataflash *fd = KFILEDATAFLASH(_fd); + DataFlash *fd = DATAFLASH_CAST(_fd); dataflash_close(_fd); fd->current_page = 0; @@ -344,15 +429,15 @@ static KFile *dataflash_reopen(KFile *_fd) */ static size_t dataflash_read(struct KFile *_fd, void *buf, size_t size) { - KFileDataflash *fd = KFILEDATAFLASH(_fd); + DataFlash *fd = DATAFLASH_CAST(_fd); dataflash_offset_t byte_addr; dataflash_page_t page_addr; uint8_t *data = (uint8_t *)buf; - ASSERT(fd->fd.seek_pos + size <= fd->fd.size); - size = MIN((kfile_size_t)size, fd->fd.size - fd->fd.seek_pos); + ASSERT(fd->fd.seek_pos + (kfile_off_t)size <= fd->fd.size); + size = MIN((kfile_off_t)size, fd->fd.size - fd->fd.seek_pos); LOG_INFO("Reading at pos[%lu]\n", fd->fd.seek_pos); @@ -373,10 +458,10 @@ static size_t dataflash_read(struct KFile *_fd, void *buf, size_t size) /* * Read byte in main page data flash memory. */ - dataflash_readBlock(fd, page_addr, byte_addr, mem_info[fd->dev].read_cmd, data, size); + dataflash_readBlock(fd, page_addr, byte_addr, data, size); fd->fd.seek_pos += size; - LOG_INFO("Read %ld bytes\n", size); + LOG_INFO("Read %ld bytes\n", (long int)size); return size; } @@ -394,7 +479,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) { - KFileDataflash *fd = KFILEDATAFLASH(_fd); + DataFlash *fd = DATAFLASH_CAST(_fd); dataflash_offset_t offset; dataflash_page_t new_page; @@ -402,8 +487,8 @@ static size_t dataflash_write(struct KFile *_fd, const void *_buf, size_t size) const uint8_t *data = (const uint8_t *) _buf; - ASSERT(fd->fd.seek_pos + size <= fd->fd.size); - size = MIN((kfile_size_t)size, fd->fd.size - fd->fd.seek_pos); + ASSERT(fd->fd.seek_pos + (kfile_off_t)size <= fd->fd.size); + size = MIN((kfile_off_t)size, fd->fd.size - fd->fd.seek_pos); LOG_INFO("Writing at pos[%lu]\n", fd->fd.seek_pos); @@ -434,7 +519,7 @@ static size_t dataflash_write(struct KFile *_fd, const void *_buf, size_t size) * Write byte in current page, and set true * page_dirty flag. */ - dataflash_writeBlock(fd, offset, DFO_WRITE_BUFF1, data, wr_len); + dataflash_writeBlock(fd, offset, data, wr_len); fd->page_dirty = true; data += wr_len; @@ -443,7 +528,7 @@ static size_t dataflash_write(struct KFile *_fd, const void *_buf, size_t size) total_write += wr_len; } - LOG_INFO("written %lu bytes\n", total_write); + LOG_INFO("written %lu bytes\n", (long unsigned)total_write); return total_write; } @@ -458,7 +543,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(KFileDataflash *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;