mirror of
https://github.com/oliverschmidt/contiki.git
synced 2024-09-04 05:29:04 +00:00
Moved packet attributes specifications from rimebuf.h to the appropriate protocol header files
This commit is contained in:
parent
e70b45c102
commit
71e5adb254
@ -46,7 +46,7 @@
|
|||||||
*
|
*
|
||||||
* This file is part of the Contiki operating system.
|
* This file is part of the Contiki operating system.
|
||||||
*
|
*
|
||||||
* $Id: ipolite.h,v 1.4 2008/06/26 11:19:22 adamdunkels Exp $
|
* $Id: ipolite.h,v 1.5 2009/01/15 22:15:51 adamdunkels Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -65,6 +65,8 @@
|
|||||||
|
|
||||||
struct ipolite_conn;
|
struct ipolite_conn;
|
||||||
|
|
||||||
|
#define IPOLITE_ATTRIBUTES IBC_ATTRIBUTES
|
||||||
|
|
||||||
struct ipolite_callbacks {
|
struct ipolite_callbacks {
|
||||||
void (* recv)(struct ipolite_conn *c, rimeaddr_t *from);
|
void (* recv)(struct ipolite_conn *c, rimeaddr_t *from);
|
||||||
void (* sent)(struct ipolite_conn *c);
|
void (* sent)(struct ipolite_conn *c);
|
||||||
|
@ -48,7 +48,7 @@
|
|||||||
*
|
*
|
||||||
* This file is part of the Contiki operating system.
|
* This file is part of the Contiki operating system.
|
||||||
*
|
*
|
||||||
* $Id: multihop.h,v 1.1 2008/07/03 22:36:03 adamdunkels Exp $
|
* $Id: multihop.h,v 1.2 2009/01/15 22:15:51 adamdunkels Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -66,6 +66,13 @@
|
|||||||
|
|
||||||
struct multihop_conn;
|
struct multihop_conn;
|
||||||
|
|
||||||
|
#define MULTIHOP_ATTRIBUTES { RIMEBUF_ADDR_ESENDER, RIMEBUF_ADDRSIZE }, \
|
||||||
|
{ RIMEBUF_ADDR_ERECEIVER, RIMEBUF_ADDRSIZE }, \
|
||||||
|
{ RIMEBUF_ATTR_TTL, RIMEBUF_ATTR_BIT * 5 }, \
|
||||||
|
UNICAST_ATTRIBUTES
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
struct multihop_callbacks {
|
struct multihop_callbacks {
|
||||||
void (* recv)(struct multihop_conn *ptr,
|
void (* recv)(struct multihop_conn *ptr,
|
||||||
rimeaddr_t *sender,
|
rimeaddr_t *sender,
|
||||||
|
@ -45,7 +45,7 @@
|
|||||||
*
|
*
|
||||||
* This file is part of the Contiki operating system.
|
* This file is part of the Contiki operating system.
|
||||||
*
|
*
|
||||||
* $Id: netflood.h,v 1.1 2008/07/03 22:25:22 adamdunkels Exp $
|
* $Id: netflood.h,v 1.2 2009/01/15 22:15:51 adamdunkels Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -65,6 +65,11 @@
|
|||||||
|
|
||||||
struct netflood_conn;
|
struct netflood_conn;
|
||||||
|
|
||||||
|
#define NETFLOOD_ATTRIBUTES { RIMEBUF_ADDR_ESENDER, RIMEBUF_ADDRSIZE }, \
|
||||||
|
{ RIMEBUF_ATTR_HOPS, RIMEBUF_ATTR_BIT * 5 }, \
|
||||||
|
{ RIMEBUF_ATTR_EPACKET_ID, RIMEBUF_ATTR_BIT * 4 }, \
|
||||||
|
IPOLITE_ATTRIBUTES
|
||||||
|
|
||||||
struct netflood_callbacks {
|
struct netflood_callbacks {
|
||||||
int (* recv)(struct netflood_conn *c, rimeaddr_t *from,
|
int (* recv)(struct netflood_conn *c, rimeaddr_t *from,
|
||||||
rimeaddr_t *originator, uint8_t seqno, uint8_t hops);
|
rimeaddr_t *originator, uint8_t seqno, uint8_t hops);
|
||||||
|
@ -46,7 +46,7 @@
|
|||||||
*
|
*
|
||||||
* This file is part of the Contiki operating system.
|
* This file is part of the Contiki operating system.
|
||||||
*
|
*
|
||||||
* $Id: polite.h,v 1.3 2008/02/24 22:05:27 adamdunkels Exp $
|
* $Id: polite.h,v 1.4 2009/01/15 22:15:51 adamdunkels Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -65,6 +65,8 @@
|
|||||||
|
|
||||||
struct polite_conn;
|
struct polite_conn;
|
||||||
|
|
||||||
|
#define POLITE_ATTRIBUTES ABC_ATTRIBUTES
|
||||||
|
|
||||||
struct polite_callbacks {
|
struct polite_callbacks {
|
||||||
void (* recv)(struct polite_conn *c);
|
void (* recv)(struct polite_conn *c);
|
||||||
void (* sent)(struct polite_conn *c);
|
void (* sent)(struct polite_conn *c);
|
||||||
|
@ -40,7 +40,7 @@
|
|||||||
*
|
*
|
||||||
* This file is part of the Contiki operating system.
|
* This file is part of the Contiki operating system.
|
||||||
*
|
*
|
||||||
* $Id: rimebuf.h,v 1.15 2008/06/30 19:57:10 adamdunkels Exp $
|
* $Id: rimebuf.h,v 1.16 2009/01/15 22:15:51 adamdunkels Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -412,28 +412,6 @@ struct rimebuf_attrlist {
|
|||||||
uint8_t len;
|
uint8_t len;
|
||||||
};
|
};
|
||||||
|
|
||||||
/* XXX The definitions below will be placed the corresponding .h files: */
|
|
||||||
|
|
||||||
#define RMH_ATTRIBUTES { RIMEBUF_ADDR_ESENDER, RIMEBUF_ADDRSIZE }, \
|
|
||||||
{ RIMEBUF_ADDR_ERECEIVER, RIMEBUF_ADDRSIZE }, \
|
|
||||||
{ RIMEBUF_ATTR_TTL, RIMEBUF_ATTR_BIT * 5 }, \
|
|
||||||
{ RIMEBUF_ATTR_MAX_REXMIT, RIMEBUF_ATTR_BIT * 5 }, \
|
|
||||||
RUC_ATTRIBUTES
|
|
||||||
|
|
||||||
#define MH_ATTRIBUTES { RIMEBUF_ADDR_ESENDER, RIMEBUF_ADDRSIZE }, \
|
|
||||||
{ RIMEBUF_ADDR_ERECEIVER, RIMEBUF_ADDRSIZE }, \
|
|
||||||
{ RIMEBUF_ATTR_TTL, RIMEBUF_ATTR_BIT * 5 }, \
|
|
||||||
UC_ATTRIBUTES
|
|
||||||
|
|
||||||
#define POLITE_ATTRIBUTES ABC_ATTRIBUTES
|
|
||||||
|
|
||||||
#define IPOLITE_ATTRIBUTES IBC_ATTRIBUTES
|
|
||||||
|
|
||||||
#define NF_ATTRIBUTES { RIMEBUF_ADDR_ESENDER, RIMEBUF_ADDRSIZE }, \
|
|
||||||
{ RIMEBUF_ATTR_HOPS, RIMEBUF_ATTR_BIT * 5 }, \
|
|
||||||
{ RIMEBUF_ATTR_EPACKET_ID, RIMEBUF_ATTR_BIT * 4 }, \
|
|
||||||
IPOLITE_ATTRIBUTES
|
|
||||||
|
|
||||||
#endif /* __RIMEBUF_H__ */
|
#endif /* __RIMEBUF_H__ */
|
||||||
/** @} */
|
/** @} */
|
||||||
/** @} */
|
/** @} */
|
||||||
|
@ -48,7 +48,7 @@
|
|||||||
*
|
*
|
||||||
* This file is part of the Contiki operating system.
|
* This file is part of the Contiki operating system.
|
||||||
*
|
*
|
||||||
* $Id: rmh.h,v 1.5 2008/07/03 21:52:25 adamdunkels Exp $
|
* $Id: rmh.h,v 1.6 2009/01/15 22:15:51 adamdunkels Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -66,6 +66,12 @@
|
|||||||
|
|
||||||
struct rmh_conn;
|
struct rmh_conn;
|
||||||
|
|
||||||
|
#define RMH_ATTRIBUTES { PACKET_ADDR_ESENDER, PACKET_ADDRSIZE }, \
|
||||||
|
{ PACKET_ADDR_ERECEIVER, PACKET_ADDRSIZE }, \
|
||||||
|
{ PACKET_ATTR_TTL, PACKET_ATTR_BIT * 5 }, \
|
||||||
|
{ PACKET_ATTR_MAX_REXMIT, PACKET_ATTR_BIT * 5 }, \
|
||||||
|
RUC_ATTRIBUTES
|
||||||
|
|
||||||
struct rmh_callbacks {
|
struct rmh_callbacks {
|
||||||
void (* recv)(struct rmh_conn *ptr, rimeaddr_t *sender, uint8_t hops);
|
void (* recv)(struct rmh_conn *ptr, rimeaddr_t *sender, uint8_t hops);
|
||||||
rimeaddr_t *(* forward)(struct rmh_conn *ptr,
|
rimeaddr_t *(* forward)(struct rmh_conn *ptr,
|
||||||
|
Loading…
Reference in New Issue
Block a user