From 836ae0d2916721896a80944eaa5a70b7441a48c1 Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Thu, 1 Aug 2013 16:40:34 +0200 Subject: [PATCH 1/7] fix #11: initialize queue_node_t n.next in msg_send() --- core/msg.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/msg.c b/core/msg.c index f9042e1681..507bcb05af 100644 --- a/core/msg.c +++ b/core/msg.c @@ -10,7 +10,9 @@ * @ingroup kernel_msg * @{ * @file + * @author Freie Universität Berlin, Computer Systems & Telematics, FeuerWhere project * @author Kaspar Schleiser + * @author Oliver Hahm * @} */ @@ -80,6 +82,7 @@ int msg_send(msg_t *m, unsigned int target_pid, bool block) queue_node_t n; n.priority = active_thread->priority; n.data = (unsigned int) active_thread; + n.next = NULL; DEBUG("%s: Adding node to msg_waiters:\n", active_thread->name); queue_priority_add(&(target->msg_waiters), &n); From 956f0e86569820d2ca4afb2bd83a97ecb86f3f4c Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Fri, 2 Aug 2013 00:14:45 +0200 Subject: [PATCH 2/7] fix for #87, replacing - with _ in module protocol_multiplex --- Makefile.dep | 4 ++-- sys/Makefile | 2 +- sys/net/protocol-multiplex/Makefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.dep b/Makefile.dep index de8da13ac3..b3f0f1ca11 100644 --- a/Makefile.dep +++ b/Makefile.dep @@ -14,8 +14,8 @@ ifneq (,$(findstring uart0,$(USEMODULE))) endif ifneq (,$(findstring cc110x,$(USEMODULE))) - ifeq (,$(findstring protocol-multiplex,$(USEMODULE))) - USEMODULE += protocol-multiplex + ifeq (,$(findstring protocol_multiplex,$(USEMODULE))) + USEMODULE += protocol_multiplex endif endif diff --git a/sys/Makefile b/sys/Makefile index 000c30dc61..6c82267cd2 100644 --- a/sys/Makefile +++ b/sys/Makefile @@ -70,7 +70,7 @@ endif ifneq (,$(findstring net_help,$(USEMODULE))) DIRS += net/net_help endif -ifneq (,$(findstring protocol-multiplex,$(USEMODULE))) +ifneq (,$(findstring protocol_multiplex,$(USEMODULE))) DIRS += net/protocol-multiplex endif ifneq (,$(findstring sixlowpan,$(USEMODULE))) diff --git a/sys/net/protocol-multiplex/Makefile b/sys/net/protocol-multiplex/Makefile index 93dfabd905..e5c5cb1248 100644 --- a/sys/net/protocol-multiplex/Makefile +++ b/sys/net/protocol-multiplex/Makefile @@ -1,4 +1,4 @@ -MODULE:=$(shell basename $(CURDIR)) +MODULE:=protocol_multiplex INCLUDES = -I$(RIOTBASE) -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include include $(RIOTBASE)/Makefile.base From 21c4bb6aa5608fc3cefff216ecd6eb6d4fd830c8 Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Fri, 2 Aug 2013 01:19:20 +0200 Subject: [PATCH 3/7] fixed #18 for ICMPv6 packets --- sys/net/sixlowpan/sixlownd.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/net/sixlowpan/sixlownd.c b/sys/net/sixlowpan/sixlownd.c index 7480554b22..652e8c2018 100644 --- a/sys/net/sixlowpan/sixlownd.c +++ b/sys/net/sixlowpan/sixlownd.c @@ -182,7 +182,7 @@ void init_rtr_sol(uint8_t sllao) ipv6_get_saddr(&(ipv6_buf->srcaddr), &(ipv6_buf->destaddr)); opt_hdr_len = RTR_SOL_LEN; - ipv6_buf->length = ICMPV6_HDR_LEN + RTR_SOL_LEN + OPT_STLLAO_MAX_LEN; + ipv6_buf->length = HTONS(ICMPV6_HDR_LEN + RTR_SOL_LEN + OPT_STLLAO_MAX_LEN); if (sllao == OPT_SLLAO) { opt_stllao_buf = get_opt_stllao_buf(ipv6_ext_hdr_len, opt_hdr_len); @@ -445,7 +445,7 @@ void init_rtr_adv(ipv6_addr_t *addr, uint8_t sllao, uint8_t mtu, uint8_t pi, } } - ipv6_buf->length = packet_length - IPV6_HDR_LEN; + ipv6_buf->length = HTONS(packet_length - IPV6_HDR_LEN); /* calculate checksum */ icmp_buf->checksum = 0; @@ -698,7 +698,7 @@ void init_nbr_sol(ipv6_addr_t *src, ipv6_addr_t *dest, ipv6_addr_t *targ, packet_length += OPT_ARO_HDR_LEN; } - ipv6_buf->length = packet_length - IPV6_HDR_LEN; + ipv6_buf->length = HTONS(packet_length - IPV6_HDR_LEN); icmp_buf->checksum = 0; icmp_buf->checksum = ~icmpv6_csum(PROTO_NUM_ICMPV6); @@ -941,7 +941,7 @@ void init_nbr_adv(ipv6_addr_t *src, ipv6_addr_t *dst, ipv6_addr_t *tgt, packet_length += OPT_ARO_HDR_LEN; } - ipv6_buf->length = packet_length - IPV6_HDR_LEN; + ipv6_buf->length = HTONS(packet_length - IPV6_HDR_LEN); icmp_buf->checksum = 0; icmp_buf->checksum = ~icmpv6_csum(PROTO_NUM_ICMPV6); @@ -1069,7 +1069,7 @@ uint16_t icmpv6_csum(uint8_t proto) { ipv6_buf = get_ipv6_buf(); uint16_t sum; - uint16_t len = ipv6_buf->length; + uint16_t len = NTOHS(ipv6_buf->length); sum = len + proto; sum = csum(sum, (uint8_t *)&ipv6_buf->srcaddr, 2 * sizeof(ipv6_addr_t)); @@ -1109,7 +1109,7 @@ void init_para_prob(ipv6_addr_t *src, ipv6_addr_t *dest, uint8_t code, uint32_t packet_length += min(MTU - packet_length, packet_len); - ipv6_buf->length = packet_length - IPV6_HDR_LEN; + ipv6_buf->length = HTONS(packet_length - IPV6_HDR_LEN); icmp_buf->checksum = 0; icmp_buf->checksum = ~icmpv6_csum(PROTO_NUM_ICMPV6); From cf7ab7f09339d8302f30e8773350eaffb7c3dadd Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Sun, 4 Aug 2013 03:19:51 +0200 Subject: [PATCH 4/7] add cc110x_ng include path to transceiver module --- sys/transceiver/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/transceiver/Makefile b/sys/transceiver/Makefile index 4fcf17425d..149822e1f1 100644 --- a/sys/transceiver/Makefile +++ b/sys/transceiver/Makefile @@ -1,5 +1,7 @@ MODULE =transceiver +INCLUDES += -I$(RIOTBASE)/drivers/cc110x_ng/include + include $(MAKEBASE)/Makefile.base From 39a4dc684e54176ddeeb5843b4a87af15363dae5 Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Sun, 4 Aug 2013 04:06:31 +0200 Subject: [PATCH 5/7] fixes for #62: eliminate unused parameter warnings NOTE: this commit introduces a kernel API change for mutex_unlock --- core/include/mutex.h | 4 +--- core/mutex.c | 2 +- cpu/msp430-common/hwtimer_cpu.c | 1 + cpu/native/hwtimer_cpu.c | 1 + cpu/native/irq_cpu.c | 1 + drivers/cc110x/cc1100_phy.c | 2 +- drivers/sht11/sht11.c | 4 ++-- sys/logd/logd.c | 4 ++-- sys/net/destiny/socket.c | 10 +++++----- sys/net/destiny/tcp.c | 4 ++-- sys/net/destiny/tcp_timer.c | 4 ++-- sys/net/sixlowpan/bordermultiplex.c | 2 +- sys/net/sixlowpan/rpl/etx_beaconing.c | 4 ++-- sys/net/sixlowpan/rpl/rpl.c | 22 +++++++++++----------- sys/net/sixlowpan/semaphore.c | 2 +- sys/net/sixlowpan/sixlowmac.c | 2 +- sys/net/sixlowpan/sixlownd.c | 4 ++-- sys/net/sixlowpan/sixlowpan.c | 18 +++++++++--------- sys/vtimer/vtimer.c | 2 ++ 19 files changed, 48 insertions(+), 45 deletions(-) diff --git a/core/include/mutex.h b/core/include/mutex.h index 182a3ade0e..bcf72395b4 100644 --- a/core/include/mutex.h +++ b/core/include/mutex.h @@ -57,10 +57,8 @@ int mutex_lock(struct mutex_t *mutex); * @brief Unlocks the mutex. * * @param mutex Mutex-Object to unlock. - * - * @param yield If yield==MUTEX_YIELD, force context-switch after waking up other waiter. */ -void mutex_unlock(struct mutex_t *mutex, int yield); +void mutex_unlock(struct mutex_t *mutex); #define MUTEX_YIELD 1 #define MUTEX_INISR 2 diff --git a/core/mutex.c b/core/mutex.c index 2ed3c95e29..0def398b49 100644 --- a/core/mutex.c +++ b/core/mutex.c @@ -92,7 +92,7 @@ void mutex_wait(struct mutex_t *mutex) /* we were woken up by scheduler. waker removed us from queue. we have the mutex now. */ } -void mutex_unlock(struct mutex_t *mutex, int yield) +void mutex_unlock(struct mutex_t *mutex) { DEBUG("%s: unlocking mutex. val: %u pid: %u\n", active_thread->name, mutex->val, thread_pid); int irqstate = disableIRQ(); diff --git a/cpu/msp430-common/hwtimer_cpu.c b/cpu/msp430-common/hwtimer_cpu.c index db86fb794f..733aea47d7 100644 --- a/cpu/msp430-common/hwtimer_cpu.c +++ b/cpu/msp430-common/hwtimer_cpu.c @@ -66,6 +66,7 @@ unsigned long hwtimer_arch_now() void hwtimer_arch_init(void (*handler)(int), uint32_t fcpu) { + (void) fcpu; timerA_init(); int_handler = handler; TA0_enable_interrupt(0); diff --git a/cpu/native/hwtimer_cpu.c b/cpu/native/hwtimer_cpu.c index a92519886b..e72aeac175 100644 --- a/cpu/native/hwtimer_cpu.c +++ b/cpu/native/hwtimer_cpu.c @@ -244,6 +244,7 @@ void hwtimer_arch_init(void (*handler)(int), uint32_t fcpu) { DEBUG("hwtimer_arch_init()\n"); + (void) fcpu; hwtimer_arch_disable_interrupt(); int_handler = handler; diff --git a/cpu/native/irq_cpu.c b/cpu/native/irq_cpu.c index 625d4e2166..7dfd33884b 100644 --- a/cpu/native/irq_cpu.c +++ b/cpu/native/irq_cpu.c @@ -294,6 +294,7 @@ void native_irq_handler() */ void native_isr_entry(int sig, siginfo_t *info, void *context) { + (void) info; /* unused at the moment */ DEBUG("\n\n\t\tnative_isr_entry\n\n"); if (native_interrupts_enabled == 0) { diff --git a/drivers/cc110x/cc1100_phy.c b/drivers/cc110x/cc1100_phy.c index 28fc4f76bf..230d33cd21 100644 --- a/drivers/cc110x/cc1100_phy.c +++ b/drivers/cc110x/cc1100_phy.c @@ -219,7 +219,7 @@ void cc1100_phy_mutex_lock(void) void cc1100_phy_mutex_unlock(void) { cc1100_mutex_pid = -1; - mutex_unlock(&cc1100_mutex, 0); + mutex_unlock(&cc1100_mutex); } /*---------------------------------------------------------------------------*/ diff --git a/drivers/sht11/sht11.c b/drivers/sht11/sht11.c index 3fb484848f..0ba69d2543 100644 --- a/drivers/sht11/sht11.c +++ b/drivers/sht11/sht11.c @@ -347,7 +347,7 @@ uint8_t sht11_read_sensor(sht11_val_t *value, sht11_mode_t mode) /* break on error */ if (error != 0) { connection_reset(); - mutex_unlock(&sht11_mutex, 0); + mutex_unlock(&sht11_mutex); return 0; } @@ -363,7 +363,7 @@ uint8_t sht11_read_sensor(sht11_val_t *value, sht11_mode_t mode) } } - mutex_unlock(&sht11_mutex, 0); + mutex_unlock(&sht11_mutex); return 1; } diff --git a/sys/logd/logd.c b/sys/logd/logd.c index 3350b465b9..de5ceb66e2 100644 --- a/sys/logd/logd.c +++ b/sys/logd/logd.c @@ -117,7 +117,7 @@ static void logd_process(void) free(node); } - mutex_unlock(&log_mutex, 0); + mutex_unlock(&log_mutex); } while (m.type != MSG_EXIT && !exit_flag); @@ -184,7 +184,7 @@ bool logd_log(char *str, int str_len) lq->str[str_len] = '\0'; /* add string termination char at end of buffer */ mutex_lock(&log_mutex); list_append(&log_msg_queue, (list_node_t *) lq); - mutex_unlock(&log_mutex, 0); + mutex_unlock(&log_mutex); m.type = MSG_POLL; m.content.ptr = NULL; msg_send(&m, log_pid, false); diff --git a/sys/net/destiny/socket.c b/sys/net/destiny/socket.c index 50999f101c..7bc674706b 100644 --- a/sys/net/destiny/socket.c +++ b/sys/net/destiny/socket.c @@ -529,14 +529,14 @@ int connect(int socket, sockaddr6_t *addr, uint32_t addrlen) current_tcp_socket->tcp_control.rcv_irs = 0; mutex_lock(&global_sequence_clunter_mutex); current_tcp_socket->tcp_control.send_iss = global_sequence_counter; - mutex_unlock(&global_sequence_clunter_mutex, 0); + mutex_unlock(&global_sequence_clunter_mutex); current_tcp_socket->tcp_control.state = SYN_SENT; #ifdef TCP_HC /* Choosing random number Context ID */ mutex_lock(&global_context_counter_mutex); current_tcp_socket->tcp_control.tcp_context.context_id = global_context_counter; - mutex_unlock(&global_context_counter_mutex, 0); + mutex_unlock(&global_context_counter_mutex); current_tcp_socket->tcp_control.tcp_context.hc_type = FULL_HEADER; @@ -871,7 +871,7 @@ uint8_t read_from_socket(socket_internal_t *current_int_tcp_socket, current_int_tcp_socket->tcp_input_buffer_end); current_int_tcp_socket->tcp_input_buffer_end = 0; current_int_tcp_socket->socket_values.tcp_control.rcv_wnd += read_bytes; - mutex_unlock(¤t_int_tcp_socket->tcp_buffer_mutex, 0); + mutex_unlock(¤t_int_tcp_socket->tcp_buffer_mutex); return read_bytes; } else { @@ -883,7 +883,7 @@ uint8_t read_from_socket(socket_internal_t *current_int_tcp_socket, current_int_tcp_socket->tcp_input_buffer_end = current_int_tcp_socket->tcp_input_buffer_end - len; current_int_tcp_socket->socket_values.tcp_control.rcv_wnd += len; - mutex_unlock(¤t_int_tcp_socket->tcp_buffer_mutex, 0); + mutex_unlock(¤t_int_tcp_socket->tcp_buffer_mutex); return len; } } @@ -1326,7 +1326,7 @@ socket_internal_t *new_tcp_queued_socket(ipv6_hdr_t *ipv6_header, mutex_lock(&global_sequence_clunter_mutex); current_queued_socket->socket_values.tcp_control.send_iss = global_sequence_counter; - mutex_unlock(&global_sequence_clunter_mutex, 0); + mutex_unlock(&global_sequence_clunter_mutex); current_queued_socket->socket_values.tcp_control.state = SYN_RCVD; set_tcp_cb(¤t_queued_socket->socket_values.tcp_control, tcp_header->seq_nr + 1, STATIC_WINDOW, diff --git a/sys/net/destiny/tcp.c b/sys/net/destiny/tcp.c index b164167dcc..4145e4f1cb 100644 --- a/sys/net/destiny/tcp.c +++ b/sys/net/destiny/tcp.c @@ -85,7 +85,7 @@ uint8_t handle_payload(ipv6_hdr_t *ipv6_header, tcp_hdr_t *tcp_header, tcp_socket->socket_values.tcp_control.rcv_wnd = 0; tcp_socket->tcp_input_buffer_end = tcp_socket->tcp_input_buffer_end + tcp_socket->socket_values.tcp_control.rcv_wnd; - mutex_unlock(&tcp_socket->tcp_buffer_mutex, 0); + mutex_unlock(&tcp_socket->tcp_buffer_mutex); } else { mutex_lock(&tcp_socket->tcp_buffer_mutex); @@ -95,7 +95,7 @@ uint8_t handle_payload(ipv6_hdr_t *ipv6_header, tcp_hdr_t *tcp_header, acknowledged_bytes = tcp_payload_len; tcp_socket->tcp_input_buffer_end = tcp_socket->tcp_input_buffer_end + tcp_payload_len; - mutex_unlock(&tcp_socket->tcp_buffer_mutex, 0); + mutex_unlock(&tcp_socket->tcp_buffer_mutex); } if (thread_getstatus(tcp_socket->recv_pid) == STATUS_RECEIVE_BLOCKED) { diff --git a/sys/net/destiny/tcp_timer.c b/sys/net/destiny/tcp_timer.c index 6566d81167..c3861c8c2b 100644 --- a/sys/net/destiny/tcp_timer.c +++ b/sys/net/destiny/tcp_timer.c @@ -134,11 +134,11 @@ void inc_global_variables(void) { mutex_lock(&global_sequence_clunter_mutex); global_sequence_counter += rand(); - mutex_unlock(&global_sequence_clunter_mutex, 0); + mutex_unlock(&global_sequence_clunter_mutex); #ifdef TCP_HC mutex_lock(&global_context_counter_mutex); global_context_counter += rand(); - mutex_unlock(&global_context_counter_mutex, 0); + mutex_unlock(&global_context_counter_mutex); #endif } diff --git a/sys/net/sixlowpan/bordermultiplex.c b/sys/net/sixlowpan/bordermultiplex.c index 8601f31ca5..af10ebdfb5 100644 --- a/sys/net/sixlowpan/bordermultiplex.c +++ b/sys/net/sixlowpan/bordermultiplex.c @@ -76,7 +76,7 @@ void demultiplex(border_packet_t *packet, int len) context->context.comp, context->context.lifetime ); - mutex_unlock(&lowpan_context_mutex, 0); + mutex_unlock(&lowpan_context_mutex); abr_add_context(context->context.version, &abr_addr, context->context.cid); /* Send router advertisement */ break; diff --git a/sys/net/sixlowpan/rpl/etx_beaconing.c b/sys/net/sixlowpan/rpl/etx_beaconing.c index 533655bf06..b2f90f17ba 100644 --- a/sys/net/sixlowpan/rpl/etx_beaconing.c +++ b/sys/net/sixlowpan/rpl/etx_beaconing.c @@ -187,7 +187,7 @@ void etx_beacon(void) { } cur_round = 0; } - mutex_unlock(&etx_mutex,0); + mutex_unlock(&etx_mutex); } } @@ -378,7 +378,7 @@ void etx_radio(void) { //handle the beacon mutex_lock(&etx_mutex); etx_handle_beacon(&candidate_addr); - mutex_unlock(&etx_mutex,1); + mutex_unlock(&etx_mutex); } p->processing--; diff --git a/sys/net/sixlowpan/rpl/rpl.c b/sys/net/sixlowpan/rpl/rpl.c index bb6f9b4064..d3b425e957 100644 --- a/sys/net/sixlowpan/rpl/rpl.c +++ b/sys/net/sixlowpan/rpl/rpl.c @@ -280,7 +280,7 @@ void send_DIO(ipv6_addr_t *destination) if (mydodag == NULL) { DEBUG("Error - trying to send DIO without being part of a dodag.\n"); - mutex_unlock(&rpl_send_mutex, 0); + mutex_unlock(&rpl_send_mutex); return; } @@ -321,7 +321,7 @@ void send_DIO(ipv6_addr_t *destination) uint16_t plen = ICMPV6_HDR_LEN + DIO_BASE_LEN + opt_hdr_len; rpl_send(destination, (uint8_t *)icmp_send_buf, plen, PROTO_NUM_ICMPV6, NULL); - mutex_unlock(&rpl_send_mutex, 0); + mutex_unlock(&rpl_send_mutex); } void send_DIS(ipv6_addr_t *destination) @@ -337,7 +337,7 @@ void send_DIS(ipv6_addr_t *destination) uint16_t plen = ICMPV6_HDR_LEN + DIS_BASE_LEN; rpl_send(destination, (uint8_t *)icmp_send_buf, plen, PROTO_NUM_ICMPV6, NULL); - mutex_unlock(&rpl_send_mutex, 0); + mutex_unlock(&rpl_send_mutex); } @@ -366,7 +366,7 @@ void send_DAO(ipv6_addr_t *destination, uint8_t lifetime, bool default_lifetime, icmp_send_buf->checksum = ~icmpv6_csum(PROTO_NUM_ICMPV6); if (my_dodag == NULL) { - mutex_unlock(&rpl_send_mutex, 0); + mutex_unlock(&rpl_send_mutex); return; } @@ -428,7 +428,7 @@ void send_DAO(ipv6_addr_t *destination, uint8_t lifetime, bool default_lifetime, uint16_t plen = ICMPV6_HDR_LEN + DAO_BASE_LEN + opt_len; rpl_send(destination, (uint8_t *)icmp_send_buf, plen, PROTO_NUM_ICMPV6, NULL); - mutex_unlock(&rpl_send_mutex, 0); + mutex_unlock(&rpl_send_mutex); if (continue_index > 1) { send_DAO(destination, lifetime, default_lifetime, continue_index); @@ -460,7 +460,7 @@ void send_DAO_ACK(ipv6_addr_t *destination) uint16_t plen = ICMPV6_HDR_LEN + DIS_BASE_LEN; rpl_send(destination, (uint8_t *)icmp_send_buf, plen, PROTO_NUM_ICMPV6, NULL); - mutex_unlock(&rpl_send_mutex, 0); + mutex_unlock(&rpl_send_mutex); } void rpl_process(void) @@ -480,30 +480,30 @@ void rpl_process(void) switch(*code) { case (ICMP_CODE_DIS): { recv_rpl_dis(); - mutex_unlock(&rpl_recv_mutex, 0); + mutex_unlock(&rpl_recv_mutex); break; } case (ICMP_CODE_DIO): { recv_rpl_dio(); - mutex_unlock(&rpl_recv_mutex, 0); + mutex_unlock(&rpl_recv_mutex); break; } case (ICMP_CODE_DAO): { recv_rpl_dao(); - mutex_unlock(&rpl_recv_mutex, 0); + mutex_unlock(&rpl_recv_mutex); break; } case (ICMP_CODE_DAO_ACK): { recv_rpl_dao_ack(); - mutex_unlock(&rpl_recv_mutex, 0); + mutex_unlock(&rpl_recv_mutex); break; } default: - mutex_unlock(&rpl_recv_mutex, 0); + mutex_unlock(&rpl_recv_mutex); break; } } diff --git a/sys/net/sixlowpan/semaphore.c b/sys/net/sixlowpan/semaphore.c index d44b3925bc..67ac13ca1d 100644 --- a/sys/net/sixlowpan/semaphore.c +++ b/sys/net/sixlowpan/semaphore.c @@ -47,7 +47,7 @@ int sem_signal(sem_t *sem) { if (++(sem->value) > 0 && sem->locked) { sem->locked = !(sem->locked); - mutex_unlock(&(sem->mutex), 0); + mutex_unlock(&(sem->mutex)); } return 0; diff --git a/sys/net/sixlowpan/sixlowmac.c b/sys/net/sixlowpan/sixlowmac.c index cf05a90cf2..36f77d6579 100644 --- a/sys/net/sixlowpan/sixlowmac.c +++ b/sys/net/sixlowpan/sixlowmac.c @@ -208,7 +208,7 @@ void send_ieee802154_frame(ieee_802154_long_t *addr, uint8_t *payload, memcpy(&buf[hdrlen], frame.payload, frame.payload_len); /* mutex unlock */ - mutex_unlock(&buf_mutex, 0); + mutex_unlock(&buf_mutex); p.length = hdrlen + frame.payload_len; diff --git a/sys/net/sixlowpan/sixlownd.c b/sys/net/sixlowpan/sixlownd.c index 652e8c2018..32abce272e 100644 --- a/sys/net/sixlowpan/sixlownd.c +++ b/sys/net/sixlowpan/sixlownd.c @@ -423,7 +423,7 @@ void init_rtr_adv(ipv6_addr_t *addr, uint8_t sllao, uint8_t mtu, uint8_t pi, free(contexts); } - mutex_unlock(&lowpan_context_mutex, 0); + mutex_unlock(&lowpan_context_mutex); } if (pi == OPT_PI) { @@ -617,7 +617,7 @@ void recv_rtr_adv(void) } } - mutex_unlock(&lowpan_context_mutex, 0); + mutex_unlock(&lowpan_context_mutex); if (trigger_ns >= 0) { /* send ns - draft-ietf-6lowpan-nd-15#section-5.5.1 diff --git a/sys/net/sixlowpan/sixlowpan.c b/sys/net/sixlowpan/sixlowpan.c index c557a72d34..7c6ac128e2 100644 --- a/sys/net/sixlowpan/sixlowpan.c +++ b/sys/net/sixlowpan/sixlowpan.c @@ -234,7 +234,7 @@ void lowpan_transfer(void) current_buf = packet_fifo; if (current_buf != NULL) { - mutex_unlock(&fifo_mutex, 0); + mutex_unlock(&fifo_mutex); if ((current_buf->packet)[0] == LOWPAN_IPV6_DISPATCH) { ipv6_buf = get_ipv6_buf(); @@ -263,7 +263,7 @@ void lowpan_transfer(void) if (gotosleep == 1) { - mutex_unlock(&fifo_mutex, 0); + mutex_unlock(&fifo_mutex); thread_sleep(); } } @@ -450,7 +450,7 @@ lowpan_reas_buf_t *collect_garbage_fifo(lowpan_reas_buf_t *current_buf) return_buf = my_buf->next; } - mutex_unlock(&fifo_mutex, 0); + mutex_unlock(&fifo_mutex); current_list = current_buf->interval_list_head; temp_list = current_list; @@ -610,7 +610,7 @@ void add_fifo_packet(lowpan_reas_buf_t *current_packet) my_buf->next = current_packet; } - mutex_unlock(&fifo_mutex, 0); + mutex_unlock(&fifo_mutex); current_packet->next = NULL; } @@ -973,7 +973,7 @@ void lowpan_iphc_encoding(ieee_802154_long_t *dest, ipv6_hdr_t *ipv6_buf_extra, } } - mutex_unlock(&lowpan_context_mutex, 0); + mutex_unlock(&lowpan_context_mutex); comp_buf[0] = lowpan_iphc[0]; comp_buf[1] = lowpan_iphc[1]; @@ -1160,7 +1160,7 @@ void lowpan_iphc_decoding(uint8_t *data, uint8_t length, } } - mutex_unlock(&lowpan_context_mutex, 0); + mutex_unlock(&lowpan_context_mutex); } else { switch(((lowpan_iphc[1] & LOWPAN_IPHC_SAM) >> 4) & 0x03) { @@ -1223,7 +1223,7 @@ void lowpan_iphc_decoding(uint8_t *data, uint8_t length, } // TODO: - mutex_unlock(&lowpan_context_mutex, 0); + mutex_unlock(&lowpan_context_mutex); } else { /* If M=1 and DAC=0: */ @@ -1326,7 +1326,7 @@ void lowpan_iphc_decoding(uint8_t *data, uint8_t length, break; } - mutex_unlock(&lowpan_context_mutex, 0); + mutex_unlock(&lowpan_context_mutex); } else { switch((lowpan_iphc[1] & LOWPAN_IPHC_DAM) & 0x03) { @@ -1487,7 +1487,7 @@ void lowpan_context_auto_remove(void) lowpan_context_remove(to_remove[i]); } - mutex_unlock(&lowpan_context_mutex, 0); + mutex_unlock(&lowpan_context_mutex); } } diff --git a/sys/vtimer/vtimer.c b/sys/vtimer/vtimer.c index f4299a2839..4b6176f21c 100644 --- a/sys/vtimer/vtimer.c +++ b/sys/vtimer/vtimer.c @@ -79,6 +79,7 @@ static int update_shortterm(void) void vtimer_tick(void *ptr) { + (void) ptr; DEBUG("vtimer_tick()."); seconds += SECONDS_PER_TICK; @@ -111,6 +112,7 @@ static int set_shortterm(vtimer_t *timer) void vtimer_callback(void *ptr) { + (void) ptr; vtimer_t *timer; in_callback = true; hwtimer_id = -1; From 564eb457ad79abaf44ba82f6da3a13322c3e5085 Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Sun, 4 Aug 2013 04:46:17 +0200 Subject: [PATCH 6/7] fixing for #79: relocating rpl folder --- sys/Makefile | 2 +- sys/net/{sixlowpan => }/rpl/Makefile | 0 sys/net/{sixlowpan => }/rpl/etx_beaconing.c | 0 sys/net/{sixlowpan => }/rpl/etx_beaconing.h | 0 sys/net/{sixlowpan => }/rpl/of0.c | 0 sys/net/{sixlowpan => }/rpl/of0.h | 0 sys/net/{sixlowpan => }/rpl/of_mrhof.c | 0 sys/net/{sixlowpan => }/rpl/of_mrhof.h | 0 sys/net/{sixlowpan => }/rpl/rpl.c | 0 sys/net/{sixlowpan => }/rpl/rpl.h | 0 sys/net/{sixlowpan => }/rpl/rpl_dodag.c | 0 sys/net/{sixlowpan => }/rpl/rpl_dodag.h | 0 sys/net/{sixlowpan => }/rpl/rpl_structs.h | 0 sys/net/{sixlowpan => }/rpl/trickle.c | 2 +- sys/net/{sixlowpan => }/rpl/trickle.h | 0 15 files changed, 2 insertions(+), 2 deletions(-) rename sys/net/{sixlowpan => }/rpl/Makefile (100%) rename sys/net/{sixlowpan => }/rpl/etx_beaconing.c (100%) rename sys/net/{sixlowpan => }/rpl/etx_beaconing.h (100%) rename sys/net/{sixlowpan => }/rpl/of0.c (100%) rename sys/net/{sixlowpan => }/rpl/of0.h (100%) rename sys/net/{sixlowpan => }/rpl/of_mrhof.c (100%) rename sys/net/{sixlowpan => }/rpl/of_mrhof.h (100%) rename sys/net/{sixlowpan => }/rpl/rpl.c (100%) rename sys/net/{sixlowpan => }/rpl/rpl.h (100%) rename sys/net/{sixlowpan => }/rpl/rpl_dodag.c (100%) rename sys/net/{sixlowpan => }/rpl/rpl_dodag.h (100%) rename sys/net/{sixlowpan => }/rpl/rpl_structs.h (100%) rename sys/net/{sixlowpan => }/rpl/trickle.c (99%) rename sys/net/{sixlowpan => }/rpl/trickle.h (100%) diff --git a/sys/Makefile b/sys/Makefile index 6c82267cd2..d0f2362953 100644 --- a/sys/Makefile +++ b/sys/Makefile @@ -77,7 +77,7 @@ ifneq (,$(findstring sixlowpan,$(USEMODULE))) DIRS += net/sixlowpan endif ifneq (,$(findstring rpl,$(USEMODULE))) - DIRS += net/sixlowpan/rpl + DIRS += net/rpl endif ifneq (,$(findstring ieee802154,$(USEMODULE))) DIRS += net/ieee802154 diff --git a/sys/net/sixlowpan/rpl/Makefile b/sys/net/rpl/Makefile similarity index 100% rename from sys/net/sixlowpan/rpl/Makefile rename to sys/net/rpl/Makefile diff --git a/sys/net/sixlowpan/rpl/etx_beaconing.c b/sys/net/rpl/etx_beaconing.c similarity index 100% rename from sys/net/sixlowpan/rpl/etx_beaconing.c rename to sys/net/rpl/etx_beaconing.c diff --git a/sys/net/sixlowpan/rpl/etx_beaconing.h b/sys/net/rpl/etx_beaconing.h similarity index 100% rename from sys/net/sixlowpan/rpl/etx_beaconing.h rename to sys/net/rpl/etx_beaconing.h diff --git a/sys/net/sixlowpan/rpl/of0.c b/sys/net/rpl/of0.c similarity index 100% rename from sys/net/sixlowpan/rpl/of0.c rename to sys/net/rpl/of0.c diff --git a/sys/net/sixlowpan/rpl/of0.h b/sys/net/rpl/of0.h similarity index 100% rename from sys/net/sixlowpan/rpl/of0.h rename to sys/net/rpl/of0.h diff --git a/sys/net/sixlowpan/rpl/of_mrhof.c b/sys/net/rpl/of_mrhof.c similarity index 100% rename from sys/net/sixlowpan/rpl/of_mrhof.c rename to sys/net/rpl/of_mrhof.c diff --git a/sys/net/sixlowpan/rpl/of_mrhof.h b/sys/net/rpl/of_mrhof.h similarity index 100% rename from sys/net/sixlowpan/rpl/of_mrhof.h rename to sys/net/rpl/of_mrhof.h diff --git a/sys/net/sixlowpan/rpl/rpl.c b/sys/net/rpl/rpl.c similarity index 100% rename from sys/net/sixlowpan/rpl/rpl.c rename to sys/net/rpl/rpl.c diff --git a/sys/net/sixlowpan/rpl/rpl.h b/sys/net/rpl/rpl.h similarity index 100% rename from sys/net/sixlowpan/rpl/rpl.h rename to sys/net/rpl/rpl.h diff --git a/sys/net/sixlowpan/rpl/rpl_dodag.c b/sys/net/rpl/rpl_dodag.c similarity index 100% rename from sys/net/sixlowpan/rpl/rpl_dodag.c rename to sys/net/rpl/rpl_dodag.c diff --git a/sys/net/sixlowpan/rpl/rpl_dodag.h b/sys/net/rpl/rpl_dodag.h similarity index 100% rename from sys/net/sixlowpan/rpl/rpl_dodag.h rename to sys/net/rpl/rpl_dodag.h diff --git a/sys/net/sixlowpan/rpl/rpl_structs.h b/sys/net/rpl/rpl_structs.h similarity index 100% rename from sys/net/sixlowpan/rpl/rpl_structs.h rename to sys/net/rpl/rpl_structs.h diff --git a/sys/net/sixlowpan/rpl/trickle.c b/sys/net/rpl/trickle.c similarity index 99% rename from sys/net/sixlowpan/rpl/trickle.c rename to sys/net/rpl/trickle.c index f74c1fec65..69473445ab 100644 --- a/sys/net/sixlowpan/rpl/trickle.c +++ b/sys/net/rpl/trickle.c @@ -22,7 +22,7 @@ #include #include "inttypes.h" #include "trickle.h" -#include "sixlowpan/rpl/rpl.h" +#include "rpl/rpl.h" //TODO in pointer umwandeln, speicher mit malloc holen char * timer_over_buf; diff --git a/sys/net/sixlowpan/rpl/trickle.h b/sys/net/rpl/trickle.h similarity index 100% rename from sys/net/sixlowpan/rpl/trickle.h rename to sys/net/rpl/trickle.h From fdb415c6ab6fc3162934d03f403515958a548642 Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Sun, 4 Aug 2013 04:47:22 +0200 Subject: [PATCH 7/7] some prototype fixes in RPL --- sys/net/rpl/of_mrhof.h | 2 +- sys/net/rpl/rpl_structs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/rpl/of_mrhof.h b/sys/net/rpl/of_mrhof.h index b15f31e855..287edb1228 100644 --- a/sys/net/rpl/of_mrhof.h +++ b/sys/net/rpl/of_mrhof.h @@ -32,4 +32,4 @@ */ #define ETX_RANK_MULTIPLIER (0x80) -rpl_of_t *rpl_get_of_mrhof(); +rpl_of_t *rpl_get_of_mrhof(void); diff --git a/sys/net/rpl/rpl_structs.h b/sys/net/rpl/rpl_structs.h index f0e8f14d8d..b03c0d2bd7 100644 --- a/sys/net/rpl/rpl_structs.h +++ b/sys/net/rpl/rpl_structs.h @@ -270,7 +270,7 @@ typedef struct rpl_of_t { void (*reset)(rpl_dodag_t *); void (*parent_state_callback)(rpl_parent_t *, int, int); void (*init) (void); //OF specific init function - void (*process_dio) (); //DIO processing callback (acc. to OF0 spec, chpt 5) + void (*process_dio) (void); //DIO processing callback (acc. to OF0 spec, chpt 5) } rpl_of_t; typedef struct {