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

experimental sixlowpan fixes to eliminate multiple definitions

Browse Source
This commit is contained in:
Oleg Hahm 2013-07-24 22:23:21 +02:00
parent e9cee715a1
commit cce8f46e49
6 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/net/sixlowpan/sixlowborder.h
View File

@ -12,7 +12,7 @@
extern ipv6_addr_t abr_addr; extern ipv6_addr_t abr_addr;
uint16_t border_get_serial_reader(); uint16_t border_get_serial_reader(void);
uint8_t *get_serial_out_buffer(int offset); uint8_t *get_serial_out_buffer(int offset);
uint8_t *get_serial_in_buffer(int offset); uint8_t *get_serial_in_buffer(int offset);

2
sys/net/sixlowpan/sixlowip.c
View File

@ -18,9 +18,7 @@ uint8_t buffer[BUFFER_SIZE];
msg_t msg_queue[IP_PKT_RECV_BUF_SIZE]; msg_t msg_queue[IP_PKT_RECV_BUF_SIZE];
struct ipv6_hdr_t* ipv6_buf; struct ipv6_hdr_t* ipv6_buf;
struct icmpv6_hdr_t* icmp_buf; struct icmpv6_hdr_t* icmp_buf;
uint8_t ipv6_ext_hdr_len;
uint8_t *nextheader; uint8_t *nextheader;
iface_t iface;
uint8_t iface_addr_list_count = 0; uint8_t iface_addr_list_count = 0;
int udp_packet_handler_pid = 0; int udp_packet_handler_pid = 0;
int tcp_packet_handler_pid = 0; int tcp_packet_handler_pid = 0;

5
sys/net/sixlowpan/sixlowmac.c
View File

@ -18,15 +18,10 @@
char radio_stack_buffer[RADIO_STACK_SIZE]; char radio_stack_buffer[RADIO_STACK_SIZE];
msg_t msg_q[RADIO_RCV_BUF_SIZE]; msg_t msg_q[RADIO_RCV_BUF_SIZE];
uint8_t snd_buffer[RADIO_SND_BUF_SIZE][PAYLOAD_SIZE];
static uint8_t r_src_addr; static uint8_t r_src_addr;
uint8_t buf[PAYLOAD_SIZE]; uint8_t buf[PAYLOAD_SIZE];
uint16_t packet_length;
static uint8_t macdsn; static uint8_t macdsn;
//static uint8_t macbsn;
mutex_t buf_mutex;
static radio_packet_t p; static radio_packet_t p;
static msg_t mesg; static msg_t mesg;

1
sys/net/sixlowpan/sixlowmac.h
View File

@ -11,7 +11,6 @@
#define RADIO_STACK_SIZE 512 #define RADIO_STACK_SIZE 512
#define RADIO_RCV_BUF_SIZE 64 #define RADIO_RCV_BUF_SIZE 64
#define RADIO_SND_BUF_SIZE 100
#define RADIO_SENDING_DELAY 1000 #define RADIO_SENDING_DELAY 1000
extern uint16_t fragmentcounter; extern uint16_t fragmentcounter;

4
sys/net/sixlowpan/sixlownd.c
View File

@ -17,7 +17,6 @@
/* extern variables */ /* extern variables */
uint8_t opt_hdr_len = 0; uint8_t opt_hdr_len = 0;
uint8_t ipv6_ext_hdr_len = 0; uint8_t ipv6_ext_hdr_len = 0;
uint16_t packet_length;
/* counter */ /* counter */
uint8_t abr_count = 0; uint8_t abr_count = 0;
@ -26,9 +25,6 @@ uint8_t def_rtr_count = 0;
uint8_t rtr_sol_count = 0; uint8_t rtr_sol_count = 0;
uint8_t prefix_count = 0; uint8_t prefix_count = 0;
/* global interface*/
iface_t iface;
/* datastructures */ /* datastructures */
abr_cache_t abr_cache[ABR_CACHE_SIZE]; abr_cache_t abr_cache[ABR_CACHE_SIZE];
nbr_cache_t nbr_cache[NBR_CACHE_SIZE]; nbr_cache_t nbr_cache[NBR_CACHE_SIZE];

7
sys/net/sixlowpan/sixlowpan.c
View File

@ -8,8 +8,6 @@
#include <thread.h> #include <thread.h>
#include <mutex.h> #include <mutex.h>
#include <hwtimer.h> #include <hwtimer.h>
#include <rtc.h>
//#include <lpc2387-rtc.h>
#include "msg.h" #include "msg.h"
#include "sixlowmac.h" #include "sixlowmac.h"
#include "sixlowpan.h" #include "sixlowpan.h"
@ -30,7 +28,7 @@ uint8_t max_frag_initial = 0;
uint8_t position; uint8_t position;
uint8_t max_frag; uint8_t max_frag;
struct ipv6_hdr_t *ipv6_buf; static struct ipv6_hdr_t *ipv6_buf;
/* length of compressed packet */ /* length of compressed packet */
uint16_t comp_len; uint16_t comp_len;
@ -1397,9 +1395,6 @@ void sixlowpan_init(transceiver_type_t trans, uint8_t r_addr, int as_border){
/* init mac-layer and radio transceiver */ /* init mac-layer and radio transceiver */
sixlowmac_init(trans); sixlowmac_init(trans);
rtc_init();
rtc_enable();
/* init interface addresses */ /* init interface addresses */
memset(&iface,0,sizeof(iface_t)); memset(&iface,0,sizeof(iface_t));
set_radio_address(r_addr); set_radio_address(r_addr);