Merge branch 'master' of ssh://contiki.git.sourceforge.net/gitroot/contiki/contiki

This commit is contained in:
Matthias Kovatsch 2011-12-07 19:42:14 +01:00
commit c846a5ec25

View File

@ -449,6 +449,7 @@ coap_serialize_message(void *packet, uint8_t *buffer)
PRINTF("Block2 [%lu%s (%u B/blk)]\n", ((coap_packet_t *)packet)->block2_num, ((coap_packet_t *)packet)->block2_more ? "+" : "", ((coap_packet_t *)packet)->block2_size);
uint32_t block = ((coap_packet_t *)packet)->block2_num << 4;
printf("encode %lu\n", block>>4);
if (((coap_packet_t *)packet)->block2_more) block |= 0x8;
block |= 0xF & log_2(((coap_packet_t *)packet)->block2_size/16);