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

Merge pull request #499 from adamdunkels/bold/modularize-everything

Browse source 
A bold move: modularize everything
This commit is contained in:
Adam Dunkels 2014-01-29 08:17:10 -08:00
parent e10d462931 4f498e2eac
commit 765e9acded
386 changed files with 836 additions and 1065 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
Makefile.include
View file

@ -58,25 +58,7 @@ UPPERCASE = _ABCDEFGHIJKLMNOPQRSTUVWXYZ
TARGET_UPPERCASE := ${strip ${shell echo $(TARGET) | sed y!$(LOWERCASE)!$(UPPERCASE)!}} TARGET_UPPERCASE := ${strip ${shell echo $(TARGET) | sed y!$(LOWERCASE)!$(UPPERCASE)!}}
CFLAGS += -DCONTIKI=1 -DCONTIKI_TARGET_$(TARGET_UPPERCASE)=1 CFLAGS += -DCONTIKI=1 -DCONTIKI_TARGET_$(TARGET_UPPERCASE)=1
include $(CONTIKI)/core/net/rime/Makefile.rime MODULES += core/sys core/dev core/lib
include $(CONTIKI)/core/net/mac/Makefile.mac
SYSTEM = process.c procinit.c autostart.c elfloader.c \
compower.c serial-line.c
THREADS = mt.c
LIBS = memb.c mmem.c timer.c list.c etimer.c ctimer.c energest.c rtimer.c stimer.c trickle-timer.c \
print-stats.c ifft.c crc16.c random.c ringbuf.c settings.c
DEV = nullradio.c
include $(CONTIKI)/core/net/Makefile.uip
include $(CONTIKI)/core/net/rpl/Makefile.rpl
CTK = ctk.c
ifndef CONTIKI_NO_NET
CONTIKIFILES = $(SYSTEM) $(LIBS) $(NET) $(THREADS) $(DHCP) $(DEV)
else
CONTIKIFILES = $(SYSTEM) $(LIBS) $(THREADS) $(DEV) sicslowpan.c fakeuip.c
endif
CONTIKI_SOURCEFILES += $(CONTIKIFILES) CONTIKI_SOURCEFILES += $(CONTIKIFILES)
@ -93,6 +75,8 @@ PROJECT_OBJECTFILES = ${addprefix $(OBJECTDIR)/,${call oname, $(PROJECT_SOURCEFI
$(OBJECTDIR): $(OBJECTDIR):
mkdir $@ mkdir $@
uniq = $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1)))
### Include application makefiles ### Include application makefiles
ifdef APPS ifdef APPS
@ -121,17 +105,13 @@ else
include $(target_makefile) include $(target_makefile)
endif endif
ifdef PLATFORMAPPS ifdef MODULES
PLATFORMAPPDS = ${wildcard ${foreach DIR, $(APPDIRS), ${addprefix $(DIR)/, $(PLATFORMAPPS)}}} \ UNIQUEMODULES = $(call uniq,$(MODULES))
${wildcard ${addprefix $(CONTIKI)/apps/, $(PLATFORMAPPS)} \ MODULESSUBST = ${subst /,-,$(UNIQUEMODULES)}
${addprefix $(CONTIKI)/platform/$(TARGET)/apps/, $(PLATFORMAPPS)} \ MODULEDIRS = ${wildcard ${addprefix $(CONTIKI)/, $(UNIQUEMODULES)}}
$(PLATFORMAPPS)} MODULES_SOURCES = ${foreach d, $(MODULEDIRS), ${subst ${d}/,,${wildcard $(d)/*.c}}}
PLATFORMAPPINCLUDES = ${foreach APP, $(PLATFORMAPPS), \ CONTIKI_SOURCEFILES += $(MODULES_SOURCES)
${wildcard ${foreach DIR, $(PLATFORMAPPDS), $(DIR)/Makefile.$(APP)}}} APPDS += $(MODULEDIRS)
-include $(PLATFORMAPPINCLUDES)
PLATFORMAPP_SOURCES = ${foreach APP, $(PLATFORMAPPS), $($(APP)_src)}
CONTIKI_SOURCEFILES += $(PLATFORMAPP_SOURCES)
APPDS += $(PLATFORMAPPDS)
endif endif
### Verbosity control. Use make V=1 to get verbose builds. ### Verbosity control. Use make V=1 to get verbose builds.
@ -168,7 +148,7 @@ SOURCEDIRS = . $(PROJECTDIRS) $(CONTIKI_TARGET_DIRS_CONCAT) \
vpath %.c $(SOURCEDIRS) vpath %.c $(SOURCEDIRS)
vpath %.S $(SOURCEDIRS) vpath %.S $(SOURCEDIRS)
CFLAGS += ${addprefix -I,$(SOURCEDIRS)} CFLAGS += ${addprefix -I,$(SOURCEDIRS) $(CONTIKI)}
### Check for a git repo and pass version if found ### Check for a git repo and pass version if found
### git.exe in Windows cmd shells may require no stderr redirection ### git.exe in Windows cmd shells may require no stderr redirection
@ -205,6 +185,8 @@ clean:
distclean: clean distclean: clean
-rm -rf $(CONTIKI_PROJECT).$(TARGET) -rm -rf $(CONTIKI_PROJECT).$(TARGET)
-include $(CONTIKI)/platform/$(TARGET)/Makefile.customrules-$(TARGET)
ifndef CUSTOM_RULE_C_TO_CE ifndef CUSTOM_RULE_C_TO_CE
%.ce: %.c %.ce: %.c
$(TRACE_CC) $(TRACE_CC)

2
apps/antelope/aql-adt.c
View file

@ -42,7 +42,7 @@
#include "aql.h" #include "aql.h"
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
static unsigned char char_buf[DB_MAX_CHAR_SIZE_PER_ROW]; static unsigned char char_buf[DB_MAX_CHAR_SIZE_PER_ROW];
static uint8_t next_free_offset; static uint8_t next_free_offset;

2
apps/antelope/aql-exec.c
View file

@ -42,7 +42,7 @@
#include <string.h> #include <string.h>
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
#include "index.h" #include "index.h"
#include "relation.h" #include "relation.h"

2
apps/antelope/index-inline.c
View file

@ -48,7 +48,7 @@
#include "storage.h" #include "storage.h"
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
struct search_handle { struct search_handle {
index_t *index; index_t *index;

2
apps/antelope/index-maxheap.c
View file

@ -64,7 +64,7 @@
#include "storage.h" #include "storage.h"
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
#define BRANCH_FACTOR 2 #define BRANCH_FACTOR 2
#define BUCKET_SIZE 128 #define BUCKET_SIZE 128

2
apps/antelope/index-memhash.c
View file

@ -42,7 +42,7 @@
#include "index.h" #include "index.h"
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
static db_result_t create(index_t *); static db_result_t create(index_t *);
static db_result_t destroy(index_t *); static db_result_t destroy(index_t *);

2
apps/antelope/index.c
View file

@ -40,7 +40,7 @@
#include "lib/list.h" #include "lib/list.h"
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
#include "antelope.h" #include "antelope.h"
#include "attribute.h" #include "attribute.h"

2
apps/antelope/relation.c
View file

@ -42,7 +42,7 @@
#include "lib/memb.h" #include "lib/memb.h"
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
#include "db-options.h" #include "db-options.h"
#include "index.h" #include "index.h"

2
apps/antelope/result.c
View file

@ -37,7 +37,7 @@
#include <string.h> #include <string.h>
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
#include "result.h" #include "result.h"
#include "storage.h" #include "storage.h"

2
apps/antelope/storage-cfs.c
View file

@ -43,7 +43,7 @@
#include "lib/random.h" #include "lib/random.h"
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
#include "db-options.h" #include "db-options.h"
#include "storage.h" #include "storage.h"

2
apps/codeprop/codeprop.c
View file

@ -71,7 +71,7 @@
#include "sys/clock.h" #include "sys/clock.h"
#include "loader/elfloader.h" #include "loader/elfloader.h"
#include "net/tcpip.h" #include "net/ip/tcpip.h"
#include "dev/eeprom.h" #include "dev/eeprom.h"
#include "dev/leds.h" #include "dev/leds.h"

2
apps/codeprop/tcp_loader.c
View file

@ -37,7 +37,7 @@
#include "sys/etimer.h" #include "sys/etimer.h"
#include "loader/elfloader_compat.h" #include "loader/elfloader_compat.h"
#include "net/uip.h" #include "net/ip/uip.h"
#include "dev/xmem.h" #include "dev/xmem.h"

2
apps/codeprop/tcp_loader2.c
View file

@ -39,7 +39,7 @@
#include "loader/cle.h" #include "loader/cle.h"
#include "loader/cmod.h" #include "loader/cmod.h"
#include "net/uip.h" #include "net/ip/uip.h"
#include "dev/xmem.h" #include "dev/xmem.h"

4
apps/collect-view/collect-view-sky.c
View file

@ -1,9 +1,9 @@
#include "collect-view.h" #include "collect-view.h"
#include "dev/cc2420.h" #include "cc2420.h"
#include "dev/leds.h" #include "dev/leds.h"
#include "dev/light-sensor.h" #include "dev/light-sensor.h"
#include "dev/battery-sensor.h" #include "dev/battery-sensor.h"
#include "dev/sht11-sensor.h" #include "dev/sht11/sht11-sensor.h"
#include "collect-view-sky.h" #include "collect-view-sky.h"

2
apps/collect-view/collect-view-z1.c
View file

@ -1,5 +1,5 @@
#include "collect-view.h" #include "collect-view.h"
#include "dev/cc2420.h" #include "cc2420.h"
#include "dev/leds.h" #include "dev/leds.h"
#include "dev/i2cmaster.h" #include "dev/i2cmaster.h"
#include "dev/tmp102.h" #include "dev/tmp102.h"

2
apps/collect-view/collect-view.c
View file

@ -39,7 +39,7 @@
#include "contiki.h" #include "contiki.h"
#include "net/rime/collect-neighbor.h" #include "net/rime/collect-neighbor.h"
#include "net/rime.h" #include "net/rime/rime.h"
#include "net/rime/timesynch.h" #include "net/rime/timesynch.h"
#include "collect-view.h" #include "collect-view.h"

2
apps/collect-view/collect-view.h
View file

@ -2,7 +2,7 @@
#define COLLECT_VIEW_H #define COLLECT_VIEW_H
#include "contiki-conf.h" #include "contiki-conf.h"
#include "net/rime/rimeaddr.h" #include "net/rimeaddr.h"
#include "net/rime/collect.h" #include "net/rime/collect.h"
struct collect_view_data_msg { struct collect_view_data_msg {

2
apps/deluge/deluge.c
View file

@ -41,7 +41,7 @@
*/ */
#include "contiki.h" #include "contiki.h"
#include "net/rime.h" #include "net/rime/rime.h"
#include "cfs/cfs.h" #include "cfs/cfs.h"
#include "loader/elfloader.h" #include "loader/elfloader.h"
#include "lib/crc16.h" #include "lib/crc16.h"

2
apps/deluge/deluge.h
View file

@ -40,7 +40,7 @@
#ifndef DELUGE_H #ifndef DELUGE_H
#define DELUGE_H #define DELUGE_H
#include "net/rime.h" #include "net/rime/rime.h"
PROCESS_NAME(deluge_process); PROCESS_NAME(deluge_process);

2
apps/dhcp/dhcp.c
View file

@ -1,6 +1,6 @@
#include "contiki-net.h" #include "contiki-net.h"
#include "ctk/ctk.h" #include "ctk/ctk.h"
#include "net/dhcpc.h" #include "net/ip/dhcpc.h"

2
apps/email/email.c
View file

@ -38,7 +38,7 @@
#include "smtp.h" #include "smtp.h"
#include "lib/petsciiconv.h" #include "lib/petsciiconv.h"
#include "lib/ctk-textentry-multiline.h" #include "ctk/ctk-textentry-multiline.h"
#include <string.h> #include <string.h>

2
apps/ftp/ftp.c
View file

@ -40,7 +40,7 @@
#include "contiki.h" #include "contiki.h"
#include "ctk/ctk.h" #include "ctk/ctk.h"
#include "cfs/cfs.h" #include "cfs/cfs.h"
#include "net/resolv.h" #include "net/ip/resolv.h"
#define MAX_USERNAMELEN 16 #define MAX_USERNAMELEN 16
#define MAX_PASSWORDLEN 16 #define MAX_PASSWORDLEN 16

2
apps/irc/irc.c
View file

@ -41,7 +41,7 @@
#include "ircc.h" #include "ircc.h"
#include "ctk/ctk.h" #include "ctk/ctk.h"
#include "lib/ctk-textentry-cmdline.h" #include "ctk/ctk-textentry-cmdline.h"
#include "lib/petsciiconv.h" #include "lib/petsciiconv.h"

2
apps/powertrace/powertrace.c
View file

@ -41,7 +41,7 @@
#include "contiki-lib.h" #include "contiki-lib.h"
#include "sys/compower.h" #include "sys/compower.h"
#include "powertrace.h" #include "powertrace.h"
#include "net/rime.h" #include "net/rime/rime.h"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>

2
apps/serial-shell/serial-shell.c
View file

@ -45,7 +45,7 @@
#include "shell.h" #include "shell.h"
#include "dev/serial-line.h" #include "dev/serial-line.h"
#include "net/rime.h" #include "net/rime/rime.h"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>

4
apps/servreg-hack/servreg-hack.c
View file

@ -44,9 +44,9 @@
#include "contiki-lib.h" #include "contiki-lib.h"
#include "contiki-net.h" #include "contiki-net.h"
#include "net/uip.h" #include "net/ip/uip.h"
#include "net/uip-ds6.h" #include "net/ipv6/uip-ds6.h"
#include "servreg-hack.h" #include "servreg-hack.h"

2
apps/servreg-hack/servreg-hack.h
View file

@ -64,7 +64,7 @@
#define SERVREG_HACK_H #define SERVREG_HACK_H
#include "contiki-conf.h" #include "contiki-conf.h"
#include "net/uip.h" #include "net/ip/uip.h"
typedef uint8_t servreg_hack_id_t; typedef uint8_t servreg_hack_id_t;
typedef void servreg_hack_item_t; typedef void servreg_hack_item_t;

2
apps/shell/gui-shell.c
View file

@ -36,7 +36,7 @@
#include "shell.h" #include "shell.h"
#include "lib/ctk-textentry-cmdline.h" #include "ctk/ctk-textentry-cmdline.h"
#include <string.h> #include <string.h>

2
apps/shell/shell-download.c
View file

@ -41,7 +41,7 @@
#include "contiki.h" #include "contiki.h"
#include "shell.h" #include "shell.h"
#include "net/rime.h" #include "net/rime/rime.h"
#include "cfs/cfs.h" #include "cfs/cfs.h"
#include "dev/leds.h" #include "dev/leds.h"

2
apps/shell/shell-netfile.c
View file

@ -39,7 +39,7 @@
#include "contiki.h" #include "contiki.h"
#include "shell-netfile.h" #include "shell-netfile.h"
#include "net/rime.h" #include "net/rime/rime.h"
#include "net/rime/rudolph0.h" #include "net/rime/rudolph0.h"
#include "dev/leds.h" #include "dev/leds.h"

2
apps/shell/shell-netperf.c
View file

@ -39,7 +39,7 @@
#include "contiki.h" #include "contiki.h"
#include "shell-netperf.h" #include "shell-netperf.h"
#include "net/rime.h" #include "net/rime/rime.h"
#include "contiki-conf.h" #include "contiki-conf.h"
#include <stdio.h> #include <stdio.h>

2
apps/shell/shell-rime-debug-runicast.c
View file

@ -45,7 +45,7 @@
#include "lib/random.h" #include "lib/random.h"
#include "net/rime.h" #include "net/rime/rime.h"
#include "net/rime/route.h" #include "net/rime/route.h"
#include "net/rime/trickle.h" #include "net/rime/trickle.h"

2
apps/shell/shell-rime-debug.c
View file

@ -45,7 +45,7 @@
#include "lib/random.h" #include "lib/random.h"
#include "net/rime.h" #include "net/rime/rime.h"
#include "net/rime/route.h" #include "net/rime/route.h"
#include "net/rime/trickle.h" #include "net/rime/trickle.h"

2
apps/shell/shell-rime-neighbors.c
View file

@ -39,7 +39,7 @@
#include <string.h> #include <string.h>
#include "shell.h" #include "shell.h"
#include "net/rime.h" #include "net/rime/rime.h"
PROCESS(shell_neighbors_process, "neighbors"); PROCESS(shell_neighbors_process, "neighbors");
SHELL_COMMAND(neighbors_command, SHELL_COMMAND(neighbors_command,

2
apps/shell/shell-rime-netcmd.c
View file

@ -46,7 +46,7 @@
#include "lib/crc16.h" #include "lib/crc16.h"
#include "lib/random.h" #include "lib/random.h"
#include "net/rime.h" #include "net/rime/rime.h"
#include "net/rime/route.h" #include "net/rime/route.h"
#include "net/rime/trickle.h" #include "net/rime/trickle.h"

2
apps/shell/shell-rime-ping.c
View file

@ -39,7 +39,7 @@
#include "shell.h" #include "shell.h"
#include "net/rime.h" #include "net/rime/rime.h"
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>

2
apps/shell/shell-rime-sendcmd.c
View file

@ -39,7 +39,7 @@
#include "lib/crc16.h" #include "lib/crc16.h"
#include "lib/random.h" #include "lib/random.h"
#include "net/rime.h" #include "net/rime/rime.h"
#include "net/rime/unicast.h" #include "net/rime/unicast.h"
#include "net/rime/timesynch.h" #include "net/rime/timesynch.h"

2
apps/shell/shell-rime-sniff.c
View file

@ -38,7 +38,7 @@
*/ */
#include "shell.h" #include "shell.h"
#include "net/rime.h" #include "net/rime/rime.h"
static uint8_t sniff_for_attributes; static uint8_t sniff_for_attributes;

2
apps/shell/shell-rime-unicast.c
View file

@ -45,7 +45,7 @@
#include "lib/random.h" #include "lib/random.h"
#include "net/rime.h" #include "net/rime/rime.h"
#include "net/rime/route.h" #include "net/rime/route.h"
#include "net/rime/trickle.h" #include "net/rime/trickle.h"

2
apps/shell/shell-rime.c
View file

@ -46,7 +46,7 @@
#include "lib/crc16.h" #include "lib/crc16.h"
#include "lib/random.h" #include "lib/random.h"
#include "net/rime.h" #include "net/rime/rime.h"
#include "net/netstack.h" #include "net/netstack.h"
#include "net/rime/route.h" #include "net/rime/route.h"

2
apps/shell/shell-rsh.c
View file

@ -40,7 +40,7 @@
#include "contiki.h" #include "contiki.h"
#include "shell.h" #include "shell.h"
#include "net/rime.h" #include "net/rime/rime.h"
#include "net/rime/meshconn.h" #include "net/rime/meshconn.h"
#include <stdio.h> #include <stdio.h>

2
apps/shell/shell-sendtest.c
View file

@ -39,7 +39,7 @@
#include "contiki.h" #include "contiki.h"
#include "shell-ps.h" #include "shell-ps.h"
#include "net/rime.h" #include "net/rime/rime.h"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>

8
apps/shell/shell-sky.c
View file

@ -42,14 +42,14 @@
#include "dev/watchdog.h" #include "dev/watchdog.h"
#include "net/rime.h" #include "net/rime/rime.h"
#include "net/netstack.h" #include "net/netstack.h"
#include "dev/cc2420.h" #include "cc2420.h"
#include "dev/leds.h" #include "dev/leds.h"
#include "dev/sht11.h" #include "dev/sht11/sht11.h"
#include "dev/light-sensor.h" #include "dev/light-sensor.h"
#include "dev/battery-sensor.h" #include "dev/battery-sensor.h"
#include "dev/sht11-sensor.h" #include "dev/sht11/sht11-sensor.h"
#include "net/rime/timesynch.h" #include "net/rime/timesynch.h"
#include "sys/node-id.h" #include "sys/node-id.h"

2
apps/shell/shell.c
View file

@ -45,7 +45,7 @@
#include "contiki.h" #include "contiki.h"
#include "contiki-lib.h" #include "contiki-lib.h"
#include "net/rime.h" #include "net/rime/rime.h"
#include "shell.h" #include "shell.h"

2
apps/slip-cmd/packetutils.c
View file

@ -30,7 +30,7 @@
#include "contiki.h" #include "contiki.h"
#include "net/packetbuf.h" #include "net/packetbuf.h"
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
int int

2
apps/webbrowser/www.c
View file

@ -36,7 +36,7 @@
#include <stddef.h> #include <stddef.h>
#include "ctk/ctk.h" #include "ctk/ctk.h"
#include "lib/ctk-textentry-cmdline.h" #include "ctk/ctk-textentry-cmdline.h"
#include "contiki-net.h" #include "contiki-net.h"
#include "lib/petsciiconv.h" #include "lib/petsciiconv.h"
#include "sys/arg.h" #include "sys/arg.h"

26
core/contiki-net.h
View file

@ -36,25 +36,25 @@
#include "contiki.h" #include "contiki.h"
#include "net/tcpip.h" #include "net/ip/tcpip.h"
#include "net/uip.h" #include "net/ip/uip.h"
#include "net/uip-fw.h" #include "net/ipv4/uip-fw.h"
#include "net/uip-fw-drv.h" #include "net/ipv4/uip-fw-drv.h"
#include "net/uip_arp.h" #include "net/ipv4/uip_arp.h"
#include "net/uiplib.h" #include "net/ip/uiplib.h"
#include "net/uip-udp-packet.h" #include "net/ip/uip-udp-packet.h"
#include "net/simple-udp.h" #include "net/ip/simple-udp.h"
#if UIP_CONF_IPV6 #if UIP_CONF_IPV6
#include "net/uip-icmp6.h" #include "net/ipv6/uip-icmp6.h"
#include "net/uip-ds6.h" #include "net/ipv6/uip-ds6.h"
#endif /* UIP_CONF_IPV6 */ #endif /* UIP_CONF_IPV6 */
#include "net/resolv.h" #include "net/ip/resolv.h"
#include "net/psock.h" #include "net/ip/psock.h"
#include "net/rime.h" #include "net/rime/rime.h"
#include "net/netstack.h" #include "net/netstack.h"

2
core/lib/ctk-filedialog.c → core/ctk/ctk-filedialog.c
View file

@ -33,7 +33,7 @@
*/ */
#include "contiki.h" #include "contiki.h"
#include "lib/ctk-filedialog.h" #include "ctk/ctk-filedialog.h"
#include "ctk/ctk.h" #include "ctk/ctk.h"
#include "cfs/cfs.h" #include "cfs/cfs.h"

0
core/lib/ctk-filedialog.h → core/ctk/ctk-filedialog.h
View file

0
core/lib/ctk-textentry-checkbox.c → core/ctk/ctk-textentry-checkbox.c
View file

0
core/lib/ctk-textentry-checkbox.h → core/ctk/ctk-textentry-checkbox.h
View file

2
core/lib/ctk-textentry-cmdline.c → core/ctk/ctk-textentry-cmdline.c
View file

@ -34,7 +34,7 @@
#include "ctk/ctk.h" #include "ctk/ctk.h"
#include "lib/ctk-textentry-cmdline.h" #include "ctk/ctk-textentry-cmdline.h"
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
unsigned char unsigned char

0
core/lib/ctk-textentry-cmdline.h → core/ctk/ctk-textentry-cmdline.h
View file

2
core/lib/ctk-textentry-multiline.c → core/ctk/ctk-textentry-multiline.c
View file

@ -36,7 +36,7 @@
#include "ctk/ctk.h" #include "ctk/ctk.h"
#include "lib/ctk-textentry-multiline.h" #include "ctk/ctk-textentry-multiline.h"
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
unsigned char unsigned char

0
core/lib/ctk-textentry-multiline.h → core/ctk/ctk-textentry-multiline.h
View file

0
core/lib/libconio.c → core/ctk/libconio/libconio.c
View file

0
core/lib/libconio.h → core/ctk/libconio/libconio.h
View file

4
core/dev/slip.c
View file

@ -37,8 +37,8 @@
#include "contiki.h" #include "contiki.h"
#include "net/uip.h" #include "net/ip/uip.h"
#include "net/uip-fw.h" #include "net/ipv4/uip-fw.h"
#define BUF ((struct uip_tcpip_hdr *)&uip_buf[UIP_LLH_LEN]) #define BUF ((struct uip_tcpip_hdr *)&uip_buf[UIP_LLH_LEN])
#include "dev/slip.h" #include "dev/slip.h"

2
core/lib/print-stats.c
View file

@ -39,7 +39,7 @@
#include "lib/print-stats.h" #include "lib/print-stats.h"
#include "net/rime.h" #include "net/rime/rime.h"
#include "sys/energest.h" #include "sys/energest.h"
#include <stdio.h> #include <stdio.h>

0
core/lib/strncasecmp.c → core/lib/strncasecmp/strncasecmp.c
View file

31
core/net/Makefile.uip
View file

@ -1,31 +0,0 @@
NET = \
dhcpc.c \
nbr-table.c \
netstack.c \
packetbuf.c \
packetqueue.c \
psock.c \
queuebuf.c \
resolv.c \
sicslowpan.c \
simple-udp.c \
tcpip.c \
uaodv-rt.c \
uaodv.c \
uip-debug.c \
uip-ds6-route.c \
uip-ds6-nbr.c \
uip-ds6.c \
uip-fw-drv.c \
uip-fw.c \
uip-icmp6.c \
uip-nd6.c \
uip-neighbor.c \
uip-over-mesh.c \
uip-packetqueue.c \
uip-split.c \
uip-udp-packet.c \
uip.c \
uip6.c \
uip_arp.c \
uiplib.c

2
core/net/dhcpc.c → core/net/ip/dhcpc.c
View file

@ -35,7 +35,7 @@
#include "contiki.h" #include "contiki.h"
#include "contiki-net.h" #include "contiki-net.h"
#include "net/dhcpc.h" #include "net/ip/dhcpc.h"
#define STATE_INITIAL 0 #define STATE_INITIAL 0
#define STATE_SENDING 1 #define STATE_SENDING 1

0
core/net/dhcpc.h → core/net/ip/dhcpc.h
View file

2
core/net/psock.c → core/net/ip/psock.c
View file

@ -34,7 +34,7 @@
#include <string.h> #include <string.h>
#include "net/psock.h" #include "net/ip/psock.h"
#define STATE_NONE 0 #define STATE_NONE 0
#define STATE_ACKED 1 #define STATE_ACKED 1

0
core/net/psock.h → core/net/ip/psock.h
View file

8
core/net/resolv.c → core/net/ip/resolv.c
View file

@ -62,9 +62,9 @@
* *
*/ */
#include "net/tcpip.h" #include "net/ip/tcpip.h"
#include "net/resolv.h" #include "net/ip/resolv.h"
#include "net/uip-udp-packet.h" #include "net/ip/uip-udp-packet.h"
#include "lib/random.h" #include "lib/random.h"
#ifndef DEBUG #ifndef DEBUG
@ -318,7 +318,7 @@ static const uip_ipaddr_t resolv_mdns_addr =
#if UIP_CONF_IPV6 #if UIP_CONF_IPV6
{ { 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, { { 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfb } }; 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfb } };
#include "net/uip-ds6.h" #include "net/ipv6/uip-ds6.h"
#else /* UIP_CONF_IPV6 */ #else /* UIP_CONF_IPV6 */
{ { 224, 0, 0, 251 } }; { { 224, 0, 0, 251 } };
#endif /* UIP_CONF_IPV6 */ #endif /* UIP_CONF_IPV6 */

0
core/net/resolv.h → core/net/ip/resolv.h
View file

2
core/net/simple-udp.c → core/net/ip/simple-udp.c
View file

@ -42,7 +42,7 @@
*/ */
#include "contiki-net.h" #include "contiki-net.h"
#include "net/simple-udp.h" #include "net/ip/simple-udp.h"
#include <string.h> #include <string.h>

2
core/net/simple-udp.h → core/net/ip/simple-udp.h
View file

@ -53,7 +53,7 @@
#ifndef SIMPLE_UDP_H #ifndef SIMPLE_UDP_H
#define SIMPLE_UDP_H #define SIMPLE_UDP_H
#include "net/uip.h" #include "net/ip/uip.h"
struct simple_udp_connection; struct simple_udp_connection;

5
core/net/slipdev.c → core/net/ip/slipdev.c
View file

@ -66,7 +66,6 @@
*/ */
#include "uip.h" #include "uip.h"
#include "uip-fw.h"
#include "slipdev.h" #include "slipdev.h"
#include <string.h> /* For memcpy() */ #include <string.h> /* For memcpy() */
@ -89,7 +88,7 @@ static uint8_t lastc;
* from the uip_buf buffer, and the following bytes (the application * from the uip_buf buffer, and the following bytes (the application
* data) are read from the uip_appdata buffer. * data) are read from the uip_appdata buffer.
* *
* \return This function will always return UIP_FW_OK. * \return This function will always return 0.
*/ */
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
uint8_t uint8_t
@ -123,7 +122,7 @@ slipdev_send(void)
} }
slipdev_char_put(SLIP_END); slipdev_char_put(SLIP_END);
return UIP_FW_OK; return 0;
} }
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
/** /**

0
core/net/slipdev.h → core/net/ip/slipdev.h
View file

10
core/net/tcpip.c → core/net/ip/tcpip.c
View file

@ -39,18 +39,18 @@
*/ */
#include "contiki-net.h" #include "contiki-net.h"
#include "net/uip-split.h" #include "net/ip/uip-split.h"
#include "net/uip-packetqueue.h" #include "net/ip/uip-packetqueue.h"
#if UIP_CONF_IPV6 #if UIP_CONF_IPV6
#include "net/uip-nd6.h" #include "net/ipv6/uip-nd6.h"
#include "net/uip-ds6.h" #include "net/ipv6/uip-ds6.h"
#endif #endif
#include <string.h> #include <string.h>
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
#if UIP_LOGGING #if UIP_LOGGING
#include <stdio.h> #include <stdio.h>

2
core/net/tcpip.h → core/net/ip/tcpip.h
View file

@ -84,7 +84,7 @@ struct tcpip_uipstate {
typedef struct tcpip_uipstate uip_udp_appstate_t; typedef struct tcpip_uipstate uip_udp_appstate_t;
typedef struct tcpip_uipstate uip_tcp_appstate_t; typedef struct tcpip_uipstate uip_tcp_appstate_t;
typedef struct tcpip_uipstate uip_icmp6_appstate_t; typedef struct tcpip_uipstate uip_icmp6_appstate_t;
#include "net/uip.h" #include "net/ip/uip.h"
void tcpip_uipcall(void); void tcpip_uipcall(void);
/** /**

2
core/net/uip-debug.c → core/net/ip/uip-debug.c
View file

@ -37,7 +37,7 @@
* Joakim Eriksson <joakime@sics.se> * Joakim Eriksson <joakime@sics.se>
*/ */
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
void void

2
core/net/uip-debug.h → core/net/ip/uip-debug.h
View file

@ -41,7 +41,7 @@
#ifndef UIP_DEBUG_H #ifndef UIP_DEBUG_H
#define UIP_DEBUG_H #define UIP_DEBUG_H
#include "net/uip.h" #include "net/ip/uip.h"
#include <stdio.h> #include <stdio.h>
void uip_debug_ipaddr_print(const uip_ipaddr_t *addr); void uip_debug_ipaddr_print(const uip_ipaddr_t *addr);

4
core/net/uip-packetqueue.c → core/net/ip/uip-packetqueue.c
View file

@ -1,10 +1,10 @@
#include <stdio.h> #include <stdio.h>
#include "net/uip.h" #include "net/ip/uip.h"
#include "lib/memb.h" #include "lib/memb.h"
#include "net/uip-packetqueue.h" #include "net/ip/uip-packetqueue.h"
#define MAX_NUM_QUEUED_PACKETS 2 #define MAX_NUM_QUEUED_PACKETS 2
MEMB(packets_memb, struct uip_packetqueue_packet, MAX_NUM_QUEUED_PACKETS); MEMB(packets_memb, struct uip_packetqueue_packet, MAX_NUM_QUEUED_PACKETS);

0
core/net/uip-packetqueue.h → core/net/ip/uip-packetqueue.h
View file

10
core/net/uip-split.c → core/net/ip/uip-split.c
View file

@ -34,12 +34,12 @@
#include <string.h> #include <string.h>
#include "net/uip-split.h" #include "net/ip/uip-split.h"
#include "net/uip.h" #include "net/ip/uip.h"
#include "net/uip-fw.h" #include "net/ipv4/uip-fw.h"
#include "net/uip_arch.h" #include "net/ip/uip_arch.h"
#include "net/tcpip.h" #include "net/ip/tcpip.h"
#define BUF ((struct uip_tcpip_hdr *)&uip_buf[UIP_LLH_LEN]) #define BUF ((struct uip_tcpip_hdr *)&uip_buf[UIP_LLH_LEN])

0
core/net/uip-split.h → core/net/ip/uip-split.h
View file

2
core/net/uip-udp-packet.c → core/net/ip/uip-udp-packet.c
View file

@ -41,7 +41,7 @@
extern uint16_t uip_slen; extern uint16_t uip_slen;
#include "net/uip-udp-packet.h" #include "net/ip/uip-udp-packet.h"
#include <string.h> #include <string.h>

2
core/net/uip-udp-packet.h → core/net/ip/uip-udp-packet.h
View file

@ -40,7 +40,7 @@
#ifndef UIP_UDP_PACKET_H_ #ifndef UIP_UDP_PACKET_H_
#define UIP_UDP_PACKET_H_ #define UIP_UDP_PACKET_H_
#include "net/uip.h" #include "net/ip/uip.h"
void uip_udp_packet_send(struct uip_udp_conn *c, const void *data, int len); void uip_udp_packet_send(struct uip_udp_conn *c, const void *data, int len);
void uip_udp_packet_sendto(struct uip_udp_conn *c, const void *data, int len, void uip_udp_packet_sendto(struct uip_udp_conn *c, const void *data, int len,

4
core/net/uip.h → core/net/ip/uip.h
View file

@ -90,7 +90,7 @@
#endif /*UIP_CONF_IPV6*/ #endif /*UIP_CONF_IPV6*/
#include "net/uipopt.h" #include "net/ip/uipopt.h"
/** /**
* Representation of an IP address. * Representation of an IP address.
@ -153,7 +153,7 @@ typedef uip_eth_addr uip_lladdr_t;
#endif /*UIP_CONF_LL_80211*/ #endif /*UIP_CONF_LL_80211*/
#endif /*UIP_CONF_LL_802154*/ #endif /*UIP_CONF_LL_802154*/
#include "net/tcpip.h" #include "net/ip/tcpip.h"
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* First, the functions that should be called from the /* First, the functions that should be called from the

2
core/net/uip_arch.h → core/net/ip/uip_arch.h
View file

@ -60,7 +60,7 @@
#ifndef UIP_ARCH_H_ #ifndef UIP_ARCH_H_
#define UIP_ARCH_H_ #define UIP_ARCH_H_
#include "net/uip.h" #include "net/ip/uip.h"
/** /**
* Carry out a 32-bit addition. * Carry out a 32-bit addition.

6
core/net/uiplib.c → core/net/ip/uiplib.c
View file

@ -33,12 +33,12 @@
*/ */
#include "net/uip.h" #include "net/ip/uip.h"
#include "net/uiplib.h" #include "net/ip/uiplib.h"
#include <string.h> #include <string.h>
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/uip-debug.h" #include "net/ip/uip-debug.h"
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
#if UIP_CONF_IPV6 #if UIP_CONF_IPV6

2
core/net/uiplib.h → core/net/ip/uiplib.h
View file

@ -42,7 +42,7 @@
#ifndef UIPLIB_H_ #ifndef UIPLIB_H_
#define UIPLIB_H_ #define UIPLIB_H_
#include "net/uip.h" #include "net/ip/uip.h"
/** /**
* \addtogroup uipconvfunc * \addtogroup uipconvfunc

0
core/net/uipopt.h → core/net/ip/uipopt.h
View file

2
core/net/uaodv-def.h → core/net/ipv4/uaodv-def.h
View file

@ -40,7 +40,7 @@
#ifndef UAODV_DEF_H_ #ifndef UAODV_DEF_H_
#define UAODV_DEF_H_ #define UAODV_DEF_H_
#include "net/uip.h" #include "net/ip/uip.h"
#define NUM_PRECURSORS 4 #define NUM_PRECURSORS 4

2
core/net/uaodv-rt.c → core/net/ipv4/uaodv-rt.c
View file

@ -38,7 +38,7 @@
*/ */
#include "net/uaodv-rt.h" #include "net/ipv4/uaodv-rt.h"
#include "contiki-net.h" #include "contiki-net.h"
#ifndef UAODV_NUM_RT_ENTRIES #ifndef UAODV_NUM_RT_ENTRIES

0
core/net/uaodv-rt.h → core/net/ipv4/uaodv-rt.h
View file

6
core/net/uaodv.c → core/net/ipv4/uaodv.c
View file

@ -41,14 +41,14 @@
#include <stdarg.h> #include <stdarg.h>
#include "contiki.h" #include "contiki.h"
#include "net/uaodv-def.h" #include "net/ipv4/uaodv-def.h"
#include "net/uaodv-rt.h" #include "net/ipv4/uaodv-rt.h"
#define NDEBUG #define NDEBUG
#include "lib/assert.h" #include "lib/assert.h"
#ifdef CC2420_RADIO #ifdef CC2420_RADIO
#include "dev/cc2420.h" #include "cc2420.h"
#define RSSI_THRESHOLD -39 /* accept -39 ... xx */ #define RSSI_THRESHOLD -39 /* accept -39 ... xx */
#endif #endif

0
core/net/uaodv.h → core/net/ipv4/uaodv.h
View file

2
core/net/uip-fw-drv.c → core/net/ipv4/uip-fw-drv.c
View file

@ -32,7 +32,7 @@
* *
*/ */
#include "net/uip-fw.h" #include "net/ipv4/uip-fw.h"
#if !UIP_CONF_IPV6 #if !UIP_CONF_IPV6

2
core/net/uip-fw-drv.h → core/net/ipv4/uip-fw-drv.h
View file

@ -35,7 +35,7 @@
#define UIP_FW_DRV_H_ #define UIP_FW_DRV_H_
#include "contiki.h" #include "contiki.h"
#include "net/uip-fw.h" #include "net/ipv4/uip-fw.h"
PROCESS_NAME(uip_fw_process); PROCESS_NAME(uip_fw_process);

8
core/net/uip-fw.c → core/net/ipv4/uip-fw.c
View file

@ -56,11 +56,11 @@
#include "contiki-conf.h" #include "contiki-conf.h"
#include "net/uip.h" #include "net/ip/uip.h"
#include "net/uip_arch.h" #include "net/ip/uip_arch.h"
#include "net/uip-fw.h" #include "net/ipv4/uip-fw.h"
#ifdef AODV_COMPLIANCE #ifdef AODV_COMPLIANCE
#include "net/uaodv-def.h" #include "net/ipv4/uaodv-def.h"
#endif #endif
/* /*

2
core/net/uip-fw.h → core/net/ipv4/uip-fw.h
View file

@ -45,7 +45,7 @@
#ifndef UIP_FW_H_ #ifndef UIP_FW_H_
#define UIP_FW_H_ #define UIP_FW_H_
#include "net/uip.h" #include "net/ip/uip.h"
/** /**
* Representation of a uIP network interface. * Representation of a uIP network interface.

2
core/net/uip-neighbor.c → core/net/ipv4/uip-neighbor.c
View file

@ -38,7 +38,7 @@
* Adam Dunkels <adam@sics.se> * Adam Dunkels <adam@sics.se>
*/ */
#include "net/uip-neighbor.h" #include "net/ipv4/uip-neighbor.h"
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>

2
core/net/uip-neighbor.h → core/net/ipv4/uip-neighbor.h
View file

@ -41,7 +41,7 @@
#ifndef UIP_NEIGHBOR_H_ #ifndef UIP_NEIGHBOR_H_
#define UIP_NEIGHBOR_H_ #define UIP_NEIGHBOR_H_
#include "net/uip.h" #include "net/ip/uip.h"
struct uip_neighbor_addr { struct uip_neighbor_addr {
#if UIP_NEIGHBOR_CONF_ADDRTYPE #if UIP_NEIGHBOR_CONF_ADDRTYPE

4
core/net/uip-over-mesh.c → core/net/ipv4/uip-over-mesh.c
View file

@ -39,8 +39,8 @@
#include <stdio.h> #include <stdio.h>
#include "net/uip-fw.h" #include "net/ipv4/uip-fw.h"
#include "net/uip-over-mesh.h" #include "net/ipv4/uip-over-mesh.h"
#include "net/rime/route-discovery.h" #include "net/rime/route-discovery.h"
#include "net/rime/route.h" #include "net/rime/route.h"
#include "net/rime/trickle.h" #include "net/rime/trickle.h"

6
core/net/uip-over-mesh.h → core/net/ipv4/uip-over-mesh.h
View file

@ -40,9 +40,9 @@
#ifndef UIP_OVER_MESH_H_ #ifndef UIP_OVER_MESH_H_
#define UIP_OVER_MESH_H_ #define UIP_OVER_MESH_H_
#include "net/uip.h" #include "net/ip/uip.h"
#include "net/uip-fw.h" #include "net/ipv4/uip-fw.h"
#include "net/rime.h" #include "net/rime/rime.h"
void uip_over_mesh_init(uint16_t channels); void uip_over_mesh_init(uint16_t channels);
uint8_t uip_over_mesh_send(void); uint8_t uip_over_mesh_send(void);

10
core/net/uip.c → core/net/ipv4/uip.c
View file

@ -70,10 +70,10 @@
* the packet back to the peer. * the packet back to the peer.
*/ */
#include "net/uip.h" #include "net/ip/uip.h"
#include "net/uipopt.h" #include "net/ip/uipopt.h"
#include "net/uip_arp.h" #include "net/ipv4/uip_arp.h"
#include "net/uip_arch.h" #include "net/ip/uip_arch.h"
#if !UIP_CONF_IPV6 /* If UIP_CONF_IPV6 is defined, we compile the #if !UIP_CONF_IPV6 /* If UIP_CONF_IPV6 is defined, we compile the
uip6.c file instead of this one. Therefore uip6.c file instead of this one. Therefore
@ -82,7 +82,7 @@
#if UIP_CONF_IPV6 #if UIP_CONF_IPV6
#include "net/uip-neighbor.h" #include "net/ipv4/uip-neighbor.h"
#endif /* UIP_CONF_IPV6 */ #endif /* UIP_CONF_IPV6 */
#include <string.h> #include <string.h>

Some files were not shown because too many files have changed in this diff Show more