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

Merge pull request #154 from malvira/erbium-build-fixes-er3-7

Browse source 
Fix er 3 and 7 buids in latest erbuim (subscribers counter has changed type)
This commit is contained in:
Mariano Alvira 2013-03-13 08:47:24 -07:00
parent b01db7557a 4dd29cca64
commit 163cb7cf13
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/er-coap-03/er-coap-03-observing.c
View file

@ -122,7 +122,7 @@ coap_remove_observer_by_token(uip_ipaddr_t *addr, uint16_t port, uint8_t *token,
} }
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
void void
coap_notify_observers(resource_t *resource, uint16_t obs_counter, void *notification) coap_notify_observers(resource_t *resource, int32_t obs_counter, void *notification)
{ {
coap_packet_t *const coap_res = (coap_packet_t *) notification; coap_packet_t *const coap_res = (coap_packet_t *) notification;
coap_observer_t* obs = NULL; coap_observer_t* obs = NULL;

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

@ -69,7 +69,7 @@ coap_observer_t *coap_add_observer(uip_ipaddr_t *addr, uint16_t port, const uint
void coap_remove_observer(coap_observer_t *o); void coap_remove_observer(coap_observer_t *o);
int coap_remove_observer_by_client(uip_ipaddr_t *addr, uint16_t port); int coap_remove_observer_by_client(uip_ipaddr_t *addr, uint16_t port);
int coap_remove_observer_by_token(uip_ipaddr_t *addr, uint16_t port, uint8_t *token, size_t token_len); int coap_remove_observer_by_token(uip_ipaddr_t *addr, uint16_t port, uint8_t *token, size_t token_len);
void coap_notify_observers(resource_t *resource, uint16_t obs_counter, void *notification); void coap_notify_observers(resource_t *resource, int32_t obs_counter, void *notification);
void coap_observe_handler(resource_t *resource, void *request, void *response); void coap_observe_handler(resource_t *resource, void *request, void *response);

2
apps/er-coap-07/er-coap-07-observing.c
View file

@ -167,7 +167,7 @@ coap_remove_observer_by_mid(uip_ipaddr_t *addr, uint16_t port, uint16_t mid)
} }
/*-----------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------*/
void void
coap_notify_observers(resource_t *resource, uint16_t obs_counter, void *notification) coap_notify_observers(resource_t *resource, int32_t obs_counter, void *notification)
{ {
coap_packet_t *const coap_res = (coap_packet_t *) notification; coap_packet_t *const coap_res = (coap_packet_t *) notification;
coap_observer_t* obs = NULL; coap_observer_t* obs = NULL;

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

@ -75,7 +75,7 @@ int coap_remove_observer_by_token(uip_ipaddr_t *addr, uint16_t port, uint8_t *to
int coap_remove_observer_by_url(uip_ipaddr_t *addr, uint16_t port, const char *url); int coap_remove_observer_by_url(uip_ipaddr_t *addr, uint16_t port, const char *url);
int coap_remove_observer_by_mid(uip_ipaddr_t *addr, uint16_t port, uint16_t mid); int coap_remove_observer_by_mid(uip_ipaddr_t *addr, uint16_t port, uint16_t mid);
void coap_notify_observers(resource_t *resource, uint16_t obs_counter, void *notification); void coap_notify_observers(resource_t *resource, int32_t obs_counter, void *notification);
void coap_observe_handler(resource_t *resource, void *request, void *response); void coap_observe_handler(resource_t *resource, void *request, void *response);