*
* \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 <asterix@develer.com>
* \author Francesco Sacchi <batt@develer.com>
*/
#include <drv/timer.h>
+#include <fs/battfs.h>
+
#include <kern/kfile.h>
#include <cpu/power.h> /* cpu_relax() */
dataflash_cmd(fd, page_addr, 0x00, DFO_MOV_MEM_TO_BUFF1);
}
+/* Battfs disk interface section */
+
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 *fd = DATAFLASH_CAST((KFile *)d->disk_ctx);
dataflash_writeBlock(fd, addr, buf, len);
- return true;
+ return len;
}
static size_t dataflash_disk_buffer_read(struct BattFsSuper *d, pgaddr_t addr, void *buf, size_t len)
kfile_putc((byte_addr >> 16) & 0xff, fd->channel);
kfile_putc((byte_addr >> 8) & 0xff, fd->channel);
- kfile_putc((byte_addr & 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)
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;
+}
+
+/* Kfile interface section */
+
/**
* Flush select page (stored in buffer) in data flash main memory page.
*/
return 0;
}
-/* Kfile interface section */
/**
* Close file \a fd.
uint8_t *data = (uint8_t *)buf;
- ASSERT(fd->fd.seek_pos + size <= (kfile_off_t)fd->fd.size);
+ 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);
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;
}
const uint8_t *data = (const uint8_t *) _buf;
- ASSERT(fd->fd.seek_pos + size <= (kfile_off_t)fd->fd.size);
+ 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);
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;
}