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

moved cooja cfs files from /dev to /cfs

Browse source
This commit is contained in:
fros4943 2006-10-23 16:07:29 +00:00
parent c67ce1c1b0
commit e528b527e6
4 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
platform/cooja/Makefile.cooja
View file

@ -1,4 +1,4 @@
# $Id: Makefile.cooja,v 1.7 2006/10/11 14:14:41 fros4943 Exp $ # $Id: Makefile.cooja,v 1.8 2006/10/23 16:07:29 fros4943 Exp $
## The COOJA Simulator Contiki platform Makefile ## The COOJA Simulator Contiki platform Makefile
## ##
@ -25,7 +25,7 @@ MAINFILE = $(OUTPUT_DIR)/$(TYPEID).co
### Define COOJA core interfaces ### Define COOJA core interfaces
COOJA = $(CONTIKI)/platform/$(TARGET) COOJA = $(CONTIKI)/platform/$(TARGET)
CONTIKI_TARGET_DIRS = . dev lib sys CONTIKI_TARGET_DIRS = . dev lib sys cfs
COOJA_BASE = simEnvChange.c irq.c cooja_mt.c cooja_mtarch.c COOJA_BASE = simEnvChange.c irq.c cooja_mt.c cooja_mtarch.c
@ -64,6 +64,11 @@ vpath %.c $(PROJECTDIRS) \
### Define custom targets ### Define custom targets
$(LIBFILE): $(MAINFILE) $(PROJECT_OBJECTFILES) $(DEPFILE) $(LIBFILE): $(MAINFILE) $(PROJECT_OBJECTFILES) $(DEPFILE)
${CONTIKI}/tools/make-symbols-nm $(LIBFILE)
$(CC) $(CFLAGS) -c symbols.c -o $(OBJECTDIR)/symbols.o
$(LD) -Map=$(MAPFILE) -shared $(LD_ARGS_1) -o $@ $^ $(LD_ARGS_2)
${CONTIKI}/tools/make-symbols-nm $(LIBFILE)
$(CC) $(CFLAGS) -c symbols.c -o $(OBJECTDIR)/symbols.o
$(LD) -Map=$(MAPFILE) -shared $(LD_ARGS_1) -o $@ $^ $(LD_ARGS_2) $(LD) -Map=$(MAPFILE) -shared $(LD_ARGS_1) -o $@ $^ $(LD_ARGS_2)
$(DEPFILE): ${addprefix $(OBJECTDIR)/, $(CONTIKI_SOURCEFILES:.c=.o)} $(DEPFILE): ${addprefix $(OBJECTDIR)/, $(CONTIKI_SOURCEFILES:.c=.o)}

6
platform/cooja/dev/cfs-cooja.c → platform/cooja/cfs/cfs-cooja.c
View file

@ -28,10 +28,10 @@
* *
* 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/11 14:16:10 fros4943 Exp $ * $Id: cfs-cooja.c,v 1.1 2006/10/23 16:07:29 fros4943 Exp $
*/ */
#include <string.h> #include <string.h>
#include "dev/cfs-cooja.h" #include "cfs/cfs-cooja.h"
#include "lib/simEnvChange.h" #include "lib/simEnvChange.h"
#include "cfs/cfs.h" #include "cfs/cfs.h"
@ -51,7 +51,7 @@ const struct simInterface cfs_interface;
// COOJA variables // COOJA variables
#define CFS_BUF_SIZE 60*1024 #define CFS_BUF_SIZE 60*1024
char simCFSData[CFS_BUF_SIZE]; char simCFSData[CFS_BUF_SIZE] = { 0 };
char simCFSChanged = 0; char simCFSChanged = 0;
int simCFSRead = 0; int simCFSRead = 0;
int simCFSWritten = 0; int simCFSWritten = 0;

2
platform/cooja/dev/cfs-cooja.h → platform/cooja/cfs/cfs-cooja.h
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: cfs-cooja.h,v 1.1 2006/10/11 14:16:10 fros4943 Exp $ * $Id: cfs-cooja.h,v 1.1 2006/10/23 16:07:29 fros4943 Exp $
*/ */
#ifndef __CFS_COOJA_H__ #ifndef __CFS_COOJA_H__
#define __CFS_COOJA_H__ #define __CFS_COOJA_H__

4
tools/cooja/config/code_main_template
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: code_main_template,v 1.11 2006/10/11 14:16:47 fros4943 Exp $ * $Id: code_main_template,v 1.12 2006/10/23 16:09:15 fros4943 Exp $
*/ */
/** /**
@ -70,7 +70,7 @@
#include "lib/sensors.h" #include "lib/sensors.h"
#include "net/uip.h" #include "net/uip.h"
#include "dev/radio-arch.h" #include "dev/radio-arch.h"
#include "dev/cfs-cooja.h" #include "cfs/cfs-cooja.h"
#include "sys/etimer.h" #include "sys/etimer.h"
#include "sys/cooja_mt.h" #include "sys/cooja_mt.h"