*/
#include "battfs.h"
-
+#include "cfg/cfg_battfs.h"
#include <cfg/debug.h>
#include <cfg/macros.h> /* MIN, MAX */
+#include <cfg/test.h>
#include <cpu/byteorder.h> /* cpu_to_xx */
-#define LOG_LEVEL LOG_LVL_INFO
-#define LOG_FORMAT LOG_FMT_VERBOSE
+#define LOG_LEVEL BATTFS_LOG_LEVEL
+#define LOG_FORMAT BATTFS_LOG_FORMAT
#include <cfg/log.h>
#include <string.h> /* memset, memmove */
disk->free_page_start++;
}
}
- LOG_INFO("free_bytes:%d, free_page_start:%d\n", disk->free_bytes, disk->free_page_start);
+ LOG_INFO("free_bytes:%ld, free_page_start:%d\n", (long)disk->free_bytes, disk->free_page_start);
return true;
}
{
/* Invalid page, keep as free */
ASSERT(disk->page_array[curr_free_page] == PAGE_UNSET_SENTINEL);
- LOG_INFO("Page %d invalid, keeping as free\n", page);
+ //LOG_INFO("Page %d invalid, keeping as free\n", page);
disk->page_array[curr_free_page++] = page;
}
}
* \a disk.
* \return false on errors, true otherwise.
*/
-bool battfs_init(struct BattFsSuper *disk)
+bool battfs_mount(struct BattFsSuper *disk)
{
pgoff_t filelen_table[BATTFS_MAX_FILES];
- /* Sanity check */
- ASSERT(disk->open);
-
- /* Init disk device */
- if (!disk->open(disk))
- {
- LOG_ERR("open error\n");
- return false;
- }
-
/* Disk open must set all of these */
ASSERT(disk->read);
ASSERT(disk->load);
#if LOG_LEVEL >= LOG_LVL_INFO
dumpPageArray(disk);
#endif
- #warning TODO: shuffle free blocks
- //#if LOG_LEVEL > LOG_LVL_INFO
- // dumpPageArray(disk);
- //#endif
+ #if CONFIG_BATTFS_SHUFFLE_FREE_PAGES
+ SHUFFLE(&disk->page_array[disk->free_page_start], disk->page_count - disk->free_page_start);
+
+ LOG_INFO("Page array after shuffle:\n");
+ #if LOG_LEVEL >= LOG_LVL_INFO
+ dumpPageArray(disk);
+ #endif
+ #endif
/* Init list for opened files. */
LIST_INIT(&disk->file_opened_list);
return true;
if (flushBuffer(fdb->disk))
return 0;
else
+ {
+ fdb->errors |= BATTFS_DISK_FLUSHBUF_ERR;
return EOF;
+ }
}
/**
{
BattFs *fdb = BATTFS_CAST(fd);
- battfs_flush(fd);
- REMOVE(&fdb->link);
- return 0;
+ if (battfs_flush(fd) == 0)
+ {
+ REMOVE(&fdb->link);
+ return 0;
+ }
+ else
+ return EOF;
}
{
if (SPACE_OVER(disk))
{
- #warning TODO space over!
LOG_ERR("No disk space available!\n");
return false;
}
BattFsPageHeader curr_hdr;
if (fd->seek_pos < 0)
+ {
+ fdb->errors |= BATTFS_NEGATIVE_SEEK_ERR;
return total_write;
+ }
if (fd->seek_pos > fd->size)
{
/* Handle writing when seek pos if far over EOF */
if (!loadPage(disk, fdb->start[fdb->max_off], &curr_hdr))
{
- #warning TODO set error?
+ fdb->errors |= BATTFS_DISK_LOADPAGE_ERR;
return total_write;
}
/* Fill unused space of first page with 0s */
uint8_t dummy = 0;
- pgaddr_t zero_bytes = MIN(fd->seek_pos - fd->size, disk->data_size - curr_hdr.fill);
+ pgaddr_t zero_bytes = MIN(fd->seek_pos - fd->size, (kfile_off_t)(disk->data_size - curr_hdr.fill));
while (zero_bytes--)
{
if (disk->bufferWrite(disk, curr_hdr.fill, &dummy, 1) != 1)
{
- #warning TODO set error?
+ fdb->errors |= BATTFS_DISK_BUFFERWR_ERR;
+ return total_write;
}
curr_hdr.fill++;
fd->size++;
{
if (disk->bufferWrite(disk, off, &dummy, 1) != 1)
{
- #warning TODO set error?
+ fdb->errors |= BATTFS_DISK_BUFFERWR_ERR;
+ return total_write;
}
}
zero_bytes = MIN((kfile_off_t)disk->data_size, fd->seek_pos - fd->size);
/* Get the new page needed */
if (!getNewPage(disk, (fdb->start - disk->page_array) + fdb->max_off + 1, fdb->inode, fdb->max_off + 1, &curr_hdr))
+ {
+ fdb->errors |= BATTFS_DISK_GETNEWPAGE_ERR;
return total_write;
+ }
/* Update size and free space left */
fd->size += zero_bytes;
}
}
else if (!getBufferHdr(disk, &curr_hdr))
+ {
+ fdb->errors |= BATTFS_DISK_BUFFERRD_ERR;
return total_write;
+ }
while (size)
{
{
LOG_INFO("New page needed, pg_offset %d, pos %d\n", pg_offset, (int)((fdb->start - disk->page_array) + pg_offset));
if (!getNewPage(disk, (fdb->start - disk->page_array) + pg_offset, fdb->inode, pg_offset, &curr_hdr))
+ {
+ fdb->errors |= BATTFS_DISK_GETNEWPAGE_ERR;
return total_write;
+ }
+
fdb->max_off = pg_offset;
}
/* Handle cache load of a new page*/
if (SPACE_OVER(disk))
{
LOG_ERR("No disk space available!\n");
+ fdb->errors |= BATTFS_DISK_SPACEOVER_ERR;
return total_write;
}
LOG_INFO("Re-writing page %d to %d\n", fdb->start[pg_offset], disk->page_array[disk->free_page_start]);
if (!loadPage(disk, fdb->start[pg_offset], &curr_hdr))
{
- #warning TODO set error?
+ fdb->errors |= BATTFS_DISK_LOADPAGE_ERR;
return total_write;
}
//LOG_INFO("writing to buffer for page %d, offset %d, size %d\n", disk->curr_page, addr_offset, wr_len);
if (disk->bufferWrite(disk, addr_offset, buf, wr_len) != wr_len)
{
- #warning TODO set error?
+ fdb->errors |= BATTFS_DISK_BUFFERWR_ERR;
+ return total_write;
}
disk->cache_dirty = true;
curr_hdr.fill += fill_delta;
if (!setBufferHdr(disk, &curr_hdr))
+ {
+ fdb->errors |= BATTFS_DISK_BUFFERWR_ERR;
return total_write;
+ }
//LOG_INFO("free_bytes %d, seek_pos %d, size %d, curr_hdr.fill %d\n", disk->free_bytes, fd->seek_pos, fd->size, curr_hdr.fill);
}
pgaddr_t read_len;
if (fd->seek_pos < 0)
+ {
+ fdb->errors |= BATTFS_NEGATIVE_SEEK_ERR;
return total_read;
+ }
- size = MIN((kfile_off_t)size, MAX(fd->size - fd->seek_pos, 0));
+ size = MIN((kfile_off_t)size, MAX(fd->size - fd->seek_pos, (kfile_off_t)0));
while (size)
{
/* Read from disk */
if (diskRead(disk, fdb->start[pg_offset], addr_offset, buf, read_len) != read_len)
{
- #warning TODO set error?
+ fdb->errors |= BATTFS_DISK_READ_ERR;
+ return total_read;
}
#if _DEBUG
else if (hdr.fcs == fcs && hdr.inode < inode)
first = page + 1;
else
- *last = page - 1;
+ *last = page;
}
LOG_INFO("Not found: last %d\n", *last);
return false;
return size;
}
+static int battfs_error(struct KFile *fd)
+{
+ BattFs *fdb = BATTFS_CAST(fd);
+ return fdb->errors;
+}
+
+
+static void battfs_clearerr(struct KFile *fd)
+{
+ BattFs *fdb = BATTFS_CAST(fd);
+ fdb->errors = 0;
+}
+
/**
* Open file \a inode from \a disk in \a mode.
* File context is stored in \a fd.
{
LOG_INFO("file %d not found\n", inode);
if (!(mode & BATTFS_CREATE))
+ {
+ fd->errors |= BATTFS_FILE_NOT_FOUND_ERR;
return false;
+ }
/* Create the file */
BattFsPageHeader hdr;
if (!(getNewPage(disk, start_pos, inode, 0, &hdr)))
+ {
+ fd->errors |= BATTFS_DISK_GETNEWPAGE_ERR;
return false;
+ }
}
fd->start = &disk->page_array[start_pos];
LOG_INFO("Start pos %d\n", start_pos);
/* Fill file size */
if ((fd->fd.size = countFileSize(disk, fd->start, inode)) == EOF)
+ {
+ fd->errors |= BATTFS_DISK_READ_ERR;
return false;
+ }
fd->max_off = fd->fd.size / disk->data_size;
/* Reset seek position */
fd->fd.seek = kfile_genericSeek;
fd->fd.write = battfs_write;
-#warning TODO battfs_error, battfs_clearerr
-#if 0
fd->fd.error = battfs_error;
fd->fd.clearerr = battfs_clearerr;
-#endif
DB(fd->fd._type = KFT_BATTFS);
return true;
}
+
/**
- * Close \a disk.
+ * Umount \a disk.
*/
-bool battfs_close(struct BattFsSuper *disk)
+bool battfs_umount(struct BattFsSuper *disk)
{
Node *n;
int res = 0;
projects / bertos.git / blobdiff