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

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.

platform/gtk/contiki-main.c

@@ -29,11 +29,10 @@
  *
  * This file is part of the Contiki desktop environment
  *
- * $Id: contiki-main.c,v 1.4 2007/03/31 18:44:14 adamdunkels Exp $
+ * $Id: contiki-main.c,v 1.5 2007/05/19 21:16:08 oliverschmidt Exp $
  *
  */
 
-
 #include <gdk/gdktypes.h>
 #include <gtk/gtk.h>
 
@@ -45,8 +44,6 @@
 #include "ctk/ctk-vncserver.h"
 #include "ctk/ctk-termtelnet.h"
 
-#include "cfs/cfs-posix.h"
-
 #include "net/tapdev-service.h"
 #include "program-handler.h"
 #include "webserver.h"
@@ -67,7 +64,6 @@
 
 #include "cmdd.h"
 
-
 u8_t tapdev_output(void);
 static struct uip_fw_netif tapif =
   {UIP_FW_NETIF(0,0,0,0, 0,0,0,0, tapdev_output)};
@@ -119,7 +115,7 @@ PROCESS_THREAD(init_process, ev, data)
 PROCINIT(&tcpip_process, &ctk_process, &tapdev_process,
 	 &ctk_gtksim_service_process, &resolv_process,
 	 &program_handler_process,
-	 &uip_fw_process, &cfs_posix_process,
+	 &uip_fw_process,
 	 &init_process);
 
 static gint

platform/minimal-net/contiki-main.c

@@ -29,13 +29,12 @@
  *
  * This file is part of the Contiki OS
  *
- * $Id: contiki-main.c,v 1.4 2007/04/13 23:08:52 oliverschmidt Exp $
+ * $Id: contiki-main.c,v 1.5 2007/05/19 21:18:10 oliverschmidt Exp $
  *
  */
 
 #include "contiki.h"
 
-#include "cfs/cfs-posix.h"
 #include "net/uip.h"
 #ifdef __CYGWIN__
 #include "net/wpcap-service.h"
@@ -44,9 +43,9 @@
 #endif
 
 #ifdef __CYGWIN__
-PROCINIT(&etimer_process, &cfs_posix_process, &tcpip_process, &wpcap_process);
+PROCINIT(&etimer_process, &tcpip_process, &wpcap_process);
 #else
-PROCINIT(&etimer_process, &cfs_posix_process, &tcpip_process, &tapdev_process);
+PROCINIT(&etimer_process, &tcpip_process, &tapdev_process);
 #endif
 
 /*---------------------------------------------------------------------------*/

platform/netsim/Makefile.netsim

@@ -7,7 +7,7 @@ CONTIKI_TARGET_DIRS = . dev apps net
 SENSORS = sensors.c beep.c button-sensor.c pir-sensor.c vib-sensor.c \
 	  radio-sensor.c irq.c eeprom.c \
 	  dummy-sensors.c leds.c leds-arch.c esb-sensors.c
-NETSIM = ether.c ethernode.c ethernode-uip.c lpm.c rs232.c flash.c \
+NETSIM = cfs-ram.c ether.c ethernode.c ethernode-uip.c lpm.c rs232.c flash.c \
 	 node.c nodes.c sensor.c display.c random.c radio.c \
 	 dlloader.c main.c netsim-init.c contiki-main.c symtab.c symbols.c tr1001.c tr1001-drv.c \
 	 ethernode-rime.c

platform/netsim/contiki-main.c

@@ -30,15 +30,13 @@
  *
  * Author: Adam Dunkels <adam@sics.se>
  *
- * $Id: contiki-main.c,v 1.13 2007/04/01 21:05:17 oliverschmidt Exp $
+ * $Id: contiki-main.c,v 1.14 2007/05/19 21:20:03 oliverschmidt Exp $
  */
 
 #include "contiki.h"
 #include "contiki-net.h"
 #include "contiki-lib.h"
 
-#include "cfs/cfs-ram.h"
-
 #include "net/rime.h"
 
 #ifdef __CYGWIN__
@@ -83,7 +81,6 @@ SENSORS(&button_sensor, &pir_sensor, &vib_sensor, &radio_sensor);
 
 PROCINIT(&sensors_process, &etimer_process, &tcpip_process,
 	 /*	 &ethernode_uip_process,*/
-	 &cfs_ram_process,
 	 &ethernode_rime_process,
 	 &uip_fw_process);
 

platform/sky/contiki-sky-main.c

@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * @(#)$Id: contiki-sky-main.c,v 1.7 2007/04/03 19:04:50 adamdunkels Exp $
+ * @(#)$Id: contiki-sky-main.c,v 1.8 2007/05/19 21:21:32 oliverschmidt Exp $
  */
 
 #include <stdio.h>
@@ -110,7 +110,7 @@ main(int argc, char **argv)
 
   slip_arch_init(BAUD2UBR(115200)); /* Must come before first printf */
   printf("Starting %s "
-	 "($Id: contiki-sky-main.c,v 1.7 2007/04/03 19:04:50 adamdunkels Exp $)\n", __FILE__);
+	 "($Id: contiki-sky-main.c,v 1.8 2007/05/19 21:21:32 oliverschmidt Exp $)\n", __FILE__);
   ds2411_init();
   sensors_light_init();
   xmem_init();
@@ -145,8 +145,6 @@ main(int argc, char **argv)
   process_start(&etimer_process, NULL);
   process_start(&sensors_process, NULL);
 
-  cfs_xmem_init();
-
   simple_cc2420_init();
   simple_cc2420_rime_init();
   simple_cc2420_on();

platform/win32/Makefile.win32

@@ -30,7 +30,7 @@
 #
 # Author: Oliver Schmidt <ol.sc@web.de>
 #
-# $Id: Makefile.win32,v 1.8 2007/05/13 08:46:18 oliverschmidt Exp $
+# $Id: Makefile.win32,v 1.9 2007/05/19 21:23:06 oliverschmidt Exp $
 #
 
 ifndef CONTIKI
@@ -56,7 +56,7 @@ include $(CONTIKI)/cpu/native/Makefile.native
 
 CFLAGS += -DWITH_LOADER_ARCH
 LDFLAGS += -Wl,--out-implib=contiki-main.$(TARGET).a \
-           -u _cfs_find_service -u _uiplib_ipaddrconv
+           -u _cfs_open -u _uiplib_ipaddrconv
 
 ### Generate the module-link prerequisites
 define prg_template

platform/win32/contiki-main.c

@@ -30,7 +30,7 @@
  * 
  * Author: Oliver Schmidt <ol.sc@web.de>
  *
- * $Id: contiki-main.c,v 1.9 2007/04/15 13:30:16 oliverschmidt Exp $
+ * $Id: contiki-main.c,v 1.10 2007/05/19 21:23:06 oliverschmidt Exp $
  */
 
 #define WIN32_LEAN_AND_MEAN
@@ -49,13 +49,11 @@
 #include "../../apps/webbrowser/www-dsc.h"
 
 #include "sys/etimer.h"
-#include "cfs/cfs-win32.h"
 #include "net/wpcap-service.h"
 #include "program-handler.h"
 
 PROCINIT(&etimer_process,
 	 &wpcap_process,
-	 &cfs_win32_process,
 	 &ctk_process,
 	 &tcpip_process,
 	 &resolv_process,