From 4e1d2906b7804791becd4a6a6faa61e2329b9d90 Mon Sep 17 00:00:00 2001 From: adamdunkels Date: Sun, 9 Dec 2007 15:40:43 +0000 Subject: [PATCH] Changed name on the neighbor discovery module from (cryptic) 'nbh' to 'neighbor-discovery' --- core/net/rime/Makefile.rime | 2 +- core/net/rime/{nbh.c => neighbor-discovery.c} | 22 +++++++------- core/net/rime/{nbh.h => neighbor-discovery.h} | 30 +++++++++---------- 3 files changed, 27 insertions(+), 27 deletions(-) rename core/net/rime/{nbh.c => neighbor-discovery.c} (87%) rename core/net/rime/{nbh.h => neighbor-discovery.h} (69%) diff --git a/core/net/rime/Makefile.rime b/core/net/rime/Makefile.rime index aca421017..7f48d8b24 100644 --- a/core/net/rime/Makefile.rime +++ b/core/net/rime/Makefile.rime @@ -1,6 +1,6 @@ CONTIKI_SOURCEFILES += rimebuf.c queuebuf.c rimeaddr.c ctimer.c rime.c \ rimestats.c ibc.c uc.c suc.c ruc.c sibc.c sabc.c abc.c nf.c \ - mh.c rmh.c rucb.c polite.c ipolite.c nbh.c \ + mh.c rmh.c rucb.c polite.c ipolite.c neighbor-discovery.c \ mesh.c route.c route-discovery.c \ collect.c neighbor.c \ trickle.c \ diff --git a/core/net/rime/nbh.c b/core/net/rime/neighbor-discovery.c similarity index 87% rename from core/net/rime/nbh.c rename to core/net/rime/neighbor-discovery.c index 3698b68b3..e69969beb 100644 --- a/core/net/rime/nbh.c +++ b/core/net/rime/neighbor-discovery.c @@ -1,5 +1,5 @@ /** - * \addtogroup rimenbh + * \addtogroup rimeneighbordiscovery * @{ */ @@ -33,12 +33,12 @@ * * This file is part of the Contiki operating system. * - * $Id: nbh.c,v 1.4 2007/11/17 10:34:17 adamdunkels Exp $ + * $Id: neighbor-discovery.c,v 1.1 2007/12/09 15:40:43 adamdunkels Exp $ */ /** * \file - * Neighborhood discovery + * Neighbor discovery * \author * Adam Dunkels */ @@ -48,7 +48,7 @@ #include "net/rime.h" #include "net/rime/neighbor.h" #include "net/rime/nf.h" -#include "net/rime/nbh.h" +#include "net/rime/neighbor-discovery.h" #include "dev/radio-sensor.h" @@ -84,7 +84,7 @@ struct adv_msg { /*---------------------------------------------------------------------------*/ static void -send_adv(struct nbh_conn *c, clock_time_t interval) +send_adv(struct neighbor_discovery_conn *c, clock_time_t interval) { struct adv_msg *hdr; @@ -104,7 +104,7 @@ send_adv(struct nbh_conn *c, clock_time_t interval) static void adv_packet_received(struct ibc_conn *ibc, rimeaddr_t *from) { - struct nbh_conn *c = (struct nbh_conn *)ibc; + struct neighbor_discovery_conn *c = (struct neighbor_discovery_conn *)ibc; struct adv_msg *msg = rimebuf_dataptr(); /* struct neighbor *n; */ @@ -132,7 +132,7 @@ adv_packet_received(struct ibc_conn *ibc, rimeaddr_t *from) static void send_timer(void *ptr) { - struct nbh_conn *tc = ptr; + struct neighbor_discovery_conn *tc = ptr; send_adv(tc, MAX_INTERVAL / 2); ctimer_set(&tc->t, @@ -144,22 +144,22 @@ static const struct ibc_callbacks ibc_callbacks = {adv_packet_received}; /*---------------------------------------------------------------------------*/ void -nbh_open(struct nbh_conn *c, uint16_t channel, - const struct nbh_callbacks *cb) +neighbor_discovery_open(struct neighbor_discovery_conn *c, uint16_t channel, + const struct neighbor_discovery_callbacks *cb) { ibc_open(&c->c, channel, &ibc_callbacks); c->u = cb; } /*---------------------------------------------------------------------------*/ void -nbh_close(struct nbh_conn *c) +neighbor_discovery_close(struct neighbor_discovery_conn *c) { ibc_close(&c->c); ctimer_stop(&c->t); } /*---------------------------------------------------------------------------*/ void -nbh_start(struct nbh_conn *c, uint16_t val) +neighbor_discovery_start(struct neighbor_discovery_conn *c, uint16_t val) { c->val = val; ctimer_set(&c->t, random_rand() % MIN_INTERVAL, send_timer, c); diff --git a/core/net/rime/nbh.h b/core/net/rime/neighbor-discovery.h similarity index 69% rename from core/net/rime/nbh.h rename to core/net/rime/neighbor-discovery.h index a43263d38..c10818320 100644 --- a/core/net/rime/nbh.h +++ b/core/net/rime/neighbor-discovery.h @@ -28,39 +28,39 @@ * * This file is part of the Contiki operating system. * - * $Id: nbh.h,v 1.2 2007/11/17 10:32:54 adamdunkels Exp $ + * $Id: neighbor-discovery.h,v 1.1 2007/12/09 15:40:43 adamdunkels Exp $ */ /** * \file - * Neighborhood discovery header file + * Neighbor discovery header file * \author * Adam Dunkels */ -#ifndef __NBH_H__ -#define __NBH_H__ +#ifndef __NEIGHBOR_DISCOVERY_H__ +#define __NEIGHBOR_DISCOVERY_H__ #include "net/rime/ibc.h" -struct nbh_conn; +struct neighbor_discovery_conn; -struct nbh_callbacks { - void (* recv)(struct nbh_conn *c, rimeaddr_t *from, uint16_t val); - void (* sent)(struct nbh_conn *c); +struct neighbor_discovery_callbacks { + void (* recv)(struct neighbor_discovery_conn *c, rimeaddr_t *from, uint16_t val); + void (* sent)(struct neighbor_discovery_conn *c); }; -struct nbh_conn { +struct neighbor_discovery_conn { struct ibc_conn c; - const struct nbh_callbacks *u; + const struct neighbor_discovery_callbacks *u; struct ctimer t; uint16_t val; }; -void nbh_open(struct nbh_conn *c, uint16_t channel, - const struct nbh_callbacks *u); -void nbh_close(struct nbh_conn *c); +void neighbor_discovery_open(struct neighbor_discovery_conn *c, uint16_t channel, + const struct neighbor_discovery_callbacks *u); +void neighbor_discovery_close(struct neighbor_discovery_conn *c); -void nbh_start(struct nbh_conn *c, uint16_t val); +void neighbor_discovery_start(struct neighbor_discovery_conn *c, uint16_t val); -#endif /* __NBH_H__ */ +#endif /* __NEIGHBOR_DISCOVERY_H__ */