deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Changed Contiki File System (cfs) from a service to a plain library.

Browse source 
This change means that one needs to select _ONE_ cfs implementation at Contiki library link time. But this doesn't appear to be an issue as all platforms have their "favorite" implementation anyway.
This commit is contained in:
oliverschmidt 2007-05-19 21:37:54 +00:00
parent d4528e427f
commit 0e023b328a
5 changed files with 37 additions and 180 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
platform/cooja/cfs/cfs-cooja.c
View file

@ -28,14 +28,12 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* $Id: cfs-cooja.c,v 1.1 2006/10/23 16:07:29 fros4943 Exp $ * $Id: cfs-cooja.c,v 1.2 2007/05/19 21:37:54 oliverschmidt Exp $
*/ */
#include <string.h> #include <string.h>
#include "cfs/cfs-cooja.h"
#include "lib/simEnvChange.h" #include "lib/simEnvChange.h"
#include "cfs/cfs.h" #include "cfs/cfs.h"
#include "cfs/cfs-service.h"
#include "dev/eeprom.h" #include "dev/eeprom.h"
struct filestate { struct filestate {
@ -57,8 +55,8 @@ int simCFSRead = 0;
int simCFSWritten = 0; int simCFSWritten = 0;
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static int int
s_open(const char *n, int f) cfs_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;
@ -69,14 +67,14 @@ s_open(const char *n, int f)
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void void
s_close(int f) cfs_close(int f)
{ {
file.flag = FLAG_FILE_CLOSED; file.flag = FLAG_FILE_CLOSED;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static int int
s_read(int f, char *buf, unsigned int len) cfs_read(int f, char *buf, unsigned int len)
{ {
if(f == 1) { if(f == 1) {
// TODO Should yield a few times? // TODO Should yield a few times?
@ -90,8 +88,8 @@ s_read(int f, char *buf, unsigned int len)
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static int int
s_write(int f, char *buf, unsigned int len) cfs_write(int f, char *buf, unsigned int len)
{ {
if(f == 1) { if(f == 1) {
// TODO Should yield a few times? // TODO Should yield a few times?
@ -105,8 +103,8 @@ s_write(int f, char *buf, unsigned int len)
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static int int
s_seek(int f, unsigned int o) cfs_seek(int f, unsigned int o)
{ {
if(f == 1) { if(f == 1) {
file.fileptr = o; file.fileptr = o;
@ -116,58 +114,35 @@ s_seek(int f, unsigned int o)
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static int int
s_opendir(struct cfs_dir *p, const char *n) cfs_opendir(struct cfs_dir *p, const char *n)
{ {
return 1; return 1;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static int int
s_readdir(struct cfs_dir *p, struct cfs_dirent *e) cfs_readdir(struct cfs_dir *p, struct cfs_dirent *e)
{ {
return 1; return 1;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static int int
s_closedir(struct cfs_dir *p) cfs_closedir(struct cfs_dir *p)
{ {
return 1; return 1;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/*
* Service registration code follows.
*/
SERVICE(cfs_cooja_service, cfs_service,
{ s_open, s_close, s_read, s_write, s_seek,
s_opendir, s_readdir, s_closedir });
PROCESS(cfs_cooja_process, "CFS COOJA service");
PROCESS_THREAD(cfs_cooja_process, ev, data)
{
PROCESS_BEGIN();
SERVICE_REGISTER(cfs_cooja_service);
PROCESS_WAIT_EVENT_UNTIL(ev == PROCESS_EVENT_SERVICE_REMOVED ||
ev == PROCESS_EVENT_EXIT);
SERVICE_REMOVE(cfs_cooja_service);
PROCESS_END();
}
/*-----------------------------------------------------------------------------------*/
static void static void
doInterfaceActionsBeforeTick(void) doInterfaceActionsBeforeTick(void)
{ {
} }
/*-----------------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void static void
doInterfaceActionsAfterTick(void) doInterfaceActionsAfterTick(void)
{ {
} }
/*-----------------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
SIM_INTERFACE(cfs_interface, SIM_INTERFACE(cfs_interface,
doInterfaceActionsBeforeTick, doInterfaceActionsBeforeTick,
doInterfaceActionsAfterTick); doInterfaceActionsAfterTick);
/*---------------------------------------------------------------------------*/

39
platform/cooja/cfs/cfs-cooja.h
View file

@ -1,39 +0,0 @@
/*
* Copyright (c) 2006, Swedish Institute of Computer Science.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: cfs-cooja.h,v 1.1 2006/10/23 16:07:29 fros4943 Exp $
*/
#ifndef __CFS_COOJA_H__
#define __CFS_COOJA_H__
#include "contiki.h"
#include "cfs/cfs.h"
PROCESS_NAME(cfs_cooja_process);
#endif /* __CFS_COOJA_H__ */

63
platform/win32/cfs/cfs-win32.c
View file

@ -30,7 +30,7 @@
* *
* Author: Oliver Schmidt <ol.sc@web.de> * Author: Oliver Schmidt <ol.sc@web.de>
* *
* $Id: cfs-win32.c,v 1.1 2006/08/13 16:23:10 oliverschmidt Exp $ * $Id: cfs-win32.c,v 1.2 2007/05/19 21:38:22 oliverschmidt Exp $
*/ */
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
@ -43,20 +43,6 @@
#include "contiki.h" #include "contiki.h"
#include "cfs/cfs.h" #include "cfs/cfs.h"
#include "cfs/cfs-service.h"
static int s_open(const char *n, int f);
static void s_close(int f);
static int s_read(int f, char *b, unsigned int l);
static int s_write(int f, char *b, unsigned int l);
static int s_seek(int f, unsigned int offset);
static int s_opendir(struct cfs_dir *p, const char *n);
static int s_readdir(struct cfs_dir *p, struct cfs_dirent *e);
static int s_closedir(struct cfs_dir *p);
SERVICE(cfs_win32_service, cfs_service,
{ s_open, s_close, s_read, s_write, s_seek,
s_opendir, s_readdir, s_closedir });
struct cfs_win32_dir { struct cfs_win32_dir {
HANDLE handle; HANDLE handle;
@ -64,24 +50,9 @@ struct cfs_win32_dir {
unsigned int size; unsigned int size;
}; };
PROCESS(cfs_win32_process, "CFS Win32 service");
PROCESS_THREAD(cfs_win32_process, ev, data)
{
PROCESS_BEGIN();
SERVICE_REGISTER(cfs_win32_service);
PROCESS_WAIT_EVENT_UNTIL(ev == PROCESS_EVENT_SERVICE_REMOVED ||
ev == PROCESS_EVENT_EXIT);
SERVICE_REMOVE(cfs_win32_service);
PROCESS_END();
}
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static int int
s_open(const char *n, int f) cfs_open(const char *n, int f)
{ {
if(f == CFS_READ) { if(f == CFS_READ) {
return _open(n, O_RDONLY); return _open(n, O_RDONLY);
@ -90,32 +61,32 @@ s_open(const char *n, int f)
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static void void
s_close(int f) cfs_close(int f)
{ {
_close(f); _close(f);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static int int
s_read(int f, char *b, unsigned int l) cfs_read(int f, char *b, unsigned int l)
{ {
return _read(f, b, l); return _read(f, b, l);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static int int
s_write(int f, char *b, unsigned int l) cfs_write(int f, char *b, unsigned int l)
{ {
return _write(f, b, l); return _write(f, b, l);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static int int
s_seek(int f, unsigned int o) cfs_seek(int f, unsigned int o)
{ {
return _lseek(f, o, SEEK_SET); return _lseek(f, o, SEEK_SET);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static int int
s_opendir(struct cfs_dir *p, const char *n) cfs_opendir(struct cfs_dir *p, const char *n)
{ {
struct cfs_win32_dir *dir = (struct cfs_win32_dir *)p; struct cfs_win32_dir *dir = (struct cfs_win32_dir *)p;
WIN32_FIND_DATA data; WIN32_FIND_DATA data;
@ -143,8 +114,8 @@ s_opendir(struct cfs_dir *p, const char *n)
return 0; return 0;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static int int
s_readdir(struct cfs_dir *p, struct cfs_dirent *e) cfs_readdir(struct cfs_dir *p, struct cfs_dirent *e)
{ {
struct cfs_win32_dir *dir = (struct cfs_win32_dir *)p; struct cfs_win32_dir *dir = (struct cfs_win32_dir *)p;
WIN32_FIND_DATA data; WIN32_FIND_DATA data;
@ -168,8 +139,8 @@ s_readdir(struct cfs_dir *p, struct cfs_dirent *e)
return 0; return 0;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static int int
s_closedir(struct cfs_dir *p) cfs_closedir(struct cfs_dir *p)
{ {
struct cfs_win32_dir *dir = (struct cfs_win32_dir *)p; struct cfs_win32_dir *dir = (struct cfs_win32_dir *)p;

42
platform/win32/cfs/cfs-win32.h
View file

@ -1,42 +0,0 @@
/*
* Copyright (c) 2006, Swedish Institute of Computer Science.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* This file is part of the Contiki operating system.
*
* Author: Oliver Schmidt <ol.sc@web.de>
*
* $Id: cfs-win32.h,v 1.1 2006/08/13 16:23:10 oliverschmidt Exp $
*/
#ifndef __CFS_WIN32_H__
#define __CFS_WIN32_H__
#include "contiki.h"
PROCESS_NAME(cfs_win32_process);
#endif /* __CFS_WIN32_H__ */

8
platform/win32/vcproj/contiki.exe.vcproj
View file

@ -236,10 +236,6 @@
<Filter <Filter
Name="cfs" Name="cfs"
> >
<File
RelativePath="..\..\..\core\cfs\cfs.c"
>
</File>
<File <File
RelativePath="..\..\..\core\cfs\cfs.h" RelativePath="..\..\..\core\cfs\cfs.h"
> >
@ -504,10 +500,6 @@
RelativePath="..\cfs\cfs-win32.c" RelativePath="..\cfs\cfs-win32.c"
> >
</File> </File>
<File
RelativePath="..\cfs\cfs-win32.h"
>
</File>
</Filter> </Filter>
<Filter <Filter
Name="ctk" Name="ctk"