Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-11-08 23:08:29 +00:00
Code Issues Projects Releases Wiki Activity

Added file size

Browse Source
This commit is contained in:
adamdunkels 2007-03-22 23:55:03 +00:00
parent dd276a9c8a
commit ea6f2942bd
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
core/cfs/cfs-ram.c
View File

@ -30,7 +30,7 @@
* *
* Author: Adam Dunkels <adam@sics.se> * Author: Adam Dunkels <adam@sics.se>
* *
* $Id: cfs-ram.c,v 1.1 2006/06/17 22:41:15 adamdunkels Exp $ * $Id: cfs-ram.c,v 1.2 2007/03/22 23:55:03 adamdunkels Exp $
*/ */
#include "contiki.h" #include "contiki.h"
@ -43,12 +43,13 @@ struct filestate {
#define FLAG_FILE_CLOSED 0 #define FLAG_FILE_CLOSED 0
#define FLAG_FILE_OPEN 1 #define FLAG_FILE_OPEN 1
int fileptr; int fileptr;
int filesize;
}; };
#ifdef CFS_RAM_CONF_SIZE #ifdef CFS_RAM_CONF_SIZE
#define CFS_RAM_SIZE CFS_RAM_CONF_SIZE #define CFS_RAM_SIZE CFS_RAM_CONF_SIZE
#else #else
#define CFS_RAM_SIZE 512 #define CFS_RAM_SIZE 4096
#endif #endif
static struct filestate file; static struct filestate file;
@ -61,6 +62,9 @@ s_open(const char *n, int f)
if(file.flag == FLAG_FILE_CLOSED) { if(file.flag == FLAG_FILE_CLOSED) {
file.flag = FLAG_FILE_OPEN; file.flag = FLAG_FILE_OPEN;
file.fileptr = 0; file.fileptr = 0;
if((f & CFS_WRITE) && !(f & CFS_APPEND)) {
file.filesize = 0;
}
return 1; return 1;
} else { } else {
return -1; return -1;
@ -80,6 +84,10 @@ s_read(int f, char *buf, unsigned int len)
len = sizeof(filemem) - file.fileptr; len = sizeof(filemem) - file.fileptr;
} }
if(file.fileptr + len > file.filesize) {
len = file.filesize - file.fileptr;
}
if(f == 1) { if(f == 1) {
memcpy(buf, &filemem[file.fileptr], len); memcpy(buf, &filemem[file.fileptr], len);
file.fileptr += len; file.fileptr += len;
@ -99,6 +107,11 @@ s_write(int f, char *buf, unsigned int len)
len = sizeof(filemem) - file.fileptr; len = sizeof(filemem) - file.fileptr;
} }
if(file.fileptr + len > file.filesize) {
/* Extend the size of the file. */
file.filesize = file.fileptr + len;
}
if(f == 1) { if(f == 1) {
memcpy(&filemem[file.fileptr], buf, len); memcpy(&filemem[file.fileptr], buf, len);
file.fileptr += len; file.fileptr += len;
@ -112,8 +125,8 @@ static int
s_seek(int f, unsigned int o) s_seek(int f, unsigned int o)
{ {
if(f == 1) { if(f == 1) {
if(o > sizeof(filemem)) { if(o > file.filesize) {
o = sizeof(filemem); o = file.filesize;
} }
file.fileptr = o; file.fileptr = o;
return o; return o;
@ -163,3 +176,9 @@ PROCESS_THREAD(cfs_ram_process, ev, data)
PROCESS_END(); PROCESS_END();
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void
cfs_ram_init(void)
{
process_start(&cfs_ram_process, NULL);
}
/*---------------------------------------------------------------------------*/