headers
Adam Dunkels | 3 Feb 2008 21:43
Picon

contiki-2.x/core/dev slip.c,1.5,1.6

Update of /cvsroot/contiki/contiki-2.x/core/dev
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12029

Modified Files:
	slip.c 
Log Message:
Code style fix

Index: slip.c
===================================================================
RCS file: /cvsroot/contiki/contiki-2.x/core/dev/slip.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** slip.c	18 Nov 2007 12:27:44 -0000	1.5
--- slip.c	3 Feb 2008 20:43:35 -0000	1.6
***************
*** 246,251 ****
  	nid = ~nid;		/* negate */
  	BUF->ipchksum += nid;	/* add */
! 	if (BUF->ipchksum < nid) /* 1-complement overflow? */
  	  BUF->ipchksum++;
        }
        tcpip_input();
--- 246,252 ----
  	nid = ~nid;		/* negate */
  	BUF->ipchksum += nid;	/* add */
! 	if(BUF->ipchksum < nid) { /* 1-complement overflow? */
  	  BUF->ipchksum++;
+ 	}
(Continue reading)

Permalink | Reply | 0 comments |
headers
Adam Dunkels | 3 Feb 2008 21:44
Picon

contiki-2.x/core/net/rime neighbor.c, 1.13, 1.14 neighbor.h, 1.9, 1.10

Update of /cvsroot/contiki/contiki-2.x/core/net/rime
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12389

Modified Files:
	neighbor.c neighbor.h 
Log Message:
Rewrote the neighbor code to use memb and a list instead of a static array

Index: neighbor.c
===================================================================
RCS file: /cvsroot/contiki/contiki-2.x/core/net/rime/neighbor.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** neighbor.c	9 Dec 2007 15:44:21 -0000	1.13
--- neighbor.c	3 Feb 2008 20:44:11 -0000	1.14
***************
*** 48,84 ****

  #include "contiki.h"
  #include "net/rime/neighbor.h"
  #include "net/rime/ctimer.h"
  #include "net/rime/collect.h"

! #define MAX_NEIGHBORS 5

  #define RTMETRIC_MAX COLLECT_MAX_DEPTH

! static struct neighbor neighbors[MAX_NEIGHBORS];
(Continue reading)

Permalink | Reply | 0 comments |
headers
Adam Dunkels | 3 Feb 2008 21:49
Picon

contiki-2.x/platform/netsim contiki-main.c, 1.26, 1.27 display.c, 1.7, 1.8 ether.c, 1.11, 1.12 ether.h, 1.7, 1.8 nodes.c, 1.6, 1.7 nodes.h, 1.4, 1.5

Update of /cvsroot/contiki/contiki-2.x/platform/netsim
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14281

Modified Files:
	contiki-main.c display.c ether.c ether.h nodes.c nodes.h 
Log Message:
Added a crude hack for drawing lines between nodes

Index: contiki-main.c
===================================================================
RCS file: /cvsroot/contiki/contiki-2.x/platform/netsim/contiki-main.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** contiki-main.c	14 Jan 2008 09:38:16 -0000	1.26
--- contiki-main.c	3 Feb 2008 20:49:50 -0000	1.27
***************
*** 38,41 ****
--- 38,42 ----
  #include "contiki-lib.h"

+ #include "dev/serial.h"
  #include "net/rime.h"

***************
*** 55,58 ****
--- 56,63 ----

  #include <stdio.h>
+ #ifndef HAVE_SNPRINTF
(Continue reading)

Permalink | Reply | 0 comments |
headers
Adam Dunkels | 3 Feb 2008 21:52
Picon

contiki-2.x/core/net/rime collect.c, 1.5, 1.6 route-discovery.c, 1.7, 1.8

Update of /cvsroot/contiki/contiki-2.x/core/net/rime
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15448

Modified Files:
	collect.c route-discovery.c 
Log Message:
Added line drawing code when compiled for the netsim target

Index: collect.c
===================================================================
RCS file: /cvsroot/contiki/contiki-2.x/core/net/rime/collect.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** collect.c	24 Jan 2008 21:11:40 -0000	1.5
--- collect.c	3 Feb 2008 20:52:41 -0000	1.6
***************
*** 204,207 ****
--- 204,210 ----
        n = neighbor_best();
        if(n != NULL) {
+ #if NETSIM
+ 	ether_set_line(n->addr.u8[0], n->addr.u8[1]);
+ #endif /* NETSIM */
  	ruc_send(c, &n->addr, hdr->rexmits);
        }
***************
*** 322,325 ****
--- 325,331 ----
        if(n != NULL) {
(Continue reading)

Permalink | Reply | 0 comments |
headers
Adam Dunkels | 3 Feb 2008 21:56
Picon

contiki-2.x/core/net uip-over-mesh.c, 1.5, 1.6 uip-over-mesh.h, 1.1, 1.2

Update of /cvsroot/contiki/contiki-2.x/core/net
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16773

Modified Files:
	uip-over-mesh.c uip-over-mesh.h 
Log Message:
Added the ability to send packets to an external network

Index: uip-over-mesh.h
===================================================================
RCS file: /cvsroot/contiki/contiki-2.x/core/net/uip-over-mesh.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** uip-over-mesh.h	22 Mar 2007 18:58:40 -0000	1.1
--- uip-over-mesh.h	3 Feb 2008 20:56:07 -0000	1.2
***************
*** 34,38 ****
  /**
   * \file
!  *         A brief description of what this file is.
   * \author
   *         Adam Dunkels <adam@...>
--- 34,38 ----
  /**
   * \file
!  *         Header file for tunnelling uIP over Rime mesh
   * \author
   *         Adam Dunkels <adam@...>
***************
(Continue reading)

Permalink | Reply | 0 comments |
headers
Adam Dunkels | 3 Feb 2008 21:58
Picon

contiki-2.x/cpu/msp430 msp430.c, 1.7, 1.8 msp430.h, 1.1, 1.2

Update of /cvsroot/contiki/contiki-2.x/cpu/msp430
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv17637

Modified Files:
	msp430.c msp430.h 
Log Message:
Added improvements suggested by Hardy Greich: define CPU speed in one place only (contiki-conf.h), added
nop to XTAL settlement delay

Index: msp430.c
===================================================================
RCS file: /cvsroot/contiki/contiki-2.x/cpu/msp430/msp430.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** msp430.c	17 Nov 2007 10:28:18 -0000	1.7
--- msp430.c	3 Feb 2008 20:58:11 -0000	1.8
***************
*** 34,40 ****
--- 34,42 ----
  #include <signal.h>
  #include <sys/unistd.h>
+ #include "msp430.h"
  #include "dev/watchdog.h"
  #include "net/uip.h"

+ 
  /*---------------------------------------------------------------------------*/
  void
***************
(Continue reading)

Permalink | Reply | 0 comments |
headers
Adam Dunkels | 3 Feb 2008 21:59
Picon

contiki-2.x/cpu/msp430/dev uart1.c,1.4,1.5

Update of /cvsroot/contiki/contiki-2.x/cpu/msp430/dev
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18043/dev

Modified Files:
	uart1.c 
Log Message:
Made SLIP code coexist with ordinary serial code. If WITH_UIP=1, the SLIP code is used instead.

Index: uart1.c
===================================================================
RCS file: /cvsroot/contiki/contiki-2.x/cpu/msp430/dev/uart1.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** uart1.c	8 Jan 2008 08:04:09 -0000	1.4
--- uart1.c	3 Feb 2008 20:59:35 -0000	1.5
***************
*** 40,45 ****
  #include "lib/energest.h"
  #include "dev/uart1.h"
- 
  #include "dev/leds.h"

  static int (*uart1_input_handler)(unsigned char c);
--- 40,45 ----
  #include "lib/energest.h"
  #include "dev/uart1.h"
  #include "dev/leds.h"
+ #include "dev/watchdog.h"
(Continue reading)

Permalink | Reply | 0 comments |
headers
Adam Dunkels | 3 Feb 2008 21:59
Picon

contiki-2.x/cpu/msp430 Makefile.msp430, 1.22, 1.23 slip_uart1.c, 1.7, 1.8

Update of /cvsroot/contiki/contiki-2.x/cpu/msp430
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18043

Modified Files:
	Makefile.msp430 slip_uart1.c 
Log Message:
Made SLIP code coexist with ordinary serial code. If WITH_UIP=1, the SLIP code is used instead.

Index: slip_uart1.c
===================================================================
RCS file: /cvsroot/contiki/contiki-2.x/cpu/msp430/slip_uart1.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** slip_uart1.c	22 May 2007 21:00:27 -0000	1.7
--- slip_uart1.c	3 Feb 2008 20:59:35 -0000	1.8
***************
*** 40,54 ****

  #include "dev/slip.h"
! 
  void
  slip_arch_writeb(unsigned char c)
  {
!   /* Loop until the transmission buffer is available. */
!   while ((IFG2 & UTXIFG1) == 0);
! 
!   /* Transmit the data. */
!   TXBUF1 = c;
  }
(Continue reading)

Permalink | Reply | 0 comments |
headers
Adam Dunkels | 3 Feb 2008 22:01
Picon

contiki-2.x/platform/sky contiki-conf.h, 1.22, 1.23

Update of /cvsroot/contiki/contiki-2.x/platform/sky
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv18891

Modified Files:
	contiki-conf.h 
Log Message:
Added uIP destimation unreachable message, removed defailt XMAC timer definitions (for now), turned
profiling off(for now), added process event number configuration, reduced data memory size for the ELF loader

Index: contiki-conf.h
===================================================================
RCS file: /cvsroot/contiki/contiki-2.x/platform/sky/contiki-conf.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** contiki-conf.h	8 Jan 2008 08:19:56 -0000	1.22
--- contiki-conf.h	3 Feb 2008 21:01:36 -0000	1.23
***************
*** 11,15 ****
  #define SIMPLE_CC2420_CONF_TIMESTAMPS 1

! #define PROFILE_CONF_ON 1
  #define ENERGEST_CONF_ON 1

--- 11,15 ----
  #define SIMPLE_CC2420_CONF_TIMESTAMPS 1

! #define PROFILE_CONF_ON 0
  #define ENERGEST_CONF_ON 1
(Continue reading)

Permalink | Reply | 0 comments |
headers
Adam Dunkels | 3 Feb 2008 22:03
Picon

contiki-2.x/platform/sky contiki-sky-main.c, 1.25, 1.26

Update of /cvsroot/contiki/contiki-2.x/platform/sky
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19647

Modified Files:
	contiki-sky-main.c 
Log Message:
Added code for routing IP packets over low-power radios using the Rime mesh module

Index: contiki-sky-main.c
===================================================================
RCS file: /cvsroot/contiki/contiki-2.x/platform/sky/contiki-sky-main.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** contiki-sky-main.c	23 Jan 2008 14:58:01 -0000	1.25
--- contiki-sky-main.c	3 Feb 2008 21:03:19 -0000	1.26
***************
*** 40,74 ****
  #include "dev/button-sensor.h"
  #include "dev/ds2411.h"
- #include "dev/sht11.h"
  #include "dev/leds.h"
  #include "dev/light.h"
- #include "dev/xmem.h"
- #include "dev/simple-cc2420.h"
- #include "dev/watchdog.h"
  #include "dev/serial.h"
  #include "dev/slip.h"
  #include "dev/uart1.h"
(Continue reading)

Permalink | Reply | 0 comments |

Gmane