* the GNU General Public License.
*
* Copyright 2007 Develer S.r.l. (http://www.develer.com/)
- *
* -->
*
- * \brief Function library for AT45DBXX Data Flash memory.
- *
+ * \brief Function library for dataflash AT45DB family (implementation).
*
- * \version $Id: dataflash.c 20677 2008-02-19 14:29:52Z batt $
+ * \version $Id: dataflash.c 21658 2008-06-05 16:42:54Z asterix $
* \author Daniele Basile <asterix@develer.com>
* \author Francesco Sacchi <batt@develer.com>
*/
#include "dataflash.h"
+#include "cfg/cfg_dataflash.h"
#include <cfg/macros.h>
#include <cfg/debug.h>
#include <cfg/module.h>
+// Define logging setting (for cfg/log.h module).
+#define LOG_LEVEL DATAFLASH_LOG_LEVEL
+#define LOG_FORMAT DATAFLASH_LOG_FORMAT
+#include <cfg/log.h>
+
#include <drv/timer.h>
#include <kern/kfile.h>
-#if CONFIG_KERNEL
-#include <kern/proc.h>
-#endif
+#include <cpu/power.h> /* cpu_relax() */
#include <string.h>
* 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);
* 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)
{
/*
* with one pulse reset long about 10usec.
*
*/
-static void dataflash_reset(KFileDataflash *fd)
+static void dataflash_reset(DataFlash *fd)
{
fd->setCS(false);
/**
* 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
* and reset dataflash command decoder.
*/
CS_TOGGLE(fd);
-
kfile_putc(DFO_READ_STATUS, fd->channel);
-
return kfile_getc(fd->channel);
}
* 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;
* is high.
*/
while (!(dataflash_stat(fd) & BUSY_BIT))
- {
- #if CONFIG_KERNEL
- proc_switch();
- #endif
- }
+ cpu_relax();
stat = dataflash_stat(fd);
* 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, DataFlashOpcode opcode, uint8_t *block, dataflash_size_t len)
{
send_cmd(fd, page_addr, byte_addr, opcode);
* 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, DataFlashOpcode opcode, const uint8_t *block, dataflash_size_t len)
{
ASSERT(offset + len <= mem_info[fd->dev].page_size);
/**
* Load selct 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);
}
*/
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);
fd->page_dirty = false;
- kprintf("Flushing page <%ld>\n", fd->current_page);
+ LOG_INFO("Flushing page {%ld}\n", fd->current_page);
}
return 0;
}
static int dataflash_close(struct KFile *_fd)
{
dataflash_flush(_fd);
- TRACE;
+ LOG_INFO("Close.\n");
return 0;
}
*/
static KFile *dataflash_reopen(KFile *_fd)
{
- KFileDataflash *fd = KFILEDATAFLASH(_fd);
+ DataFlash *fd = DATAFLASH_CAST(_fd);
dataflash_close(_fd);
fd->current_page = 0;
/* Load selected page from dataflash memory */
dataflash_loadPage(fd, fd->current_page);
- TRACE;
+ LOG_INFO("Reopen.\n");
return &fd->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((uint32_t)size, fd->fd.size - fd->fd.seek_pos);
+ ASSERT(fd->fd.seek_pos + size <= (kfile_off_t)fd->fd.size);
+ size = MIN((kfile_off_t)size, fd->fd.size - fd->fd.seek_pos);
- kprintf("Reading at pos[%lu]\n", fd->fd.seek_pos);
+ LOG_INFO("Reading at pos[%lu]\n", fd->fd.seek_pos);
/*
* We select page and offest from absolute address.
page_addr = fd->fd.seek_pos / mem_info[fd->dev].page_size;
byte_addr = fd->fd.seek_pos % mem_info[fd->dev].page_size;
- kprintf("[page-<%ld>, byte-<%ld>]", page_addr, byte_addr);
+ LOG_INFO("[page-{%ld}, byte-{%ld}]\n", page_addr, byte_addr);
/*
* Flush current page in main memory if
dataflash_readBlock(fd, page_addr, byte_addr, mem_info[fd->dev].read_cmd, data, size);
fd->fd.seek_pos += size;
- kprintf("Read %ld bytes\n", size);
+ LOG_INFO("Read %ld bytes\n", size);
return 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;
const uint8_t *data = (const uint8_t *) _buf;
- ASSERT(fd->fd.seek_pos + size <= fd->fd.size);
- size = MIN((uint32_t)size, fd->fd.size - fd->fd.seek_pos);
+ ASSERT(fd->fd.seek_pos + size <= (kfile_off_t)fd->fd.size);
+ size = MIN((kfile_off_t)size, fd->fd.size - fd->fd.seek_pos);
- kprintf("Writing at pos[%lu]\n", fd->fd.seek_pos);
+ LOG_INFO("Writing at pos[%lu]\n", fd->fd.seek_pos);
while (size)
{
offset = fd->fd.seek_pos % mem_info[fd->dev].page_size;
- size_t wr_len = MIN(size, mem_info[fd->dev].page_size - offset);
+ size_t wr_len = MIN((dataflash_size_t)size, mem_info[fd->dev].page_size - offset);
- kprintf(" [page-<%ld>, byte-<%ld>]",new_page, offset);
+ LOG_INFO("[page-{%ld}, byte-{%ld}]\n",new_page, offset);
if (new_page != fd->current_page)
{
dataflash_loadPage(fd, new_page);
fd->current_page = new_page;
- kprintf(" >> Load page: <%ld> ", new_page);
+ LOG_INFO(" >> Load page: {%ld}\n", new_page);
}
/*
* Write byte in current page, and set true
total_write += wr_len;
}
- kprintf("written %lu bytes\n", total_write);
+ LOG_INFO("written %lu bytes\n", total_write);
return total_write;
}
* \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;
fd->fd.flush = dataflash_flush;
dataflash_reset(fd);
-
stat = dataflash_stat(fd);
/*
projects / bertos.git / blobdiff