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

Remove now unneeded UIP_CONF_IPV6 guards in net/ipv6 and net/rpl code

Browse source
This commit is contained in:
Simon Duquennoy 2014-11-12 10:59:30 +01:00
parent e85f41ffa0
commit e6d758e6f5
14 changed files with 0 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/net/ipv6/multicast/roll-tm.c
View file

@ -67,7 +67,6 @@
#define VERBOSE_PRINT_SEED(...) #define VERBOSE_PRINT_SEED(...)
#endif #endif
#if UIP_CONF_IPV6
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Data Representation */ /* Data Representation */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -1448,5 +1447,3 @@ const struct uip_mcast6_driver roll_tm_driver = {
in, in,
}; };
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#endif /* UIP_CONF_IPV6 */

3
core/net/ipv6/multicast/smrf.c
View file

@ -52,7 +52,6 @@
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h" #include "net/ip/uip-debug.h"
#if UIP_CONF_IPV6
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Macros */ /* Macros */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -207,5 +206,3 @@ const struct uip_mcast6_driver smrf_driver = {
in, in,
}; };
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#endif /* UIP_CONF_IPV6 */

3
core/net/ipv6/multicast/uip-mcast6-route.c
View file

@ -45,7 +45,6 @@
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#if UIP_CONF_IPV6
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* Size of the multicast routing table */ /* Size of the multicast routing table */
#ifdef UIP_MCAST6_ROUTE_CONF_ROUTES #ifdef UIP_MCAST6_ROUTE_CONF_ROUTES
@ -129,5 +128,3 @@ uip_mcast6_route_init()
list_init(mcast_route_list); list_init(mcast_route_list);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#endif /* UIP_CONF_IPV6 */

3
core/net/ipv6/sicslowpan.c
View file

@ -69,8 +69,6 @@
#include "net/ipv6/sicslowpan.h" #include "net/ipv6/sicslowpan.h"
#include "net/netstack.h" #include "net/netstack.h"
#if UIP_CONF_IPV6
#include <stdio.h> #include <stdio.h>
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
@ -1929,4 +1927,3 @@ const struct network_driver sicslowpan_driver = {
}; };
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
/** @} */ /** @} */
#endif /* UIP_CONF_IPV6 */

4
core/net/ipv6/uip-ds6-route.c
View file

@ -36,8 +36,6 @@
#include "lib/memb.h" #include "lib/memb.h"
#include "net/nbr-table.h" #include "net/nbr-table.h"
#if UIP_CONF_IPV6
#include <string.h> #include <string.h>
/* The nbr_routes holds a neighbor table to be able to maintain /* The nbr_routes holds a neighbor table to be able to maintain
@ -631,5 +629,3 @@ uip_ds6_defrt_periodic(void)
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#endif /* UIP_CONF_IPV6 */

3
core/net/ipv6/uip-ds6.c
View file

@ -50,8 +50,6 @@
#include "net/ipv6/uip-ds6.h" #include "net/ipv6/uip-ds6.h"
#include "net/ip/uip-packetqueue.h" #include "net/ip/uip-packetqueue.h"
#if UIP_CONF_IPV6
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h" #include "net/ip/uip-debug.h"
@ -704,6 +702,5 @@ uip_ds6_compute_reachable_time(void)
UIP_ND6_MIN_RANDOM_FACTOR(uip_ds6_if.base_reachable_time)); UIP_ND6_MIN_RANDOM_FACTOR(uip_ds6_if.base_reachable_time));
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#endif /* UIP_CONF_IPV6 */
/** @}*/ /** @}*/

3
core/net/ipv6/uip-icmp6.c
View file

@ -68,8 +68,6 @@
#include "rpl/rpl.h" #include "rpl/rpl.h"
#endif /* UIP_CONF_IPV6_RPL */ #endif /* UIP_CONF_IPV6_RPL */
#if UIP_CONF_IPV6
/** \brief temporary IP address */ /** \brief temporary IP address */
static uip_ipaddr_t tmp_ipaddr; static uip_ipaddr_t tmp_ipaddr;
@ -421,4 +419,3 @@ uip_icmp6_init()
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** @} */ /** @} */
#endif /* UIP_CONF_IPV6 */

2
core/net/ipv6/uip-nd6.c
View file

@ -74,7 +74,6 @@
#include "net/ipv6/uip-ds6.h" #include "net/ipv6/uip-ds6.h"
#include "lib/random.h" #include "lib/random.h"
#if UIP_CONF_IPV6
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
#define DEBUG 0 #define DEBUG 0
#include "net/ip/uip-debug.h" #include "net/ip/uip-debug.h"
@ -1036,4 +1035,3 @@ uip_nd6_init()
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** @} */ /** @} */
#endif /* UIP_CONF_IPV6 */

2
core/net/ipv6/uip6.c
View file

@ -80,7 +80,6 @@
#include <string.h> #include <string.h>
#if UIP_CONF_IPV6
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/* For Debug, logging, statistics */ /* For Debug, logging, statistics */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -2337,4 +2336,3 @@ uip_send(const void *data, int len)
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** @} */ /** @} */
#endif /* UIP_CONF_IPV6 */

2
core/net/rpl/rpl-dag.c
View file

@ -59,7 +59,6 @@
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h" #include "net/ip/uip-debug.h"
#if UIP_CONF_IPV6
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
extern rpl_of_t RPL_OF; extern rpl_of_t RPL_OF;
static rpl_of_t * const objective_functions[] = {&RPL_OF}; static rpl_of_t * const objective_functions[] = {&RPL_OF};
@ -1319,5 +1318,4 @@ rpl_lock_parent(rpl_parent_t *p)
nbr_table_lock(rpl_parents, p); nbr_table_lock(rpl_parents, p);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#endif /* UIP_CONF_IPV6 */
/** @} */ /** @} */

2
core/net/rpl/rpl-ext-header.c
View file

@ -65,7 +65,6 @@
#define UIP_EXT_HDR_OPT_PADN_BUF ((struct uip_ext_hdr_opt_padn *)&uip_buf[uip_l2_l3_hdr_len + uip_ext_opt_offset]) #define UIP_EXT_HDR_OPT_PADN_BUF ((struct uip_ext_hdr_opt_padn *)&uip_buf[uip_l2_l3_hdr_len + uip_ext_opt_offset])
#define UIP_EXT_HDR_OPT_RPL_BUF ((struct uip_ext_hdr_opt_rpl *)&uip_buf[uip_l2_l3_hdr_len + uip_ext_opt_offset]) #define UIP_EXT_HDR_OPT_RPL_BUF ((struct uip_ext_hdr_opt_rpl *)&uip_buf[uip_l2_l3_hdr_len + uip_ext_opt_offset])
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#if UIP_CONF_IPV6
int int
rpl_verify_header(int uip_ext_opt_offset) rpl_verify_header(int uip_ext_opt_offset)
{ {
@ -378,6 +377,5 @@ rpl_insert_header(void)
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#endif /* UIP_CONF_IPV6 */
/** @}*/ /** @}*/

2
core/net/rpl/rpl-icmp6.c
View file

@ -61,7 +61,6 @@
#include "net/ip/uip-debug.h" #include "net/ip/uip-debug.h"
#if UIP_CONF_IPV6
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#define RPL_DIO_GROUNDED 0x80 #define RPL_DIO_GROUNDED 0x80
#define RPL_DIO_MOP_SHIFT 3 #define RPL_DIO_MOP_SHIFT 3
@ -958,6 +957,5 @@ rpl_icmp6_register_handlers()
uip_icmp6_register_input_handler(&dao_ack_handler); uip_icmp6_register_input_handler(&dao_ack_handler);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#endif /* UIP_CONF_IPV6 */
/** @}*/ /** @}*/

3
core/net/rpl/rpl-timers.c
View file

@ -47,8 +47,6 @@
#include "lib/random.h" #include "lib/random.h"
#include "sys/ctimer.h" #include "sys/ctimer.h"
#if UIP_CONF_IPV6
#define DEBUG DEBUG_NONE #define DEBUG DEBUG_NONE
#include "net/ip/uip-debug.h" #include "net/ip/uip-debug.h"
@ -325,6 +323,5 @@ rpl_cancel_dao(rpl_instance_t *instance)
ctimer_stop(&instance->dao_lifetime_timer); ctimer_stop(&instance->dao_lifetime_timer);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#endif /* UIP_CONF_IPV6 */
/** @}*/ /** @}*/

3
core/net/rpl/rpl.c
View file

@ -55,8 +55,6 @@
#include <limits.h> #include <limits.h>
#include <string.h> #include <string.h>
#if UIP_CONF_IPV6
#if RPL_CONF_STATS #if RPL_CONF_STATS
rpl_stats_t rpl_stats; rpl_stats_t rpl_stats;
#endif #endif
@ -316,6 +314,5 @@ rpl_init(void)
RPL_OF.reset(NULL); RPL_OF.reset(NULL);
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#endif /* UIP_CONF_IPV6 */
/** @}*/ /** @}*/