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

Merge pull request #250 from mehlis/radio_packet_length_t

Browse Source 
use radio_packet_length_t
This commit is contained in:
Oleg Hahm 2013-11-01 03:26:55 -07:00
commit 80f5e28163
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cpu/native/include/tap.h
View File

@ -18,6 +18,7 @@
#include <net/ethernet.h> #include <net/ethernet.h>
#include "board.h"
#include "radio/types.h" #include "radio/types.h"
/** /**
@ -36,7 +37,7 @@ extern int _native_tap_fd;
extern unsigned char _native_tap_mac[ETHER_ADDR_LEN]; extern unsigned char _native_tap_mac[ETHER_ADDR_LEN];
struct nativenet_header { struct nativenet_header {
uint16_t length; radio_packet_length_t length;
radio_address_t dst; radio_address_t dst;
radio_address_t src; radio_address_t src;
} __attribute__((packed)); } __attribute__((packed));

6
sys/include/radio/types.h
View File

@ -27,7 +27,9 @@
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include <timex.h>
#include "board.h"
#include "timex.h"
typedef uint8_t protocol_t; ///< Packet protocol type typedef uint8_t protocol_t; ///< Packet protocol type
typedef uint16_t radio_address_t; ///< Radio layer address type typedef uint16_t radio_address_t; ///< Radio layer address type
@ -71,7 +73,7 @@ typedef struct __attribute__((packed))
uint8_t rssi; ///< Radio Signal Strength Indication uint8_t rssi; ///< Radio Signal Strength Indication
uint8_t lqi; ///< Link Quality Indicator uint8_t lqi; ///< Link Quality Indicator
timex_t toa; ///< Time of Arrival timex_t toa; ///< Time of Arrival
uint8_t length; ///< Length of payload radio_packet_length_t length; ///< Length of payload
uint8_t *data; ///< Payload uint8_t *data; ///< Payload
} }
radio_packet_t; radio_packet_t;