riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net: changed name of internal variable

Browse Source 
To avoid naming conflicts + made variable static and volatile as it
should be.
This commit is contained in:
Oleg Hahm 2014-08-06 13:54:11 +02:00
parent 93ef4346e9
commit 74fbff1df2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/net/network_layer/sixlowpan/ip.c
View File

@ -54,7 +54,7 @@ uint8_t *nextheader;
kernel_pid_t udp_packet_handler_pid = KERNEL_PID_UNDEF; kernel_pid_t udp_packet_handler_pid = KERNEL_PID_UNDEF;
kernel_pid_t tcp_packet_handler_pid = KERNEL_PID_UNDEF; kernel_pid_t tcp_packet_handler_pid = KERNEL_PID_UNDEF;
kernel_pid_t rpl_process_pid = KERNEL_PID_UNDEF; static volatile kernel_pid_t _rpl_process_pid = KERNEL_PID_UNDEF;
ipv6_addr_t *(*ip_get_next_hop)(ipv6_addr_t *) = 0; ipv6_addr_t *(*ip_get_next_hop)(ipv6_addr_t *) = 0;
static ipv6_net_if_ext_t ipv6_net_if_ext[NET_IF_MAX]; static ipv6_net_if_ext_t ipv6_net_if_ext[NET_IF_MAX];
@ -259,10 +259,10 @@ int icmpv6_demultiplex(const icmpv6_hdr_t *hdr)
case (ICMPV6_TYPE_RPL_CONTROL): { case (ICMPV6_TYPE_RPL_CONTROL): {
DEBUG("INFO: packet type: RPL message\n"); DEBUG("INFO: packet type: RPL message\n");
if (rpl_process_pid != KERNEL_PID_UNDEF) { if (_rpl_process_pid != KERNEL_PID_UNDEF) {
msg_t m_send; msg_t m_send;
m_send.content.ptr = (char *) &hdr->code; m_send.content.ptr = (char *) &hdr->code;
msg_send(&m_send, rpl_process_pid, 1); msg_send(&m_send, _rpl_process_pid, 1);
} }
else { else {
DEBUG("INFO: no RPL handler registered\n"); DEBUG("INFO: no RPL handler registered\n");
@ -787,7 +787,7 @@ void ipv6_iface_set_routing_provider(ipv6_addr_t *(*next_hop)(ipv6_addr_t *dest)
void ipv6_register_rpl_handler(kernel_pid_t pid) void ipv6_register_rpl_handler(kernel_pid_t pid)
{ {
rpl_process_pid = pid; _rpl_process_pid = pid;
} }
uint16_t ipv6_csum(ipv6_hdr_t *ipv6_header, uint8_t *buf, uint16_t len, uint8_t proto) uint16_t ipv6_csum(ipv6_hdr_t *ipv6_header, uint8_t *buf, uint16_t len, uint8_t proto)

2
sys/posix/pthread/pthread.c
View File

@ -54,7 +54,7 @@ enum pthread_thread_status {
}; };
typedef struct pthread_thread { typedef struct pthread_thread {
kernel_pid_t thread_pid = KERNEL_PID_UNDEF; kernel_pid_t thread_pid;
enum pthread_thread_status status; enum pthread_thread_status status;
int joining_thread; int joining_thread;