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

A massive all-tree automated update of all double inclusion guard #defines that changes from using two underscores as a prefix, which are reserved, to not using two underscores as a prefix

Browse source
This commit is contained in:
Adam Dunkels 2013-11-24 16:57:08 +01:00
parent 42cae1c6c9
commit bb2dcaa057
572 changed files with 1708 additions and 1708 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/net/rime/abc.h
View file

@ -54,8 +54,8 @@
* Adam Dunkels <adam@sics.se>
*/
#ifndef __ABC_H__
#define __ABC_H__
#ifndef ABC_H_
#define ABC_H_
#include "net/packetbuf.h"
#include "net/rime/channel.h"
@ -138,6 +138,6 @@ void abc_input(struct channel *channel);
void abc_sent(struct channel *channel, int status, int num_tx);
#endif /* __ABC_H__ */
#endif /* ABC_H_ */
/** @} */
/** @} */

6
core/net/rime/announcement.h
View file

@ -63,8 +63,8 @@
* Adam Dunkels <adam@sics.se>
*/
#ifndef __ANNOUNCEMENT_H__
#define __ANNOUNCEMENT_H__
#ifndef ANNOUNCEMENT_H_
#define ANNOUNCEMENT_H_
#include "net/rime/rimeaddr.h"
@ -267,7 +267,7 @@ void announcement_register_observer_callback(announcement_observer observer);
* @}
*/
#endif /* __ANNOUNCE_H__ */
#endif /* ANNOUNCE_H_ */
/** @} */
/** @} */

6
core/net/rime/broadcast-announcement.h
View file

@ -56,8 +56,8 @@
* Adam Dunkels <adam@sics.se>
*/
#ifndef __BROADCAST_ANNOUNCEMENT_H__
#define __BROADCAST_ANNOUNCEMENT_H__
#ifndef BROADCAST_ANNOUNCEMENT_H_
#define BROADCAST_ANNOUNCEMENT_H_
void broadcast_announcement_init(uint16_t channel,
clock_time_t bump_time,
@ -66,6 +66,6 @@ void broadcast_announcement_init(uint16_t channel,
clock_time_t broadcast_announcement_beacon_interval(void);
#endif /* __BROADCAST_ANNOUNCEMENT_H__ */
#endif /* BROADCAST_ANNOUNCEMENT_H_ */
/** @} */
/** @} */

6
core/net/rime/broadcast.h
View file

@ -62,8 +62,8 @@
* Adam Dunkels <adam@sics.se>
*/
#ifndef __BROADCAST_H__
#define __BROADCAST_H__
#ifndef BROADCAST_H_
#define BROADCAST_H_
#include "net/rime/abc.h"
#include "net/rime/rimeaddr.h"
@ -134,6 +134,6 @@ void broadcast_close(struct broadcast_conn *c);
*/
int broadcast_send(struct broadcast_conn *c);
#endif /* __BROADCAST_H__ */
#endif /* BROADCAST_H_ */
/** @} */
/** @} */

6
core/net/rime/chameleon-bitopt.h
View file

@ -37,11 +37,11 @@
* Adam Dunkels <adam@sics.se>
*/
#ifndef __CHAMELEON_BITOPT_H__
#define __CHAMELEON_BITOPT_H__
#ifndef CHAMELEON_BITOPT_H_
#define CHAMELEON_BITOPT_H_
#include "sys/cc.h"
extern CC_CONST_FUNCTION struct chameleon_module chameleon_bitopt;
#endif /* __CHAMELEON_BITOPT_H__ */
#endif /* CHAMELEON_BITOPT_H_ */

6
core/net/rime/chameleon-raw.h
View file

@ -37,11 +37,11 @@
* Adam Dunkels <adam@sics.se>
*/
#ifndef __CHAMELEON_RAW_H__
#define __CHAMELEON_RAW_H__
#ifndef CHAMELEON_RAW_H_
#define CHAMELEON_RAW_H_
#include "sys/cc.h"
extern CC_CONST_FUNCTION struct chameleon_module chameleon_raw;
#endif /* __CHAMELEON_RAW_H__ */
#endif /* CHAMELEON_RAW_H_ */

6
core/net/rime/chameleon.h
View file

@ -37,8 +37,8 @@
* Adam Dunkels <adam@sics.se>
*/
#ifndef __CHAMELEON_H__
#define __CHAMELEON_H__
#ifndef CHAMELEON_H_
#define CHAMELEON_H_
#include "net/rime/channel.h"
@ -54,4 +54,4 @@ int chameleon_hdrsize(const struct packetbuf_attrlist attrlist[]);
struct channel *chameleon_parse(void);
int chameleon_create(struct channel *c);
#endif /* __CHAMELEON_H__ */
#endif /* CHAMELEON_H_ */

6
core/net/rime/channel.h
View file

@ -37,8 +37,8 @@
* Adam Dunkels <adam@sics.se>
*/
#ifndef __CHANNEL_H__
#define __CHANNEL_H__
#ifndef CHANNEL_H_
#define CHANNEL_H_
struct channel;
@ -61,4 +61,4 @@ void channel_open(struct channel *c, uint16_t channelno);
void channel_close(struct channel *c);
void channel_init(void);
#endif /* __CHANNEL_H__ */
#endif /* CHANNEL_H_ */

6
core/net/rime/collect-neighbor.h
View file

@ -48,8 +48,8 @@
* Adam Dunkels <adam@sics.se>
*/
#ifndef __COLLECT_NEIGHBOR_H__
#define __COLLECT_NEIGHBOR_H__
#ifndef COLLECT_NEIGHBOR_H_
#define COLLECT_NEIGHBOR_H_
#include "net/rime/rimeaddr.h"
#include "net/rime/collect-link-estimate.h"
@ -100,6 +100,6 @@ uint16_t collect_neighbor_rtmetric_link_estimate(struct collect_neighbor *n);
uint16_t collect_neighbor_rtmetric(struct collect_neighbor *n);
#endif /* __COLLECT_NEIGHBOR_H__ */
#endif /* COLLECT_NEIGHBOR_H_ */
/** @} */
/** @} */

6
core/net/rime/collect.h
View file

@ -56,8 +56,8 @@
* Adam Dunkels <adam@sics.se>
*/
#ifndef __COLLECT_H__
#define __COLLECT_H__
#ifndef COLLECT_H_
#define COLLECT_H_
#include "net/rime/announcement.h"
#include "net/rime/runicast.h"
@ -144,6 +144,6 @@ void collect_print_stats(void);
#define COLLECT_MAX_DEPTH (COLLECT_LINK_ESTIMATE_UNIT * 64 - 1)
#endif /* __COLLECT_H__ */
#endif /* COLLECT_H_ */
/** @} */
/** @} */

6
core/net/rime/ipolite.h
View file

@ -90,8 +90,8 @@
* Adam Dunkels <adam@sics.se>
*/
#ifndef __IPOLITE_H__
#define __IPOLITE_H__
#ifndef IPOLITE_H_
#define IPOLITE_H_
#include "sys/ctimer.h"
@ -191,7 +191,7 @@ int ipolite_send(struct ipolite_conn *c, clock_time_t interval,
*/
void ipolite_cancel(struct ipolite_conn *c);
#endif /* __IPOLITE_H__ */
#endif /* IPOLITE_H_ */
/** @} */
/** @} */

6
core/net/rime/mesh.h
View file

@ -58,8 +58,8 @@
* Adam Dunkels <adam@sics.se>
*/
#ifndef __MESH_H__
#define __MESH_H__
#ifndef MESH_H_
#define MESH_H_
#include "net/queuebuf.h"
#include "net/rime/multihop.h"
@ -141,6 +141,6 @@ int mesh_send(struct mesh_conn *c, const rimeaddr_t *dest);
*/
int mesh_ready(struct mesh_conn *c);
#endif /* __MESH_H__ */
#endif /* MESH_H_ */
/** @} */
/** @} */

6
core/net/rime/multihop.h
View file

@ -67,8 +67,8 @@
* Adam Dunkels <adam@sics.se>
*/
#ifndef __MULTIHOP_H__
#define __MULTIHOP_H__
#ifndef MULTIHOP_H_
#define MULTIHOP_H_
#include "net/rime/unicast.h"
#include "net/rime/rimeaddr.h"
@ -105,6 +105,6 @@ void multihop_close(struct multihop_conn *c);
int multihop_send(struct multihop_conn *c, const rimeaddr_t *to);
void multihop_resend(struct multihop_conn *c, const rimeaddr_t *nexthop);
#endif /* __MULTIHOP_H__ */
#endif /* MULTIHOP_H_ */
/** @} */
/** @} */

6
core/net/rime/neighbor-discovery.h
View file

@ -56,8 +56,8 @@
* Adam Dunkels <adam@sics.se>
*/
#ifndef __NEIGHBOR_DISCOVERY_H__
#define __NEIGHBOR_DISCOVERY_H__
#ifndef NEIGHBOR_DISCOVERY_H_
#define NEIGHBOR_DISCOVERY_H_
#include "net/rime/broadcast.h"
#include "sys/ctimer.h"
@ -90,6 +90,6 @@ void neighbor_discovery_set_val(struct neighbor_discovery_conn *c, uint16_t val)
void neighbor_discovery_start(struct neighbor_discovery_conn *c, uint16_t val);
#endif /* __NEIGHBOR_DISCOVERY_H__ */
#endif /* NEIGHBOR_DISCOVERY_H_ */
/** @} */
/** @} */

6
core/net/rime/netflood.h
View file

@ -71,8 +71,8 @@
* Adam Dunkels <adam@sics.se>
*/
#ifndef __NETFLOOD_H__
#define __NETFLOOD_H__
#ifndef NETFLOOD_H_
#define NETFLOOD_H_
#include "net/queuebuf.h"
#include "net/rime/ipolite.h"
@ -105,6 +105,6 @@ void netflood_close(struct netflood_conn *c);
int netflood_send(struct netflood_conn *c, uint8_t seqno);
#endif /* __SIBC_H__ */
#endif /* SIBC_H_ */
/** @} */
/** @} */

6
core/net/rime/polite-announcement.h
View file

@ -56,13 +56,13 @@
* Adam Dunkels <adam@sics.se>
*/
#ifndef __POLITE_ANNOUNCEMENT_H__
#define __POLITE_ANNOUNCEMENT_H__
#ifndef POLITE_ANNOUNCEMENT_H_
#define POLITE_ANNOUNCEMENT_H_
void polite_announcement_init(uint16_t channel,
clock_time_t min,
clock_time_t max);
#endif /* __POLITE_ANNOUNCEMENT_H__ */
#endif /* POLITE_ANNOUNCEMENT_H_ */
/** @} */
/** @} */

6
core/net/rime/polite.h
View file

@ -90,8 +90,8 @@
* Adam Dunkels <adam@sics.se>
*/
#ifndef __POLITE_H__
#define __POLITE_H__
#ifndef POLITE_H_
#define POLITE_H_
#include "net/rime/abc.h"
#include "net/queuebuf.h"
@ -186,7 +186,7 @@ int polite_send(struct polite_conn *c, clock_time_t interval, uint8_t hdrsize);
*/
void polite_cancel(struct polite_conn *c);
#endif /* __POLITE_H__ */
#endif /* POLITE_H_ */
/** @} */
/** @} */

6
core/net/rime/rime-udp.h
View file

@ -37,12 +37,12 @@
* Nicolas Tsiftes <nvt@sics.se>
*/
#ifndef __UDPMAC_H__
#define __UDPMAC_H__
#ifndef UDPMAC_H_
#define UDPMAC_H_
#include "net/mac/mac.h"
#include "dev/radio.h"
extern const struct mac_driver rime_udp_driver;
#endif /* __UDPMAC_H__ */
#endif /* UDPMAC_H_ */

6
core/net/rime/rimeaddr.h
View file

@ -51,8 +51,8 @@
* Adam Dunkels <adam@sics.se>
*/
#ifndef __RIMEADDR_H__
#define __RIMEADDR_H__
#ifndef RIMEADDR_H_
#define RIMEADDR_H_
#include "contiki-conf.h"
@ -126,6 +126,6 @@ extern rimeaddr_t rimeaddr_node_addr;
*/
extern const rimeaddr_t rimeaddr_null;
#endif /* __RIMEADDR_H__ */
#endif /* RIMEADDR_H_ */
/** @} */
/** @} */

6
core/net/rime/rimestats.h
View file

@ -37,8 +37,8 @@
* Adam Dunkels <adam@sics.se>
*/
#ifndef __RIMESTATS_H__
#define __RIMESTATS_H__
#ifndef RIMESTATS_H_
#define RIMESTATS_H_
struct rimestats {
unsigned long tx, rx;
@ -66,4 +66,4 @@ extern struct rimestats rimestats;
#define RIMESTATS_GET(x) 0
#endif /* RIMESTATS_CONF_ENABLED */
#endif /* __RIMESTATS_H__ */
#endif /* RIMESTATS_H_ */

6
core/net/rime/rmh.h
View file

@ -62,8 +62,8 @@
* Adam Dunkels <adam@sics.se>
*/
#ifndef __RMH_H__
#define __RMH_H__
#ifndef RMH_H_
#define RMH_H_
#include "net/rime/runicast.h"
#include "net/rime/rimeaddr.h"
@ -97,6 +97,6 @@ void rmh_close(struct rmh_conn *c);
int rmh_send(struct rmh_conn *c, rimeaddr_t *to, uint8_t num_rexmit,
uint8_t max_hops);
#endif /* __RMH_H__ */
#endif /* RMH_H_ */
/** @} */
/** @} */

6
core/net/rime/route-discovery.h
View file

@ -54,8 +54,8 @@
* Adam Dunkels <adam@sics.se>
*/
#ifndef __ROUTE_DISCOVERY_H__
#define __ROUTE_DISCOVERY_H__
#ifndef ROUTE_DISCOVERY_H_
#define ROUTE_DISCOVERY_H_
#include "net/rime/unicast.h"
#include "net/rime/netflood.h"
@ -88,6 +88,6 @@ int route_discovery_discover(struct route_discovery_conn *c, const rimeaddr_t *d
void route_discovery_close(struct route_discovery_conn *c);
#endif /* __ROUTE_DISCOVERY_H__ */
#endif /* ROUTE_DISCOVERY_H_ */
/** @} */
/** @} */

6
core/net/rime/route.h
View file

@ -48,8 +48,8 @@
* Adam Dunkels <adam@sics.se>
*/
#ifndef __ROUTE_H__
#define __ROUTE_H__
#ifndef ROUTE_H_
#define ROUTE_H_
#include "net/rime/rimeaddr.h"
@ -78,6 +78,6 @@ void route_set_lifetime(int seconds);
int route_num(void);
struct route_entry *route_get(int num);
#endif /* __ROUTE_H__ */
#endif /* ROUTE_H_ */
/** @} */
/** @} */

6
core/net/rime/rucb.h
View file

@ -37,8 +37,8 @@
* Adam Dunkels <adam@sics.se>
*/
#ifndef __RUCB_H__
#define __RUCB_H__
#ifndef RUCB_H_
#define RUCB_H_
#include "net/rime/runicast.h"
@ -76,4 +76,4 @@ void rucb_close(struct rucb_conn *c);
int rucb_send(struct rucb_conn *c, const rimeaddr_t *receiver);
#endif /* __RUCB_H__ */
#endif /* RUCB_H_ */

6
core/net/rime/rudolph0.h
View file

@ -56,8 +56,8 @@
* Adam Dunkels <adam@sics.se>
*/
#ifndef __RUDOLPH0_H__
#define __RUDOLPH0_H__
#ifndef RUDOLPH0_H_
#define RUDOLPH0_H_
#include "net/rime/stbroadcast.h"
#include "net/rime/polite.h"
@ -116,7 +116,7 @@ void rudolph0_force_restart(struct rudolph0_conn *c);
void rudolph0_set_version(struct rudolph0_conn *c, int version);
int rudolph0_version(struct rudolph0_conn *c);
#endif /* __RUDOLPH0_H__ */
#endif /* RUDOLPH0_H_ */
/** @} */
/** @} */

6
core/net/rime/rudolph1.h
View file

@ -56,8 +56,8 @@
* Adam Dunkels <adam@sics.se>
*/
#ifndef __RUDOLPH1_H__
#define __RUDOLPH1_H__
#ifndef RUDOLPH1_H_
#define RUDOLPH1_H_
#include "net/rime/trickle.h"
#include "net/rime/ipolite.h"
@ -96,6 +96,6 @@ void rudolph1_close(struct rudolph1_conn *c);
void rudolph1_send(struct rudolph1_conn *c, clock_time_t send_interval);
void rudolph1_stop(struct rudolph1_conn *c);
#endif /* __RUDOLPH1_H__ */
#endif /* RUDOLPH1_H_ */
/** @} */
/** @} */

6
core/net/rime/rudolph2.h
View file

@ -56,8 +56,8 @@
* Adam Dunkels <adam@sics.se>
*/
#ifndef __RUDOLPH2_H__
#define __RUDOLPH2_H__
#ifndef RUDOLPH2_H_
#define RUDOLPH2_H_
#include "net/rime/polite.h"
#include "sys/ctimer.h"
@ -99,7 +99,7 @@ void rudolph2_stop(struct rudolph2_conn *c);
void rudolph2_set_version(struct rudolph2_conn *c, int version);
int rudolph2_version(struct rudolph2_conn *c);
#endif /* __RUDOLPH2_H__ */
#endif /* RUDOLPH2_H_ */
/** @} */
/** @} */

6
core/net/rime/runicast.h
View file

@ -75,8 +75,8 @@
* Adam Dunkels <adam@sics.se>
*/
#ifndef __RUNICAST_H__
#define __RUNICAST_H__
#ifndef RUNICAST_H_
#define RUNICAST_H_
#include "net/rime/stunicast.h"
@ -112,6 +112,6 @@ int runicast_send(struct runicast_conn *c, const rimeaddr_t *receiver,
uint8_t runicast_is_transmitting(struct runicast_conn *c);
#endif /* __RUNICAST_H__ */
#endif /* RUNICAST_H_ */
/** @} */
/** @} */

6
core/net/rime/stbroadcast.h
View file

@ -57,8 +57,8 @@
* Adam Dunkels <adam@sics.se>
*/
#ifndef __STBROADCAST_H__
#define __STBROADCAST_H__
#ifndef STBROADCAST_H_
#define STBROADCAST_H_
#include "sys/ctimer.h"
@ -147,7 +147,7 @@ void stbroadcast_cancel(struct stbroadcast_conn *c);
*/
void stbroadcast_set_timer(struct stbroadcast_conn *c, clock_time_t t);
#endif /* __STBROADCAST_H__ */
#endif /* STBROADCAST_H_ */
/** @} */
/** @} */

6
core/net/rime/stunicast.h
View file

@ -69,8 +69,8 @@
* Adam Dunkels <adam@sics.se>
*/
#ifndef __STUNICAST_H__
#define __STUNICAST_H__
#ifndef STUNICAST_H_
#define STUNICAST_H_
#include "sys/ctimer.h"
#include "net/rime/unicast.h"
@ -107,6 +107,6 @@ void stunicast_set_timer(struct stunicast_conn *c, clock_time_t t);
rimeaddr_t *stunicast_receiver(struct stunicast_conn *c);
#endif /* __STUNICAST_H__ */
#endif /* STUNICAST_H_ */
/** @} */
/** @} */

6
core/net/rime/timesynch.h
View file

@ -64,8 +64,8 @@
* Adam Dunkels <adam@sics.se>
*/
#ifndef __TIMESYNCH_H__
#define __TIMESYNCH_H__
#ifndef TIMESYNCH_H_
#define TIMESYNCH_H_
#include "net/mac/mac.h"
#include "sys/rtimer.h"
@ -144,7 +144,7 @@ int timesynch_authority_level(void);
*/
void timesynch_set_authority_level(int level);
#endif /* __TIMESYNCH_H__ */
#endif /* TIMESYNCH_H_ */
/** @} */
/** @} */

6
core/net/rime/trickle.h
View file

@ -54,8 +54,8 @@
* Adam Dunkels <adam@sics.se>
*/
#ifndef __TRICKLE_H__
#define __TRICKLE_H__
#ifndef TRICKLE_H_
#define TRICKLE_H_
#include "sys/ctimer.h"
@ -89,6 +89,6 @@ void trickle_close(struct trickle_conn *c);
void trickle_send(struct trickle_conn *c);
#endif /* __TRICKLE_H__ */
#endif /* TRICKLE_H_ */
/** @} */
/** @} */

6
core/net/rime/unicast.h
View file

@ -59,8 +59,8 @@
* Adam Dunkels <adam@sics.se>
*/
#ifndef __UNICAST_H__
#define __UNICAST_H__
#ifndef UNICAST_H_
#define UNICAST_H_
#include "net/rime/broadcast.h"
@ -85,6 +85,6 @@ void unicast_close(struct unicast_conn *c);
int unicast_send(struct unicast_conn *c, const rimeaddr_t *receiver);
#endif /* __UNICAST_H__ */
#endif /* UNICAST_H_ */
/** @} */
/** @} */