Merge pull request contiki-os#434 from adamdunkels/push/cleanup-sys

Remove old unused code from the core/sys/ directory

Makefile.include

@@ -60,8 +60,8 @@ CFLAGS += -DCONTIKI=1 -DCONTIKI_TARGET_$(TARGET_UPPERCASE)=1
 
 include $(CONTIKI)/core/net/rime/Makefile.rime
 include $(CONTIKI)/core/net/mac/Makefile.mac
-SYSTEM  = process.c procinit.c autostart.c elfloader.c profile.c \
-          timetable.c timetable-aggregate.c compower.c serial-line.c
+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 checkpoint.c ringbuf.c settings.c

core/dev/cc2420.c

@@ -50,8 +50,6 @@
 #include "net/rime/rimestats.h"
 #include "net/netstack.h"
 
-#include "sys/timetable.h"
-
 #define WITH_SEND_CCA 1
 
 #define FOOTER_LEN 2
@@ -615,20 +613,11 @@ cc2420_set_pan_addr(unsigned pan,
 /*
  * Interrupt leaves frame intact in FIFO.
  */
-#if CC2420_TIMETABLE_PROFILING
-#define cc2420_timetable_size 16
-TIMETABLE(cc2420_timetable);
-TIMETABLE_AGGREGATE(aggregate_time, 10);
-#endif /* CC2420_TIMETABLE_PROFILING */
 int
 cc2420_interrupt(void)
 {
   CC2420_CLEAR_FIFOP_INT();
   process_poll(&cc2420_process);
-#if CC2420_TIMETABLE_PROFILING
-  timetable_clear(&cc2420_timetable);
-  TIMETABLE_TIMESTAMP(cc2420_timetable, "interrupt");
-#endif /* CC2420_TIMETABLE_PROFILING */
 
   last_packet_timestamp = cc2420_sfd_start_time;
   pending++;
@@ -645,10 +634,7 @@ PROCESS_THREAD(cc2420_process, ev, data)
 
   while(1) {
     PROCESS_YIELD_UNTIL(ev == PROCESS_EVENT_POLL);
-#if CC2420_TIMETABLE_PROFILING
-    TIMETABLE_TIMESTAMP(cc2420_timetable, "poll");
-#endif /* CC2420_TIMETABLE_PROFILING */
-
+
     PRINTF("cc2420_process: calling receiver callback\n");
 
     packetbuf_clear();
@@ -658,12 +644,6 @@ PROCESS_THREAD(cc2420_process, ev, data)
     packetbuf_set_datalen(len);
 
     NETSTACK_RDC.input();
-#if CC2420_TIMETABLE_PROFILING
-    TIMETABLE_TIMESTAMP(cc2420_timetable, "end");
-    timetable_aggregate_compute_detailed(&aggregate_time,
-                                         &cc2420_timetable);
-      timetable_clear(&cc2420_timetable);
-#endif /* CC2420_TIMETABLE_PROFILING */
   }
 
   PROCESS_END();

core/dev/cc2520.c

@@ -42,7 +42,6 @@
 #include "net/rime/rimestats.h"
 #include "net/netstack.h"
 
-#include "sys/timetable.h"
 #include <string.h>
 
 #ifndef CC2520_CONF_AUTOACK
@@ -593,20 +592,11 @@ cc2520_set_pan_addr(unsigned pan,
 /*
  * Interrupt leaves frame intact in FIFO.
  */
-#if CC2520_TIMETABLE_PROFILING
-#define cc2520_timetable_size 16
-TIMETABLE(cc2520_timetable);
-TIMETABLE_AGGREGATE(aggregate_time, 10);
-#endif /* CC2520_TIMETABLE_PROFILING */
 int
 cc2520_interrupt(void)
 {
   CC2520_CLEAR_FIFOP_INT();
   process_poll(&cc2520_process);
-#if CC2520_TIMETABLE_PROFILING
-  timetable_clear(&cc2520_timetable);
-  TIMETABLE_TIMESTAMP(cc2520_timetable, "interrupt");
-#endif /* CC2520_TIMETABLE_PROFILING */
 
   last_packet_timestamp = cc2520_sfd_start_time;
   cc2520_packets_seen++;
@@ -622,9 +612,6 @@ PROCESS_THREAD(cc2520_process, ev, data)
 
   while(1) {
     PROCESS_YIELD_UNTIL(ev == PROCESS_EVENT_POLL);
-#if CC2520_TIMETABLE_PROFILING
-    TIMETABLE_TIMESTAMP(cc2520_timetable, "poll");
-#endif /* CC2520_TIMETABLE_PROFILING */
 
     PRINTF("cc2520_process: calling receiver callback\n");
 
@@ -635,12 +622,6 @@ PROCESS_THREAD(cc2520_process, ev, data)
 
     NETSTACK_RDC.input();
     /* flushrx(); */
-#if CC2520_TIMETABLE_PROFILING
-    TIMETABLE_TIMESTAMP(cc2520_timetable, "end");
-    timetable_aggregate_compute_detailed(&aggregate_time,
-                                         &cc2520_timetable);
-    timetable_clear(&cc2520_timetable);
-#endif /* CC2520_TIMETABLE_PROFILING */
   }
 
   PROCESS_END();

core/net/rime/rucb.c

@@ -50,8 +50,6 @@
 #else
 #define PRINTF(...)
 #endif
-
-#include "sys/timetable.h"
 /*---------------------------------------------------------------------------*/
 static int
 read_data(struct rucb_conn *c)
@@ -84,10 +82,6 @@ acked(struct runicast_conn *ruc, const rimeaddr_t *to, uint8_t retransmissions)
     runicast_send(&c->c, &c->receiver, MAX_TRANSMISSIONS);
     c->last_size = len;
 
-    /*    {
-      extern struct timetable cc2420_timetable;
-      timetable_print(&cc2420_timetable);
-      }*/
   }
 }
 /*---------------------------------------------------------------------------*/