[Contiki-push] SF.net Git: contiki branch master updated. 2.6-5-g1bb055b

[Simon D. <sim...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "contiki".

The branch, master has been updated
       via  1bb055bae6633d520477a133e5d866416c4dfa40 (commit)
      from  c425e51911827e9182f651ff9df1cc9ba671f936 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1bb055bae6633d520477a133e5d866416c4dfa40
Author: simonduq <sim...@si...>
Date:   Thu Aug 30 13:12:26 2012 +0200

    Fixed the udp-stream example: use the new RPL interface, reduce RAM usage

diff --git a/examples/udp-stream/project-conf.h b/examples/udp-stream/project-conf.h
index d90849f..7e70346 100644
--- a/examples/udp-stream/project-conf.h
+++ b/examples/udp-stream/project-conf.h
@@ -35,13 +35,13 @@
 /* Free some code and RAM space */
 #define UIP_CONF_TCP                    0
 #undef UIP_CONF_DS6_NBR_NBU
-#define UIP_CONF_DS6_NBR_NBU            12
+#define UIP_CONF_DS6_NBR_NBU            8
 #undef UIP_CONF_DS6_ROUTE_NBU
-#define UIP_CONF_DS6_ROUTE_NBU          12
+#define UIP_CONF_DS6_ROUTE_NBU          8
 
 /* The total number of queuebuf */
 #undef QUEUEBUF_CONF_NUM
-#define QUEUEBUF_CONF_NUM               140
+#define QUEUEBUF_CONF_NUM               128
 /* The number of queuebuf actually stored in RAM. If
    not set or equal to the total number of queuebuf,
    swapping is disabled, and CFS not linked. */
diff --git a/examples/udp-stream/udp-stream.c b/examples/udp-stream/udp-stream.c
index a00d552..c53e72e 100644
--- a/examples/udp-stream/udp-stream.c
+++ b/examples/udp-stream/udp-stream.c
@@ -101,8 +101,8 @@ create_rpl_dag(uip_ipaddr_t *ipaddr)
     rpl_dag_t *dag;
     uip_ipaddr_t prefix;
 
-    rpl_set_root(ipaddr);
-    dag = rpl_get_dag(RPL_ANY_INSTANCE);
+    rpl_set_root(RPL_DEFAULT_INSTANCE, ipaddr);
+    dag = rpl_get_any_dag();
     uip_ip6addr(&prefix, 0xaaaa, 0, 0, 0, 0, 0, 0, 0);
     rpl_set_prefix(dag, &prefix, 64);
     printf("created a new RPL dag\n");

-----------------------------------------------------------------------

Summary of changes:
 examples/udp-stream/project-conf.h |    6 +++---
 examples/udp-stream/udp-stream.c   |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
contiki