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

Updated buffer definition macro due to core changes.

Browse source
This commit is contained in:
Matthias Kovatsch 2013-06-19 14:48:04 +02:00
parent 3048126ff1
commit 78e3a75b9c
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/er-coap-03/er-coap-03.h
View file

@ -86,7 +86,7 @@
#endif /* COAP_MAX_ATTEMPTS */ #endif /* COAP_MAX_ATTEMPTS */
#define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]) #define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
#define UIP_UDP_BUF ((struct uip_udp_hdr *)&uip_buf[uip_l2_l3_hdr_len]) #define UIP_UDP_BUF ((struct uip_udp_hdr *)&uip_buf[UIP_LLH_LEN + UIP_IPH_LEN])
#define SET_OPTION(packet, opt) ((packet)->options |= 1<<opt) #define SET_OPTION(packet, opt) ((packet)->options |= 1<<opt)
#define IS_OPTION(packet, opt) ((packet)->options & 1<<opt) #define IS_OPTION(packet, opt) ((packet)->options & 1<<opt)

2
apps/er-coap-07/er-coap-07.h
View file

@ -88,7 +88,7 @@
#endif /* COAP_MAX_ATTEMPTS */ #endif /* COAP_MAX_ATTEMPTS */
#define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]) #define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
#define UIP_UDP_BUF ((struct uip_udp_hdr *)&uip_buf[uip_l2_l3_hdr_len]) #define UIP_UDP_BUF ((struct uip_udp_hdr *)&uip_buf[UIP_LLH_LEN + UIP_IPH_LEN])
#define SET_OPTION(packet, opt) ((packet)->options |= 1L<<opt) #define SET_OPTION(packet, opt) ((packet)->options |= 1L<<opt)
#define IS_OPTION(packet, opt) ((packet)->options & 1L<<opt) #define IS_OPTION(packet, opt) ((packet)->options & 1L<<opt)

2
apps/er-coap-12/er-coap-12.h
View file

@ -93,7 +93,7 @@
#endif /* COAP_MAX_ATTEMPTS */ #endif /* COAP_MAX_ATTEMPTS */
#define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]) #define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
#define UIP_UDP_BUF ((struct uip_udp_hdr *)&uip_buf[uip_l2_l3_hdr_len]) #define UIP_UDP_BUF ((struct uip_udp_hdr *)&uip_buf[UIP_LLH_LEN + UIP_IPH_LEN])
/* Bitmap for set options */ /* Bitmap for set options */
enum { OPTION_MAP_SIZE = sizeof(uint8_t) * 8 }; enum { OPTION_MAP_SIZE = sizeof(uint8_t) * 8 };

8
apps/er-coap-13/er-coap-13.h
View file

@ -36,8 +36,8 @@
* Matthias Kovatsch <kovatsch@inf.ethz.ch> * Matthias Kovatsch <kovatsch@inf.ethz.ch>
*/ */
#ifndef COAP_12_H_ #ifndef COAP_13_H_
#define COAP_12_H_ #define COAP_13_H_
#include <stddef.h> /* for size_t */ #include <stddef.h> /* for size_t */
#include "contiki-net.h" #include "contiki-net.h"
@ -93,7 +93,7 @@
#endif /* COAP_MAX_ATTEMPTS */ #endif /* COAP_MAX_ATTEMPTS */
#define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]) #define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
#define UIP_UDP_BUF ((struct uip_udp_hdr *)&uip_buf[uip_l2_l3_hdr_len]) #define UIP_UDP_BUF ((struct uip_udp_hdr *)&uip_buf[UIP_LLH_LEN + UIP_IPH_LEN])
/* Bitmap for set options */ /* Bitmap for set options */
enum { OPTION_MAP_SIZE = sizeof(uint8_t) * 8 }; enum { OPTION_MAP_SIZE = sizeof(uint8_t) * 8 };
@ -379,4 +379,4 @@ int coap_set_header_size(void *packet, uint32_t size);
int coap_get_payload(void *packet, const uint8_t **payload); int coap_get_payload(void *packet, const uint8_t **payload);
int coap_set_payload(void *packet, const void *payload, size_t length); int coap_set_payload(void *packet, const void *payload, size_t length);
#endif /* COAP_12_H_ */ #endif /* COAP_13_H_ */